From 6f2652f2b615aae6d4bf573f68cae626f7d235af Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 11 Sep 2013 23:07:47 +0200 Subject: [PATCH 1/2] Fix: Use correct standard --- htdocs/includes/jsgantt/{jsgantt.compressed.js => jsgantt.min.js} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename htdocs/includes/jsgantt/{jsgantt.compressed.js => jsgantt.min.js} (100%) diff --git a/htdocs/includes/jsgantt/jsgantt.compressed.js b/htdocs/includes/jsgantt/jsgantt.min.js similarity index 100% rename from htdocs/includes/jsgantt/jsgantt.compressed.js rename to htdocs/includes/jsgantt/jsgantt.min.js From 239cb0261342450b5e76b18edc172ea9443fe124 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 11 Sep 2013 23:10:19 +0200 Subject: [PATCH 2/2] Doc --- build/makepack-howto.txt | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/build/makepack-howto.txt b/build/makepack-howto.txt index 4847b0102ef..5a130227945 100644 --- a/build/makepack-howto.txt +++ b/build/makepack-howto.txt @@ -9,16 +9,16 @@ beta version of Dolibarr, step by step. - Check all files are commited. - Update version/info in /ChangeLog -- Update version number with x.x.x-y in htdocs/filefunc.inc.php -- Update version number with x.x.x-y in build/makepack-dolibarr.pl -- Update version number with x.x.x-y in build/debian/changelog -- Update version number with x.x.x-y in build/exe/doliwamp/doliwamp.iss -- Update version number with x.x.x-y in build/rpm/*.spec -- Update version number with x.x.x in build/doxygen/dolibarr-doxygen.doxyfile -- Update version number with x.x.x in build/perl/virtualmin/dolibarr.pl +- Update version number with x.y.z-w in htdocs/filefunc.inc.php +- Update version number with x.y.z-w in build/makepack-dolibarr.pl +- Update version number with x.y.z-w in build/debian/changelog +- Update version number with x.y.z-w in build/exe/doliwamp/doliwamp.iss +- Update version number with x.y.z-w in build/rpm/*.spec +- Update version number with x.y.z in build/doxygen/dolibarr-doxygen.doxyfile +- Update version number with x.y.z in build/perl/virtualmin/dolibarr.pl - Commit all changes. -- Add a Tag (DOLIBARR_x_y_BETA) -- Create a branch (DOLIBARR_x_y_BRANCH). +- Add a Tag (x.y.betaz_YYYYMMDD) and push it: git push --tags +- Create a branch (x.y). - Run makepack-dolibarr.pl to generate all packages. - Move build files into www.dolibarr.org web site (/home/dolibarr/wwwroot/files). @@ -33,14 +33,14 @@ complete release of Dolibarr, step by step. - Check all files are commited. - Update version/info in ChangeLog -- Update version number with x.x.x in htdocs/filefunc.inc.php -- Update version number with x.x.x in build/makepack-dolibarr.pl -- Update version number with x.x.x in build/debian/changelog -- Update version number with x.x.x in build/exe/doliwamp/doliwamp.iss -- Update version number with x.x.x in build/rpm/*.spec +- Update version number with x.y.z in htdocs/filefunc.inc.php +- Update version number with x.y.z in build/makepack-dolibarr.pl +- Update version number with x.y.z in build/debian/changelog +- Update version number with x.y.z in build/exe/doliwamp/doliwamp.iss +- Update version number with x.y.z in build/rpm/*.spec - Update PAD files. - Commit all changes. -- Add a Tag (DOLIBARR_x_y) +- Add a Tag (x.y.z) - Build Dolibarr and DoliWamp packages with makepack-dolibarr.pl - Check content of built packages.