diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index e55fc7887f2..8b2a3fd2adc 100644 --- a/build/makepack-dolibarr.pl +++ b/build/makepack-dolibarr.pl @@ -220,16 +220,17 @@ if ($nboftargetok) { if ($target eq 'TGZ') { unlink $FILENAMETGZ.tgz; -# unlink $BUILDROOT/$FILENAMETGZ.tgz; print "Compress $FILENAMETGZ into $FILENAMETGZ.tgz...\n"; $cmd="tar --exclude-from \"$DESTI/tgz/tar.exclude\" --directory \"$BUILDROOT\" -czvf \"$FILENAMETGZ.tgz\" $FILENAMETGZ"; $ret=`$cmd`; -# $cmd="tar --exclude-from \"$DESTI/tgz/tar.exclude\" --directory \"$BUILDROOT\" -czvf \"$BUILDROOT/$FILENAMETGZ.tgz\" $FILENAMETGZ"; -# $ret=`$cmd`; - if ($OS =~ /windows/i) { + if ($OS =~ /windows/i) + { print "Move $FILENAMETGZ.tgz to $DESTI/$FILENAMETGZ.tgz\n"; $ret=`mv "$FILENAMETGZ.tgz" "$DESTI/$FILENAMETGZ.tgz"`; -# $ret=`mv "$BUILDROOT/$FILENAMETGZ.tgz" "$DESTI/$FILENAMETGZ.tgz"`; + } + else + { + $ret=`mv "$FILENAMETGZ.tgz" "$DESTI/$FILENAMETGZ.tgz"`; } next; } @@ -241,7 +242,7 @@ if ($nboftargetok) { #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"; + print "Move $FILENAMEZIP.zip to $DESTI\n"; rename("$BUILDROOT/$FILENAMEZIP.zip","$DESTI/$FILENAMEZIP.zip"); next; } diff --git a/build/tgz/tar.exclude b/build/tgz/tar.exclude index 3c031580228..91183c2c4fd 100644 --- a/build/tgz/tar.exclude +++ b/build/tgz/tar.exclude @@ -52,9 +52,10 @@ scripts/lolix CVS *~ .#* +.cache +.cvsignore .htaccess .settings -.cvsignore .project Thumbs.db data_dev.sql