Update packager to work with git

diff --git a/make/.gitignore b/make/.gitignore
new file mode 100644 (file)
index 0000000..074ccd8
--- /dev/null
+++ b/make/.gitignore
@@ -0,0 +1 @@
+awstats-*.*

diff --git a/make/makepack-awstats.pl b/make/makepack-awstats.pl
index c88e10c86adf7244915df7fb59ecf6a1950e07de..050532ac8c701d718f933e6e59d0176a005977a5 100755 (executable)
--- a/make/makepack-awstats.pl
+++ b/make/makepack-awstats.pl
@@ -10,9 +10,11 @@ use Cwd;
 
 $PROJECT="awstats";
 $MAJOR="7";
-$MINOR="2";
+$MINOR="3";
 $RPMSUBVERSION="1";
 
+$WBMVERSION="2.0";
+
 @LISTETARGET=("TGZ","ZIP","RPM","DEB","EXE");   # Possible packages
 %REQUIREMENTTARGET=(                            # Tool requirement for each package
 "TGZ"=>"tar",
@@ -177,7 +179,7 @@ foreach my $target (keys %CHOOSEDTARGET) {
             last;
         } else {
             # Pas erreur ou erreur autre que programme absent
-            print " Found ".$REQUIREMENTTARGET{$target}."\n";
+            print " Found ".$req."\n";
         }
     }
 }
@@ -266,6 +268,15 @@ $ret=`rm -fr $BUILDROOT/$PROJECT/CVS* $BUILDROOT/$PROJECT/*/CVS* $BUILDROOT/$PRO
 
 rename("$BUILDROOT/$PROJECT","$BUILDROOT/$FILENAMETGZ");
 
+
+# Check WBM file was generated and stored into webmin directory
+if (! -f "$BUILDROOT/$FILENAMETGZ/tools/webmin/awstats-".$WBMVERSION.".wbm")
+{
+       print "Error: You must generate wbm file with makepack-awstats_webmin.pl first.";
+       exit 0; 
+}
+
+
 # Build package for each target
 #------------------------------
     foreach my $target (keys %CHOOSEDTARGET) {

diff --git a/make/makepack-awstats_webmin.pl b/make/makepack-awstats_webmin.pl
old mode 100644 (file)
new mode 100755 (executable)
index 5ae1942..6e82c08
--- a/make/makepack-awstats_webmin.pl
+++ b/make/makepack-awstats_webmin.pl
@@ -164,7 +164,7 @@ foreach my $target (keys %CHOOSEDTARGET) {
             last;
         } else {
             # Pas erreur ou erreur autre que programme absent
-            print " Found ".$REQUIREMENTTARGET{$target}."\n";
+            print " Found ".$req."\n";
         }
     }
 }

diff --git a/tools/webmin/.gitignore b/tools/webmin/.gitignore
new file mode 100644 (file)
index 0000000..dff8769
--- /dev/null
+++ b/tools/webmin/.gitignore
@@ -0,0 +1 @@
+*.wbm