]> git.ipfire.org Git - thirdparty/AWStats.git/commitdiff
Add makepack-awstats.pl script
authoreldy <>
Sat, 19 Feb 2005 22:39:28 +0000 (22:39 +0000)
committereldy <>
Sat, 19 Feb 2005 22:39:28 +0000 (22:39 +0000)
make/makepack-awstats.pl
make/tgz/tar.exclude

index e1707226849489675033077f526f6756a457c50c..7b1c79408537b16ab800f106f7f20bc3f1344030 100644 (file)
@@ -1,4 +1,4 @@
-#!/usr/bin/perl\r
+#!/usr/bin/perl
 #----------------------------------------------------------------------------
 # \file         make/makepack-awstats.pl
 # \brief        Package builder (tgz, zip, rpm, deb, exe)
@@ -6,32 +6,32 @@
 # \author       (c)2004-2005 Laurent Destailleur  <eldy@users.sourceforge.net>
 #----------------------------------------------------------------------------
 
-use Cwd;\r
-\r
-$PROJECT="awstats";\r
-$MAJOR="6";\r
-$MINOR="4";\r
-$RPMSUBVERSION="1";\r
-\r
-@LISTETARGET=("TGZ","ZIP","RPM","DEB","EXE");   # Possible packages\r
-%REQUIREMENTTARGET=(                            # Tool requirement for each package\r
-"TGZ"=>"tar",\r
-"ZIP"=>"7z",\r
-"RPM"=>"rpmbuild",\r
-"DEB"=>"dpkg-buildpackage",\r
-"EXE"=>"makensis.exe"\r
-);\r
-%ALTERNATEPATH=(\r
-"7z"=>"7-ZIP",\r
-"makensis.exe"=>"NSIS"\r
-);\r
-\r
+use Cwd;
+
+$PROJECT="awstats";
+$MAJOR="6";
+$MINOR="4";
+$RPMSUBVERSION="1";
+
+@LISTETARGET=("TGZ","ZIP","RPM","DEB","EXE");   # Possible packages
+%REQUIREMENTTARGET=(                            # Tool requirement for each package
+"TGZ"=>"tar",
+"ZIP"=>"7z",
+"RPM"=>"rpmbuild",
+"DEB"=>"dpkg-buildpackage",
+"EXE"=>"makensis.exe"
+);
+%ALTERNATEPATH=(
+"7z"=>"7-ZIP",
+"makensis.exe"=>"NSIS"
+);
+
 $FILENAME="$PROJECT";
