From 6113595e5249ec1716bf9ec29898a2c43b8ac040 Mon Sep 17 00:00:00 2001 From: "Laurent Destailleur (aka Eldy)" Date: Tue, 10 Dec 2024 11:21:38 +0100 Subject: [PATCH] Move build into dev --- {build => dev/build}/.cvsignore | 0 {build => dev/build}/.gitignore | 0 {build => dev/build}/README.txt | 0 {build => dev/build}/makepack-AWStats.conf | 2 +- {build => dev/build}/makepack-Alumni.conf | 2 +- .../build}/makepack-BilledOnOrders.conf | 2 +- {build => dev/build}/makepack-BitTorrent.conf | 2 +- {build => dev/build}/makepack-ConcatPdf.conf | 2 +- {build => dev/build}/makepack-EcoTaxDeee.conf | 2 +- {build => dev/build}/makepack-FacturXUtil.conf | 2 +- {build => dev/build}/makepack-FileManager.conf | 2 +- {build => dev/build}/makepack-Google.conf | 2 +- {build => dev/build}/makepack-HelloAsso.conf | 2 +- {build => dev/build}/makepack-IPPhone.conf | 2 +- {build => dev/build}/makepack-Memcached.conf | 2 +- {build => dev/build}/makepack-Monitoring.conf | 2 +- {build => dev/build}/makepack-NumberWords.conf | 2 +- {build => dev/build}/makepack-NumberingPack.conf | 2 +- {build => dev/build}/makepack-OpenStreetMap.conf | 2 +- {build => dev/build}/makepack-Ovh.conf | 2 +- {build => dev/build}/makepack-PHPSysInfo.conf | 2 +- {build => dev/build}/makepack-PiBarcode.conf | 2 +- {build => dev/build}/makepack-SaftPt.conf | 2 +- {build => dev/build}/makepack-Scanner.conf | 2 +- {build => dev/build}/makepack-SelectBank.conf | 2 +- .../build}/makepack-SkinColorEditor.conf | 2 +- .../build}/makepack-SubmitEveryWhere.conf | 2 +- {build => dev/build}/makepack-TawkTo.conf | 2 +- {build => dev/build}/makepack-TvaCerfa.conf | 2 +- {build => dev/build}/makepack-ZipAutoFillFr.conf | 2 +- {build => dev/build}/makepack-dolibarrmodule.pl | 16 ++++++++-------- {build => dev/build}/makepack-dolibarrtheme.pl | 0 {build => dev/build}/tgz/tar_exclude.txt | 0 33 files changed, 35 insertions(+), 35 deletions(-) rename {build => dev/build}/.cvsignore (100%) rename {build => dev/build}/.gitignore (100%) rename {build => dev/build}/README.txt (100%) rename {build => dev/build}/makepack-AWStats.conf (94%) rename {build => dev/build}/makepack-Alumni.conf (94%) rename {build => dev/build}/makepack-BilledOnOrders.conf (86%) rename {build => dev/build}/makepack-BitTorrent.conf (93%) rename {build => dev/build}/makepack-ConcatPdf.conf (93%) rename {build => dev/build}/makepack-EcoTaxDeee.conf (88%) rename {build => dev/build}/makepack-FacturXUtil.conf (93%) rename {build => dev/build}/makepack-FileManager.conf (95%) rename {build => dev/build}/makepack-Google.conf (95%) rename {build => dev/build}/makepack-HelloAsso.conf (94%) rename {build => dev/build}/makepack-IPPhone.conf (95%) rename {build => dev/build}/makepack-Memcached.conf (93%) rename {build => dev/build}/makepack-Monitoring.conf (93%) rename {build => dev/build}/makepack-NumberWords.conf (91%) rename {build => dev/build}/makepack-NumberingPack.conf (90%) rename {build => dev/build}/makepack-OpenStreetMap.conf (93%) rename {build => dev/build}/makepack-Ovh.conf (95%) rename {build => dev/build}/makepack-PHPSysInfo.conf (93%) rename {build => dev/build}/makepack-PiBarcode.conf (94%) rename {build => dev/build}/makepack-SaftPt.conf (94%) rename {build => dev/build}/makepack-Scanner.conf (94%) rename {build => dev/build}/makepack-SelectBank.conf (93%) rename {build => dev/build}/makepack-SkinColorEditor.conf (92%) rename {build => dev/build}/makepack-SubmitEveryWhere.conf (93%) rename {build => dev/build}/makepack-TawkTo.conf (93%) rename {build => dev/build}/makepack-TvaCerfa.conf (94%) rename {build => dev/build}/makepack-ZipAutoFillFr.conf (87%) rename {build => dev/build}/makepack-dolibarrmodule.pl (95%) rename {build => dev/build}/makepack-dolibarrtheme.pl (100%) rename {build => dev/build}/tgz/tar_exclude.txt (100%) diff --git a/build/.cvsignore b/dev/build/.cvsignore similarity index 100% rename from build/.cvsignore rename to dev/build/.cvsignore diff --git a/build/.gitignore b/dev/build/.gitignore similarity index 100% rename from build/.gitignore rename to dev/build/.gitignore diff --git a/build/README.txt b/dev/build/README.txt similarity index 100% rename from build/README.txt rename to dev/build/README.txt diff --git a/build/makepack-AWStats.conf b/dev/build/makepack-AWStats.conf similarity index 94% rename from build/makepack-AWStats.conf rename to dev/build/makepack-AWStats.conf index 432e60941..d0b08495e 100644 --- a/build/makepack-AWStats.conf +++ b/dev/build/makepack-AWStats.conf @@ -9,5 +9,5 @@ # then edit setup parameters for this module. # # Files in module -build/makepack-AWStats.conf +dev/build/makepack-AWStats.conf htdocs/awstats/ \ No newline at end of file diff --git a/build/makepack-Alumni.conf b/dev/build/makepack-Alumni.conf similarity index 94% rename from build/makepack-Alumni.conf rename to dev/build/makepack-Alumni.conf index 0bc890294..0bef80025 100644 --- a/build/makepack-Alumni.conf +++ b/dev/build/makepack-Alumni.conf @@ -9,5 +9,5 @@ # then edit setup parameters for this module. # # Files in module -build/makepack-Alumni.conf +dev/build/makepack-Alumni.conf htdocs/alumni/ diff --git a/build/makepack-BilledOnOrders.conf b/dev/build/makepack-BilledOnOrders.conf similarity index 86% rename from build/makepack-BilledOnOrders.conf rename to dev/build/makepack-BilledOnOrders.conf index 77977f35f..2a4aa787e 100644 --- a/build/makepack-BilledOnOrders.conf +++ b/dev/build/makepack-BilledOnOrders.conf @@ -7,5 +7,5 @@ # Setup: # # Files in module -build/makepack-BilledOnOrders.conf +dev/build/makepack-BilledOnOrders.conf htdocs/billedonorders/ \ No newline at end of file diff --git a/build/makepack-BitTorrent.conf b/dev/build/makepack-BitTorrent.conf similarity index 93% rename from build/makepack-BitTorrent.conf rename to dev/build/makepack-BitTorrent.conf index 262d42849..deedf8726 100644 --- a/build/makepack-BitTorrent.conf +++ b/dev/build/makepack-BitTorrent.conf @@ -9,5 +9,5 @@ # then edit setup parameters for this module. # # Files in module -build/makepack-BitTorrent.conf +dev/build/makepack-BitTorrent.conf htdocs/bittorrent \ No newline at end of file diff --git a/build/makepack-ConcatPdf.conf b/dev/build/makepack-ConcatPdf.conf similarity index 93% rename from build/makepack-ConcatPdf.conf rename to dev/build/makepack-ConcatPdf.conf index 26ea47ca2..6611780ef 100755 --- a/build/makepack-ConcatPdf.conf +++ b/dev/build/makepack-ConcatPdf.conf @@ -8,5 +8,5 @@ # Setup: Put your PDF files into directory define into the module setup page. # # Files in module -build/makepack-ConcatPdf.conf +dev/build/makepack-ConcatPdf.conf htdocs/concatpdf \ No newline at end of file diff --git a/build/makepack-EcoTaxDeee.conf b/dev/build/makepack-EcoTaxDeee.conf similarity index 88% rename from build/makepack-EcoTaxDeee.conf rename to dev/build/makepack-EcoTaxDeee.conf index 3e114fb13..2bbff4ec3 100644 --- a/build/makepack-EcoTaxDeee.conf +++ b/dev/build/makepack-EcoTaxDeee.conf @@ -7,6 +7,6 @@ # Setup: # # Files in module -build/makepack-EcoTaxDeee.conf +dev/build/makepack-EcoTaxDeee.conf htdocs/ecotaxdeee/ !htdocs/ecotaxdeee/doc \ No newline at end of file diff --git a/build/makepack-FacturXUtil.conf b/dev/build/makepack-FacturXUtil.conf similarity index 93% rename from build/makepack-FacturXUtil.conf rename to dev/build/makepack-FacturXUtil.conf index e57d61623..d7b00d5a4 100644 --- a/build/makepack-FacturXUtil.conf +++ b/dev/build/makepack-FacturXUtil.conf @@ -9,5 +9,5 @@ # then edit setup parameters for this module. # # Files in module -build/makepack-FacturXUtil.conf +dev/build/makepack-FacturXUtil.conf htdocs/facturxutil \ No newline at end of file diff --git a/build/makepack-FileManager.conf b/dev/build/makepack-FileManager.conf similarity index 95% rename from build/makepack-FileManager.conf rename to dev/build/makepack-FileManager.conf index 3628b273a..d23f8bc49 100644 --- a/build/makepack-FileManager.conf +++ b/dev/build/makepack-FileManager.conf @@ -11,6 +11,6 @@ # then edit setup parameters for this module. # # Files in module -build/makepack-FileManager.conf +dev/build/makepack-FileManager.conf htdocs/filemanager !htdocs/filemanager/includes/geshi/docs \ No newline at end of file diff --git a/build/makepack-Google.conf b/dev/build/makepack-Google.conf similarity index 95% rename from build/makepack-Google.conf rename to dev/build/makepack-Google.conf index 64ecaae19..e1685ef78 100644 --- a/build/makepack-Google.conf +++ b/dev/build/makepack-Google.conf @@ -9,7 +9,7 @@ # then edit setup parameters for this module. # # Files in module -build/makepack-Google.conf +dev/build/makepack-Google.conf htdocs/google !htdocs/google/img/screen_shot_google* !htdocs/google/includes/google-api-php-client/examples diff --git a/build/makepack-HelloAsso.conf b/dev/build/makepack-HelloAsso.conf similarity index 94% rename from build/makepack-HelloAsso.conf rename to dev/build/makepack-HelloAsso.conf index 4f737721a..bc79e144a 100644 --- a/build/makepack-HelloAsso.conf +++ b/dev/build/makepack-HelloAsso.conf @@ -9,5 +9,5 @@ # then edit setup parameters for this module. # # Files in module -build/makepack-HelloAsso.conf +dev/build/makepack-HelloAsso.conf htdocs/helloasso diff --git a/build/makepack-IPPhone.conf b/dev/build/makepack-IPPhone.conf similarity index 95% rename from build/makepack-IPPhone.conf rename to dev/build/makepack-IPPhone.conf index 1b8c26d63..6d7756543 100644 --- a/build/makepack-IPPhone.conf +++ b/dev/build/makepack-IPPhone.conf @@ -9,5 +9,5 @@ # http://yourserver/yourdolibarrvhos/thomsonphonebook/thomsonphonebook.php?search= # # Files in module -build/makepack-IPPhone.conf +dev/build/makepack-IPPhone.conf htdocs/ipphone \ No newline at end of file diff --git a/build/makepack-Memcached.conf b/dev/build/makepack-Memcached.conf similarity index 93% rename from build/makepack-Memcached.conf rename to dev/build/makepack-Memcached.conf index c30e412a9..6d1f2c555 100755 --- a/build/makepack-Memcached.conf +++ b/dev/build/makepack-Memcached.conf @@ -9,5 +9,5 @@ # then edit setup parameters for this module. # # Files in module -build/makepack-Memcached.conf +dev/build/makepack-Memcached.conf htdocs/memcached \ No newline at end of file diff --git a/build/makepack-Monitoring.conf b/dev/build/makepack-Monitoring.conf similarity index 93% rename from build/makepack-Monitoring.conf rename to dev/build/makepack-Monitoring.conf index 996892baa..e8cb81c36 100755 --- a/build/makepack-Monitoring.conf +++ b/dev/build/makepack-Monitoring.conf @@ -9,5 +9,5 @@ # then edit setup parameters for this module. # # Files in module -build/makepack-Monitoring.conf +dev/build/makepack-Monitoring.conf htdocs/monitoring/ \ No newline at end of file diff --git a/build/makepack-NumberWords.conf b/dev/build/makepack-NumberWords.conf similarity index 91% rename from build/makepack-NumberWords.conf rename to dev/build/makepack-NumberWords.conf index 32c4aed06..01dcabd21 100755 --- a/build/makepack-NumberWords.conf +++ b/dev/build/makepack-NumberWords.conf @@ -7,5 +7,5 @@ # Setup: None # # Files in module -build/makepack-NumberWords.conf +dev/build/makepack-NumberWords.conf htdocs/numberwords/ \ No newline at end of file diff --git a/build/makepack-NumberingPack.conf b/dev/build/makepack-NumberingPack.conf similarity index 90% rename from build/makepack-NumberingPack.conf rename to dev/build/makepack-NumberingPack.conf index a7b12fb0c..650eda81d 100644 --- a/build/makepack-NumberingPack.conf +++ b/dev/build/makepack-NumberingPack.conf @@ -7,5 +7,5 @@ # Setup: None # # Files in module -build/makepack-NumberingPack.conf +dev/build/makepack-NumberingPack.conf htdocs/numberingpack/ \ No newline at end of file diff --git a/build/makepack-OpenStreetMap.conf b/dev/build/makepack-OpenStreetMap.conf similarity index 93% rename from build/makepack-OpenStreetMap.conf rename to dev/build/makepack-OpenStreetMap.conf index 0c5244976..998f64673 100644 --- a/build/makepack-OpenStreetMap.conf +++ b/dev/build/makepack-OpenStreetMap.conf @@ -9,5 +9,5 @@ # then edit setup parameters for this module. # # Files in module -build/makepack-OpenStreetMap.conf +dev/build/makepack-OpenStreetMap.conf htdocs/openstreetmap \ No newline at end of file diff --git a/build/makepack-Ovh.conf b/dev/build/makepack-Ovh.conf similarity index 95% rename from build/makepack-Ovh.conf rename to dev/build/makepack-Ovh.conf index ea895fe11..2fcef0107 100644 --- a/build/makepack-Ovh.conf +++ b/dev/build/makepack-Ovh.conf @@ -9,6 +9,6 @@ # then edit setup parameters for this module. # # Files in module -build/makepack-Ovh.conf +dev/build/makepack-Ovh.conf htdocs/ovh !htdocs/ovh/img/screen_shot* diff --git a/build/makepack-PHPSysInfo.conf b/dev/build/makepack-PHPSysInfo.conf similarity index 93% rename from build/makepack-PHPSysInfo.conf rename to dev/build/makepack-PHPSysInfo.conf index 7da0869f0..0cc04125d 100644 --- a/build/makepack-PHPSysInfo.conf +++ b/dev/build/makepack-PHPSysInfo.conf @@ -9,5 +9,5 @@ # then edit setup parameters for this module. # # Files in module -build/makepack-PHPSysInfo.conf +dev/build/makepack-PHPSysInfo.conf htdocs/phpsysinfo \ No newline at end of file diff --git a/build/makepack-PiBarcode.conf b/dev/build/makepack-PiBarcode.conf similarity index 94% rename from build/makepack-PiBarcode.conf rename to dev/build/makepack-PiBarcode.conf index bbdd26fa6..8b43e9209 100644 --- a/build/makepack-PiBarcode.conf +++ b/dev/build/makepack-PiBarcode.conf @@ -9,5 +9,5 @@ # Setup: Go on barcode module setup. A new barcode generator calle pibarcode must appear. # # Files in module -build/makepack-PiBarcode.conf +dev/build/makepack-PiBarcode.conf htdocs/pibarcode/ \ No newline at end of file diff --git a/build/makepack-SaftPt.conf b/dev/build/makepack-SaftPt.conf similarity index 94% rename from build/makepack-SaftPt.conf rename to dev/build/makepack-SaftPt.conf index 6f5a82897..76b785fcd 100755 --- a/build/makepack-SaftPt.conf +++ b/dev/build/makepack-SaftPt.conf @@ -9,5 +9,5 @@ # then edit setup parameters for this module. # # Files in module -build/makepack-SaftPt.conf +dev/build/makepack-SaftPt.conf htdocs/saftpt \ No newline at end of file diff --git a/build/makepack-Scanner.conf b/dev/build/makepack-Scanner.conf similarity index 94% rename from build/makepack-Scanner.conf rename to dev/build/makepack-Scanner.conf index e8543d7c1..6b82a9e36 100755 --- a/build/makepack-Scanner.conf +++ b/dev/build/makepack-Scanner.conf @@ -9,5 +9,5 @@ # then edit setup parameters for this module. # # Files in module -build/makepack-Scanner.conf +dev/build/makepack-Scanner.conf htdocs/scanner \ No newline at end of file diff --git a/build/makepack-SelectBank.conf b/dev/build/makepack-SelectBank.conf similarity index 93% rename from build/makepack-SelectBank.conf rename to dev/build/makepack-SelectBank.conf index 4a995b7ff..12057441d 100755 --- a/build/makepack-SelectBank.conf +++ b/dev/build/makepack-SelectBank.conf @@ -8,5 +8,5 @@ # Setup: Put your PDF files into directory define into the module setup page. # # Files in module -build/makepack-SelectBank.conf +dev/build/makepack-SelectBank.conf htdocs/selectbank \ No newline at end of file diff --git a/build/makepack-SkinColorEditor.conf b/dev/build/makepack-SkinColorEditor.conf similarity index 92% rename from build/makepack-SkinColorEditor.conf rename to dev/build/makepack-SkinColorEditor.conf index cd4fe9780..57ca74bbe 100755 --- a/build/makepack-SkinColorEditor.conf +++ b/dev/build/makepack-SkinColorEditor.conf @@ -8,5 +8,5 @@ # Setup: Go into module setup page or on new user tab "Color editor". # # Files in module -build/makepack-SkinColorEditor.conf +dev/build/makepack-SkinColorEditor.conf htdocs/skincoloreditor \ No newline at end of file diff --git a/build/makepack-SubmitEveryWhere.conf b/dev/build/makepack-SubmitEveryWhere.conf similarity index 93% rename from build/makepack-SubmitEveryWhere.conf rename to dev/build/makepack-SubmitEveryWhere.conf index b0d610347..4ddc6d9f6 100755 --- a/build/makepack-SubmitEveryWhere.conf +++ b/dev/build/makepack-SubmitEveryWhere.conf @@ -9,5 +9,5 @@ # then edit setup parameters for this module. # # Files in module -build/makepack-SubmitEveryWhere.conf +dev/build/makepack-SubmitEveryWhere.conf htdocs/submiteverywhere \ No newline at end of file diff --git a/build/makepack-TawkTo.conf b/dev/build/makepack-TawkTo.conf similarity index 93% rename from build/makepack-TawkTo.conf rename to dev/build/makepack-TawkTo.conf index db0d23c8e..b64d189ea 100755 --- a/build/makepack-TawkTo.conf +++ b/dev/build/makepack-TawkTo.conf @@ -8,5 +8,5 @@ # Setup: Just enter the TawkTo ID of the support provider into the setup of module. # # Files in module -build/makepack-TawkTo.conf +dev/build/makepack-TawkTo.conf htdocs/tawkto \ No newline at end of file diff --git a/build/makepack-TvaCerfa.conf b/dev/build/makepack-TvaCerfa.conf similarity index 94% rename from build/makepack-TvaCerfa.conf rename to dev/build/makepack-TvaCerfa.conf index 382d16627..a994fb783 100755 --- a/build/makepack-TvaCerfa.conf +++ b/dev/build/makepack-TvaCerfa.conf @@ -9,5 +9,5 @@ # then edit setup parameters for this module. # # Files in module -build/makepack-TvaCerfa.conf +dev/build/makepack-TvaCerfa.conf htdocs/tvacerfa \ No newline at end of file diff --git a/build/makepack-ZipAutoFillFr.conf b/dev/build/makepack-ZipAutoFillFr.conf similarity index 87% rename from build/makepack-ZipAutoFillFr.conf rename to dev/build/makepack-ZipAutoFillFr.conf index 06905b0a7..71d3a083f 100644 --- a/build/makepack-ZipAutoFillFr.conf +++ b/dev/build/makepack-ZipAutoFillFr.conf @@ -7,5 +7,5 @@ # Setup: # # Files in module -build/makepack-ZipAutoFillFr.conf +dev/build/makepack-ZipAutoFillFr.conf htdocs/zipautofillfr/ \ No newline at end of file diff --git a/build/makepack-dolibarrmodule.pl b/dev/build/makepack-dolibarrmodule.pl similarity index 95% rename from build/makepack-dolibarrmodule.pl rename to dev/build/makepack-dolibarrmodule.pl index 0cd70661b..87d2688cd 100755 --- a/build/makepack-dolibarrmodule.pl +++ b/dev/build/makepack-dolibarrmodule.pl @@ -1,6 +1,6 @@ #!/usr/bin/perl #---------------------------------------------------------------------------- -# \file build/makepack-dolibarrmodule.pl +# \file dev/build/makepack-dolibarrmodule.pl # \brief Package builder (tgz, zip, rpm, deb, exe) # \author (c)2005-2014 Laurent Destailleur #---------------------------------------------------------------------------- @@ -77,8 +77,8 @@ $FILENAMESNAPSHOT.="-".$PREFIX; } } -$SOURCE="$DIR/.."; -$DESTI="$SOURCE/build"; +$SOURCE="$DIR/../.."; +$DESTI="$SOURCE/dev/build"; if ($ENV{"DESTIMODULES"}) { $DESTI = $ENV{"DESTIMODULES"}; } # Force output dir if env DESTIMODULES is defined $NEWDESTI=$DESTI; @@ -274,10 +274,10 @@ @timearray=localtime(time()); $fulldate=($timearray[5]+1900).'-'.($timearray[4]+1).'-'.$timearray[3].' '.$timearray[2].':'.$timearray[1]; - open(VF,">$BUILDROOT/$PROJECTLC/build/version-".$PROJECTLC.".txt"); + open(VF,">$BUILDROOT/$PROJECTLC/dev/build/version-".$PROJECTLC.".txt"); - print "Create version file $BUILDROOT/$PROJECTLC/build/version-".$PROJECTLC.".txt with date ".$fulldate."\n"; - $ret=`mkdir -p "$BUILDROOT/$PROJECTLC/build"`; + print "Create version file $BUILDROOT/$PROJECTLC/dev/build/version-".$PROJECTLC.".txt with date ".$fulldate."\n"; + $ret=`mkdir -p "$BUILDROOT/$PROJECTLC/dev/build"`; print VF "Version: ".$MAJOR.".".$MINOR.($BUILD ne ''?".$BUILD":"")."\n"; print VF "Build : ".$fulldate."\n"; close VF; @@ -357,11 +357,11 @@ print "Remove target $FILENAMEEXE.exe...\n"; unlink "$NEWDESTI/$FILENAMEEXE.exe"; print "Compress into $FILENAMEEXE.exe by $FILENAMEEXE.nsi...\n"; - $command="\"$REQUIREMENTTARGET{$target}\" /DMUI_VERSION_DOT=$MAJOR.$MINOR.$BUILD /X\"SetCompressor bzip2\" \"$SOURCE\\build\\exe\\$FILENAME.nsi\""; + $command="\"$REQUIREMENTTARGET{$target}\" /DMUI_VERSION_DOT=$MAJOR.$MINOR.$BUILD /X\"SetCompressor bzip2\" \"$SOURCE\\dev\\build\\exe\\$FILENAME.nsi\""; print "$command\n"; $ret=`$command`; print "Move $FILENAMEEXE.exe to $NEWDESTI\n"; - rename("$SOURCE\\build\\exe\\$FILENAMEEXE.exe","$NEWDESTI/$FILENAMEEXE.exe"); + rename("$SOURCE\\dev\\build\\exe\\$FILENAMEEXE.exe","$NEWDESTI/$FILENAMEEXE.exe"); next; } diff --git a/build/makepack-dolibarrtheme.pl b/dev/build/makepack-dolibarrtheme.pl similarity index 100% rename from build/makepack-dolibarrtheme.pl rename to dev/build/makepack-dolibarrtheme.pl diff --git a/build/tgz/tar_exclude.txt b/dev/build/tgz/tar_exclude.txt similarity index 100% rename from build/tgz/tar_exclude.txt rename to dev/build/tgz/tar_exclude.txt