Changeset 29598 for main/trunk/package-kits

Timestamp:

2014-12-11T18:58:24+13:00 (9 years ago)

Author:

Jeremy Symon

Message:

Changed package generators to not use the tmp directory needlessly, and fixed some problems with the debian generator. Still need to test on systems with rpm/apt and fix all the problems.

Location:

main/trunk/package-kits/linux/perllib/Greenstone/Package

Files:

• _apt.pm (modified) (5 diffs)
• _pacman.pm (modified) (4 diffs)
• _rpm.pm (modified) (2 diffs)

main/trunk/package-kits/linux/perllib/Greenstone/Package/_apt.pm

@@ -14 +14 @@
 sub write_function {
     my ($self, $name, @lines) = @_;
-    open OUT, '>', "/tmp/$name";
+    my $file = "$self->{output}/debian/$name";
+    print "    - $file\n";
+    open my $OUT, '>', $file;
     for my $line (@lines) {
-        print OUT $line, "\n";
+        print $OUT $line, "\n";
     }
-    close OUT;
-    chmod 0755, "/tmp/$name";
-    $self->add ("/tmp/$name", "$self->{output}/debian/$name");
+    close $OUT;
+    chmod 0755, $file;
 }
 
@@ -42 +43 @@
         'Homepage: %HOMEPAGE%',
         'Depends:',
-        '%DEPENDS',
+        '  %DEPENDS%',
         'Description: %DESCRIPTION_SHORT',
         '  %DESCRIPTION'
@@ -55 +56 @@
     my ($self, $packages) = @_;
     $self->add_install;
-    open my $CONTROL, '>', "/tmp/gspkg.control";
+    my $file = "$self->{output}/debian/control";
+    print "    - $file\n";
+    open my $CONTROL, '>', $file;
     for my $line (
         'Source: %NAME%',
@@ -61 +64 @@
         'Priority: optional',
         'Maintainer: %MAINTAINER_NAME% <%MAINTAINER_EMAIL%>',
-        'BuildDepends:',
-        '%MAKEDEPENDS%',
+        'Build-Depends:',
+        '  %MAKEDEPENDS%',
     ) {
         my $copy = $line;
@@ -80 +83 @@
     }
     close $CONTROL;
-    $self->add ("/tmp/gspkg.control", "$self->{output}/debian/control");
 }
 

main/trunk/package-kits/linux/perllib/Greenstone/Package/_pacman.pm

@@ -54 +54 @@
         exists $self->{config}->{PRE_REMOVE} or
         exists $self->{config}->{POST_REMOVE}) {
-        my $name = "$self->{config}->{NAME}.install";
-        open my $INSTALL, '>', "/tmp/gspkg.$name";
+        my $file = "$self->{output}/$self->{config}->{NAME}.install";
+        print "    - $file\n";
+        open my $INSTALL, '>', $file;
         exists $self->{config}->{PRE_INSTALL} and do {
             $self->write_function ("pre_install", $INSTALL, @{$self->{config}->{PRE_INSTALL}});
@@ -69 +70 @@
             $self->write_function ("post_remove", $INSTALL, @{$self->{config}->{POST_REMOVE}});
         close $INSTALL;
-        $self->add ("/tmp/gspkg.$name", "$self->{output}/$name");
-        return "install=$name";
+        return "install=$file";
     } else {
         return "";
@@ -84 +84 @@
         }
     }
-    open my $PKGBUILD, '>', "/tmp/gspkg.PKGBUILD";
+    my $file = "$self->{output}/PKGBUILD";
+    print "    - $file\n";
+    open my $PKGBUILD, '>', $file;
     for my $line (
         '# Maintainer: %MAINTAINER_NAME% <%MAINTAINER_EMAIL%>',
@@ -137 +139 @@
     }
     close $PKGBUILD;
-    $self->add ("/tmp/gspkg.PKGBUILD", "$self->{output}/PKGBUILD");
 }
 

main/trunk/package-kits/linux/perllib/Greenstone/Package/_rpm.pm

@@ -47 +47 @@
 sub add_package_impl {
     my ($self, $packages) = @_;
-    open my $SPEC, '>', '/tmp/gspkg.spec';
+    my $file = "$self->{output}/$self->{config}->{NAME}.spec";
+    print "    - $file\n";
+    open my $SPEC, '>', $file;
     for my $line (
         'Name:          %NAME%',
@@ -112 +114 @@
     }
     close $SPEC;
-    $self->add ("/tmp/gspkg.spec", "$self->{output}/$self->{config}->{NAME}.spec");
 }