-$FILENAMETGZ="$PROJECT-$MAJOR.$MINOR";\r
-$FILENAMEZIP="$PROJECT-$MAJOR.$MINOR";\r
-$FILENAMERPM="$PROJECT-$MAJOR.$MINOR-$RPMSUBVERSION";\r
-$FILENAMEDEB="$PROJECT-$MAJOR.$MINOR";\r
-$FILENAMEEXE="$PROJECT-$MAJOR.$MINOR";\r
+$FILENAMETGZ="$PROJECT-$MAJOR.$MINOR";
+$FILENAMEZIP="$PROJECT-$MAJOR.$MINOR";
+$FILENAMERPM="$PROJECT-$MAJOR.$MINOR-$RPMSUBVERSION";
+$FILENAMEDEB="$PROJECT-$MAJOR.$MINOR";
+$FILENAMEEXE="$PROJECT-$MAJOR.$MINOR";
 if (-d "/usr/src/redhat") {
     # redhat
     $RPMDIR="/usr/src/redhat";
@@ -43,9 +43,9 @@ if (-d "/usr/src/RPM") {
 use vars qw/ $REVISION $VERSION /;
 $REVISION='$Revision$'; $REVISION =~ /\s(.*)\s/; $REVISION=$1;
 $VERSION="1.0 (build $REVISION)";
-\r
-\r
-\r
+
+
+
 #------------------------------------------------------------------------------
 # MAIN
 #------------------------------------------------------------------------------
@@ -53,8 +53,8 @@ $VERSION="1.0 (build $REVISION)";
 $DIR||='.'; $DIR =~ s/([^\/\\])[\\\/]+$/$1/;
 
 $SOURCE="$DIR/../../awstats";
-$DESTI="$SOURCE/make";\r
-\r
+$DESTI="$SOURCE/make";
+
 # Detect OS type
 # --------------
 if ("$^O" =~ /linux/i || (-d "/etc" && -d "/var" && "$^O" !~ /cygwin/i)) { $OS='linux'; $CR=''; }
@@ -64,32 +64,32 @@ if (! $OS) {
     print "$PROG was not able to detect your OS.\n";
        print "Can't continue.\n";
        print "$PROG aborted.\n";
-    sleep 2;\r
+    sleep 2;
        exit 1;
 }
-\r
-# Define buildroot\r
-# ----------------\r
-if ($OS =~ /linux/) {\r
-    $TEMP=$ENV{"TEMP"}||$ENV{"TMP"}||"/tmp";\r
-}\r
-if ($OS =~ /macos/) {\r
-    $TEMP=$ENV{"TEMP"}||$ENV{"TMP"}||"/tmp";\r
-}\r
-if ($OS =~ /windows/) {\r
-    $TEMP=$ENV{"TEMP"}||$ENV{"TMP"}||"c:/temp";\r
-    $PROGPATH=$ENV{"ProgramFiles"};\r
-}\r
-if (! $TEMP || ! -d $TEMP) {\r
-    print "Error: A temporary directory can not be find.\n";\r
-    print "Check that TEMP or TMP environment variable is set correctly.\n";\r
+
+# Define buildroot
+# ----------------
+if ($OS =~ /linux/) {
+    $TEMP=$ENV{"TEMP"}||$ENV{"TMP"}||"/tmp";
+}
+if ($OS =~ /macos/) {
+    $TEMP=$ENV{"TEMP"}||$ENV{"TMP"}||"/tmp";
+}
+if ($OS =~ /windows/) {
+    $TEMP=$ENV{"TEMP"}||$ENV{"TMP"}||"c:/temp";
+    $PROGPATH=$ENV{"ProgramFiles"};
+}
+if (! $TEMP || ! -d $TEMP) {
+    print "Error: A temporary directory can not be find.\n";
+    print "Check that TEMP or TMP environment variable is set correctly.\n";
        print "makepack-dolibarr.pl aborted.\n";
-    sleep 2;\r
-    exit 2;\r
-} \r
-$BUILDROOT="$TEMP/buildroot";\r
-\r
-\r
+    sleep 2;
+    exit 2;
+} 
+$BUILDROOT="$TEMP/$PROJET-buildroot";
+
+
 my $copyalreadydone=0;
 my $batch=0;
 
@@ -100,54 +100,54 @@ print "Building package version: $MAJOR.$MINOR\n";
 for (0..@ARGV-1) {
        if ($ARGV[$_] =~ /^-*target=(\w+)/i)    { $target=$1; $batch=1; }
 }
-\r
-# Choose package targets\r
-#-----------------------\r
+
+# Choose package targets
+#-----------------------
 if ($target) {
     $CHOOSEDTARGET{uc($target)}=1;
 }
 else {
-my $found=0;\r
-my $NUM_SCRIPT;\r
-while (! $found) {\r
-       my $cpt=0;\r
-       printf(" %d - %3s    (%s)\n",$cpt,"All","Need ".join(",",values %REQUIREMENTTARGET));\r
-       foreach my $target (@LISTETARGET) {\r
-               $cpt++;\r
-               printf(" %d - %3s    (%s)\n",$cpt,$target,"Need ".$REQUIREMENTTARGET{$target});\r
-       }\r
-\r
-       # On demande de choisir le fichier à passer\r
-       print "Choose one package number or several separated with space: ";\r
-       $NUM_SCRIPT=<STDIN>; \r
-       chomp($NUM_SCRIPT);\r
-       if ($NUM_SCRIPT =~ s/-//g) {\r
-               # Do not do copy        \r
-               $copyalreadydone=1;\r
-       }\r
-       if ($NUM_SCRIPT !~ /^[0-$cpt\s]+$/)\r
-       {\r
-               print "This is not a valid package number list.\n";\r
-               $found = 0;\r
-       }\r
-       else\r
-       {\r
-               $found = 1;\r
-       }\r
-}\r
-print "\n";\r
-if ($NUM_SCRIPT) {\r
-       foreach my $num (split(/\s+/,$NUM_SCRIPT)) {\r
-               $CHOOSEDTARGET{$LISTETARGET[$num-1]}=1;\r
-       }\r
-}\r
-else {\r
-       foreach my $key (@LISTETARGET) {\r
-           $CHOOSEDTARGET{$key}=1;\r
-    }\r
-}\r
+my $found=0;
+my $NUM_SCRIPT;
+while (! $found) {
+       my $cpt=0;
+       printf(" %d - %3s    (%s)\n",$cpt,"All","Need ".join(",",values %REQUIREMENTTARGET));
+       foreach my $target (@LISTETARGET) {
+               $cpt++;
+               printf(" %d - %3s    (%s)\n",$cpt,$target,"Need ".$REQUIREMENTTARGET{$target});
+       }
+
+       # On demande de choisir le fichier à passer
+       print "Choose one package number or several separated with space: ";
+       $NUM_SCRIPT=<STDIN>; 
+       chomp($NUM_SCRIPT);
+       if ($NUM_SCRIPT =~ s/-//g) {
+               # Do not do copy        
+               $copyalreadydone=1;
+       }
+       if ($NUM_SCRIPT !~ /^[0-$cpt\s]+$/)
+       {
+               print "This is not a valid package number list.\n";
+               $found = 0;
+       }
+       else
+       {
+               $found = 1;
+       }
+}
+print "\n";
+if ($NUM_SCRIPT) {
+       foreach my $num (split(/\s+/,$NUM_SCRIPT)) {
+               $CHOOSEDTARGET{$LISTETARGET[$num-1]}=1;
+       }
+}
+else {
+       foreach my $key (@LISTETARGET) {
+           $CHOOSEDTARGET{$key}=1;
+    }
 }
-\r
+}
+
 # Test if requirement is ok
 #--------------------------
 foreach my $target (keys %CHOOSEDTARGET) {
@@ -174,9 +174,9 @@ foreach my $target (keys %CHOOSEDTARGET) {
         }
     }
 }
-\r
-print "\n";\r
-\r
+
+print "\n";
+
 # Check if there is at least on target to build
 #----------------------------------------------
 $nboftargetok=0;
@@ -187,98 +187,102 @@ foreach my $target (keys %CHOOSEDTARGET) {
 
 if ($nboftargetok) {
 
-# Update buildroot\r
-#-----------------\r
-if (! $copyalreadydone) {\r
-       print "Delete directory $BUILDROOT\n";\r
-       $ret=`rm -fr "$BUILDROOT"`;\r
-\r
-       mkdir "$BUILDROOT";\r
-       print "Recopie de $SOURCE dans $BUILDROOT/$PROJECT\n";\r
-       mkdir "$BUILDROOT/$PROJECT";\r
-       $ret=`cp -p "$SOURCE/README.TXT" "$BUILDROOT/$PROJECT"`;\r
-\r
-       print "Recopie de $SOURCE/docs dans $BUILDROOT/$PROJECT/docs\n";\r
-       mkdir "$BUILDROOT/$PROJECT/docs";\r
-       $ret=`cp -pr "$SOURCE/docs" "$BUILDROOT/$PROJECT"`;\r
-\r
-       print "Recopie de $SOURCE/tools dans $BUILDROOT/$PROJECT/tools\n";\r
-       mkdir "$BUILDROOT/$PROJECT/tools";\r
-       $ret=`cp -pr "$SOURCE/tools" "$BUILDROOT/$PROJECT"`;\r
-\r
-       print "Recopie de $SOURCE/wwwroot dans $BUILDROOT/$PROJECT/wwwroot\n";\r
-       mkdir "$BUILDROOT/$PROJECT/wwwroot";\r
-       $ret=`cp -pr "$SOURCE/wwwroot" "$BUILDROOT/$PROJECT"`;\r
-}\r
-\r
-print "Nettoyage de $BUILDROOT\n";\r
-$ret=`rm -f $BUILDROOT/$PROJECT/ChangeLog`;\r
-$ret=`rm -f $BUILDROOT/$PROJECT/docs/awstats_loganalysispaper.html`;\r
-$ret=`rm -f $BUILDROOT/$PROJECT/tools/urlalias.txt`;\r
-$ret=`rm -f $BUILDROOT/$PROJECT/tools/xferlogconvert.pl`;\r
-$ret=`rm -f $BUILDROOT/$PROJECT/tools/xslt/awstats*.sps`;\r
-$ret=`rm -f $BUILDROOT/$PROJECT/tools/xslt/gen*.*`;\r
-$ret=`rm -fr $BUILDROOT/$PROJECT/tools/webmin/awstats`;\r
-$ret=`rm -f $BUILDROOT/$PROJECT/wwwroot/cgi-bin/*.inc`;\r
-$ret=`rm -f $BUILDROOT/$PROJECT/wwwroot/cgi-bin/$PROJECT.conf`;\r
-$ret=`rm -f $BUILDROOT/$PROJECT/wwwroot/cgi-bin/$PROJECT.demo.conf`;\r
-$ret=`rm -f $BUILDROOT/$PROJECT/wwwroot/cgi-bin/$PROJECT.mail.conf`;\r
-$ret=`rm -f $BUILDROOT/$PROJECT/wwwroot/cgi-bin/$PROJECT.ftp.conf`;\r
-$ret=`rm -f $BUILDROOT/$PROJECT/wwwroot/cgi-bin/$PROJECT.www*.conf`;\r
-$ret=`rm -f $BUILDROOT/$PROJECT/wwwroot/cgi-bin/$PROJECT.map24.conf`;\r
-$ret=`rm -f $BUILDROOT/$PROJECT/wwwroot/cgi-bin/$PROJECT.common.conf`;\r
-$ret=`rm -f $BUILDROOT/$PROJECT/wwwroot/cgi-bin/$PROJECT.test*.conf`;\r
-$ret=`rm -f $BUILDROOT/$PROJECT/wwwroot/cgi-bin/$PROJECT.*com.conf`;\r
-$ret=`rm -f $BUILDROOT/$PROJECT/wwwroot/cgi-bin/$PROJECT.*net.conf`;\r
-$ret=`rm -f $BUILDROOT/$PROJECT/wwwroot/cgi-bin/$PROJECT??????.txt`;\r
-$ret=`rm -f $BUILDROOT/$PROJECT/wwwroot/cgi-bin/$PROJECT??.*`;\r
-$ret=`rm -f $BUILDROOT/$PROJECT/wwwroot/cgi-bin/$PROJECT*.athena.*`;\r
-$ret=`rm -f $BUILDROOT/$PROJECT/wwwroot/cgi-bin/smallprof.*`;\r
-$ret=`rm -f $BUILDROOT/$PROJECT/wwwroot/cgi-bin/.smallprof*`;\r
-$ret=`rm -f $BUILDROOT/$PROJECT/wwwroot/cgi-bin/plugins/etf1*`;\r
-$ret=`rm -f $BUILDROOT/$PROJECT/wwwroot/cgi-bin/plugins/readgz*`;\r
-$ret=`rm -f $BUILDROOT/$PROJECT/wwwroot/cgi-bin/plugins/urlalias.txt`;\r
-$ret=`rm -f $BUILDROOT/$PROJECT/wwwroot/cgi-bin/plugins/detectrefererspam.pm`;\r
-$ret=`rm -f $BUILDROOT/$PROJECT/wwwroot/cgi-bin/plugins/testxxx.pm`;\r
-$ret=`rm -f $BUILDROOT/$PROJECT/wwwroot/classes/src/AWGraphApplet.class`;\r
-$ret=`rm -fr $BUILDROOT/$PROJECT/wwwroot/cgi-bin/plugins/testgeo*`;\r
-$ret=`rm -fr $BUILDROOT/$PROJECT/wwwroot/cgi-bin/plugins/Geo`;\r
-$ret=`rm -fr $BUILDROOT/$PROJECT/wwwroot/php`;\r
-$ret=`rm -fr $BUILDROOT/$PROJECT/make`;\r
-$ret=`rm -fr $BUILDROOT/$PROJECT/test`;\r
-$ret=`rm -fr $BUILDROOT/$PROJECT/Thumbs.db $BUILDROOT/$PROJECT/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/Thumbs.db`;\r
-$ret=`rm -fr $BUILDROOT/$PROJECT/CVS* $BUILDROOT/$PROJECT/*/CVS* $BUILDROOT/$PROJECT/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/CVS*`;\r
-\r
-rename("$BUILDROOT/$PROJECT","$BUILDROOT/$FILENAMETGZ");\r
-\r
-# Build package for each target\r
-#------------------------------\r
+# Update buildroot
+#-----------------
+if (! $copyalreadydone) {
+       print "Delete directory $BUILDROOT\n";
+       $ret=`rm -fr "$BUILDROOT"`;
+
+       print "Create directory $BUILDROOT\n";
+       mkdir "$BUILDROOT";
+
+       print "Create directory $BUILDROOT/$PROJECT\n";
+       mkdir "$BUILDROOT/$PROJECT";
+
+       print "Recopie de $SOURCE/README.TXT dans $BUILDROOT/$PROJECT\n";
+       $ret=`cp -p "$SOURCE/README.TXT" "$BUILDROOT/$PROJECT"`;
+
+       print "Recopie de $SOURCE/docs dans $BUILDROOT/$PROJECT/docs\n";
+       mkdir "$BUILDROOT/$PROJECT/docs";
+       $ret=`cp -pr "$SOURCE/docs" "$BUILDROOT/$PROJECT"`;
+
+       print "Recopie de $SOURCE/tools dans $BUILDROOT/$PROJECT/tools\n";
+       mkdir "$BUILDROOT/$PROJECT/tools";
+       $ret=`cp -pr "$SOURCE/tools" "$BUILDROOT/$PROJECT"`;
+
+       print "Recopie de $SOURCE/wwwroot dans $BUILDROOT/$PROJECT/wwwroot\n";
+       mkdir "$BUILDROOT/$PROJECT/wwwroot";
+       $ret=`cp -pr "$SOURCE/wwwroot" "$BUILDROOT/$PROJECT"`;
+}
+
+print "Nettoyage de $BUILDROOT\n";
+$ret=`rm -f $BUILDROOT/$PROJECT/ChangeLog`;
+$ret=`rm -f $BUILDROOT/$PROJECT/docs/awstats_loganalysispaper.html`;
+$ret=`rm -f $BUILDROOT/$PROJECT/tools/urlalias.txt`;
+$ret=`rm -f $BUILDROOT/$PROJECT/tools/xferlogconvert.pl`;
+$ret=`rm -f $BUILDROOT/$PROJECT/tools/xslt/awstats*.sps`;
+$ret=`rm -f $BUILDROOT/$PROJECT/tools/xslt/gen*.*`;
+$ret=`rm -fr $BUILDROOT/$PROJECT/tools/webmin/awstats`;
+$ret=`rm -f $BUILDROOT/$PROJECT/wwwroot/cgi-bin/*.inc`;
+$ret=`rm -f $BUILDROOT/$PROJECT/wwwroot/cgi-bin/$PROJECT.conf`;
+$ret=`rm -f $BUILDROOT/$PROJECT/wwwroot/cgi-bin/$PROJECT.demo.conf`;
+$ret=`rm -f $BUILDROOT/$PROJECT/wwwroot/cgi-bin/$PROJECT.mail.conf`;
+$ret=`rm -f $BUILDROOT/$PROJECT/wwwroot/cgi-bin/$PROJECT.ftp.conf`;
+$ret=`rm -f $BUILDROOT/$PROJECT/wwwroot/cgi-bin/$PROJECT.www*.conf`;
+$ret=`rm -f $BUILDROOT/$PROJECT/wwwroot/cgi-bin/$PROJECT.map24.conf`;
+$ret=`rm -f $BUILDROOT/$PROJECT/wwwroot/cgi-bin/$PROJECT.common.conf`;
+$ret=`rm -f $BUILDROOT/$PROJECT/wwwroot/cgi-bin/$PROJECT.test*.conf`;
+$ret=`rm -f $BUILDROOT/$PROJECT/wwwroot/cgi-bin/$PROJECT.*com.conf`;
+$ret=`rm -f $BUILDROOT/$PROJECT/wwwroot/cgi-bin/$PROJECT.*net.conf`;
+$ret=`rm -f $BUILDROOT/$PROJECT/wwwroot/cgi-bin/$PROJECT??????.txt`;
+$ret=`rm -f $BUILDROOT/$PROJECT/wwwroot/cgi-bin/$PROJECT??.*`;
+$ret=`rm -f $BUILDROOT/$PROJECT/wwwroot/cgi-bin/$PROJECT*.athena.*`;
+$ret=`rm -f $BUILDROOT/$PROJECT/wwwroot/cgi-bin/smallprof.*`;
+$ret=`rm -f $BUILDROOT/$PROJECT/wwwroot/cgi-bin/.smallprof*`;
+$ret=`rm -f $BUILDROOT/$PROJECT/wwwroot/cgi-bin/plugins/etf1*`;
+$ret=`rm -f $BUILDROOT/$PROJECT/wwwroot/cgi-bin/plugins/readgz*`;
+$ret=`rm -f $BUILDROOT/$PROJECT/wwwroot/cgi-bin/plugins/urlalias.txt`;
+$ret=`rm -f $BUILDROOT/$PROJECT/wwwroot/cgi-bin/plugins/detectrefererspam.pm`;
+$ret=`rm -f $BUILDROOT/$PROJECT/wwwroot/cgi-bin/plugins/testxxx.pm`;
+$ret=`rm -f $BUILDROOT/$PROJECT/wwwroot/classes/src/AWGraphApplet.class`;
+$ret=`rm -fr $BUILDROOT/$PROJECT/wwwroot/cgi-bin/plugins/testgeo*`;
+$ret=`rm -fr $BUILDROOT/$PROJECT/wwwroot/cgi-bin/plugins/Geo`;
+$ret=`rm -fr $BUILDROOT/$PROJECT/wwwroot/php`;
+$ret=`rm -fr $BUILDROOT/$PROJECT/make`;
+$ret=`rm -fr $BUILDROOT/$PROJECT/test`;
+$ret=`rm -fr $BUILDROOT/$PROJECT/Thumbs.db $BUILDROOT/$PROJECT/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/Thumbs.db`;
+$ret=`rm -fr $BUILDROOT/$PROJECT/CVS* $BUILDROOT/$PROJECT/*/CVS* $BUILDROOT/$PROJECT/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/CVS*`;
+
+rename("$BUILDROOT/$PROJECT","$BUILDROOT/$FILENAMETGZ");
+
+# Build package for each target
+#------------------------------
     foreach my $target (keys %CHOOSEDTARGET) {
-    if ($CHOOSEDTARGET{$target} < 0) { next; }\r
-\r
+    if ($CHOOSEDTARGET{$target} < 0) { next; }
+
         print "\nBuild package for target $target\n";
-\r
-       if ($target eq 'TGZ') {\r
-               unlink $FILENAMETGZ.tgz;\r
-               print "Compress $FILENAMETGZ.tgz into $FILENAMETGZ\n";\r
-               $ret=`tar --directory="$BUILDROOT" -czvf $FILENAMETGZ.tgz $FILENAMETGZ`;\r
-               print "Move $FILENAMETGZ.tgz to $DESTI\n";\r
-               rename("$FILENAMETGZ.tgz","$DESTI/$FILENAMETGZ.tgz");\r
-               next;\r
-       }       \r
-    \r
-       if ($target eq 'ZIP') {\r
+
+       if ($target eq 'TGZ') {
+               unlink $FILENAMETGZ.tgz;
+               print "Compress $FILENAMETGZ.tgz into $FILENAMETGZ\n";
+               $ret=`tar --directory="$BUILDROOT" -czvf $FILENAMETGZ.tgz $FILENAMETGZ`;
+               print "Move $FILENAMETGZ.tgz to $DESTI\n";
+               rename("$FILENAMETGZ.tgz","$DESTI/$FILENAMETGZ.tgz");
+               next;
+       }       
+    
+       if ($target eq 'ZIP') {
                        unlink $FILENAMEZIP.zip;
                        print "Compress $FILENAMETGZ into $FILENAMEZIP.zip...\n";
-               chdir("$BUILDROOT");\r
-               #print "cd $BUILDROOTNT & 7z a -r -tzip -mx $BUILDROOT/$FILENAMEZIP.zip $FILENAMETGZ\\*.*\n";\r
-               #$ret=`cd $BUILDROOTNT & 7z a -r -tzip -mx $BUILDROOT/$FILENAMEZIP.zip $FILENAMETGZ\\*.*`;\r
-               $ret=`7z a -r -tzip -mx $BUILDROOT/$FILENAMEZIP.zip $FILENAMETGZ\\*.*`;\r
-               print "Move $FILENAMEZIP.zip to $DESTI\n";\r
-               rename("$BUILDROOT/$FILENAMEZIP.zip","$DESTI/$FILENAMEZIP.zip");\r
-               next;\r
-       }\r
-\r
+               chdir("$BUILDROOT");
+               #print "cd $BUILDROOTNT & 7z a -r -tzip -mx $BUILDROOT/$FILENAMEZIP.zip $FILENAMETGZ\\*.*\n";
+               #$ret=`cd $BUILDROOTNT & 7z a -r -tzip -mx $BUILDROOT/$FILENAMEZIP.zip $FILENAMETGZ\\*.*`;
+               $ret=`7z a -r -tzip -mx $BUILDROOT/$FILENAMEZIP.zip $FILENAMETGZ\\*.*`;
+               print "Move $FILENAMEZIP.zip to $DESTI\n";
+               rename("$BUILDROOT/$FILENAMEZIP.zip","$DESTI/$FILENAMEZIP.zip");
+               next;
+       }
+
        if ($target eq 'RPM') {                 # Linux only
                $BUILDFIC="$FILENAME.spec";
                unlink $FILENAMETGZ.tgz;
@@ -291,55 +295,55 @@ rename("$BUILDROOT/$PROJECT","$BUILDROOT/$FILENAMETGZ");
 
                print "Copy $SOURCE/make/rpm/${BUILDFIC} to $BUILDROOT\n";
 #              $ret=`cp -p "$SOURCE/make/rpm/${BUILDFIC}" "$BUILDROOT"`;
-            open (SPECFROM,"<$SOURCE/make/rpm/${BUILDFIC}") || die "Error";\r
-            open (SPECTO,">$BUILDROOT/$BUILDFIC") || die "Error";\r
-        while (<SPECFROM>) {\r
-            $_ =~ s/__VERSION__/$MAJOR.$MINOR/;\r
-            print SPECTO $_;\r
-        }\r
-        close SPECFROM;\r
+            open (SPECFROM,"<$SOURCE/make/rpm/${BUILDFIC}") || die "Error";
+            open (SPECTO,">$BUILDROOT/$BUILDFIC") || die "Error";
+        while (<SPECFROM>) {
+            $_ =~ s/__VERSION__/$MAJOR.$MINOR/;
+            print SPECTO $_;
+        }
+        close SPECFROM;
         close SPECTO;
-\r
+
                print "Launch RPM build (rpm --clean -ba $BUILDROOT/${BUILDFIC})\n";
                $ret=`rpm --clean -ba $BUILDROOT/${BUILDFIC}`;
-       \r
+       
                    print "Move $RPMDIR/RPMS/noarch/${FILENAMERPM}.noarch.rpm into $DESTI/${FILENAMERPM}.noarch.rpm\n";
                    $cmd="mv \"$RPMDIR/RPMS/noarch/${FILENAMERPM}.noarch.rpm\" \"$DESTI/${FILENAMERPM}.noarch.rpm\"";
                $ret=`$cmd`;
-               next;\r
-       }\r
-       \r
-       if ($target eq 'DEB') {\r
-        print "Automatic build for DEB is not yet supported.\n";\r
-    }\r
-    \r
-       if ($target eq 'EXE') {\r
+               next;
+       }
+       
+       if ($target eq 'DEB') {
+        print "Automatic build for DEB is not yet supported.\n";
+    }
+    
+       if ($target eq 'EXE') {
                unlink "$FILENAMEEXE.exe";
                print "Compress into $FILENAMEEXE.exe by $FILENAME.nsi...\n";
                $command="\"$REQUIREMENTTARGET{$target}\" /DMUI_VERSION_DOT=$MAJOR.$MINOR /X\"SetCompressor bzip2\" \"$SOURCE\\make\\exe\\$FILENAME.nsi\"";
         print "$command\n";
                $ret=`$command`;
-               print "Move $FILENAMEEXE.exe to $DESTI\n";\r
-               rename("$SOURCE\\make\\exe\\$FILENAMEEXE.exe","$DESTI/$FILENAMEEXE.exe");\r
-               next;\r
-       }\r
-\r
-}\r
-\r
+               print "Move $FILENAMEEXE.exe to $DESTI\n";
+               rename("$SOURCE\\make\\exe\\$FILENAMEEXE.exe","$DESTI/$FILENAMEEXE.exe");
+               next;
+       }
+
+}
+
+}
+
+print "\n----- Summary -----\n";
+foreach my $target (keys %CHOOSEDTARGET) {
+    if ($CHOOSEDTARGET{$target} < 0) {
+        print "Package $target not built (bad requirement).\n";
+    } else {
+        print "Package $target built succeessfully in $DESTI\n";
+    }
 }
 
-print "\n----- Summary -----\n";\r
-foreach my $target (keys %CHOOSEDTARGET) {\r
-    if ($CHOOSEDTARGET{$target} < 0) {\r
-        print "Package $target not built (bad requirement).\n";\r
-    } else {\r
-        print "Package $target built succeessfully in $DESTI\n";\r
-    }\r
-}\r
-\r
 if (! $btach) {
-       print "\nPress key to finish...";\r
-       my $WAITKEY=<STDIN>;\r
+       print "\nPress key to finish...";
+       my $WAITKEY=<STDIN>;
 }
-\r
-0;\r
+
+0;
index aa10bcd266055c9db747b522196af1d5c7806117..ae159a15bacb9852bf5a698b94b85a12d7bce5b5 100644 (file)
@@ -1,5 +1,4 @@
 make
-tools
 CVS
 *~
 awstats-*.tgz