diff --git a/build/generate_filelist_xml.php b/build/generate_filelist_xml.php index 94df2206579..0d3d90d54d4 100755 --- a/build/generate_filelist_xml.php +++ b/build/generate_filelist_xml.php @@ -49,6 +49,8 @@ if (empty($argv[1])) print "Example: ".$script_file." release=6.0.0 includecustom=1 includeconstant=FR:INVOICE_CAN_ALWAYS_BE_REMOVED:0 includeconstant=all:MAILING_NO_USING_PHPMAIL:1\n"; exit -1; } +parse_str($argv[1]); + $i=0; while ($i < $argc) { @@ -98,9 +100,9 @@ foreach ($includeconstants as $countrycode => $tmp) print "\n"; //$outputfile=dirname(__FILE__).'/../htdocs/install/filelist-'.$release.'.xml'; -$outputdir=dirname(__FILE__).'/../htdocs/install'; -print 'Delete current files '.$outputdir.'/filelist-'.$release.'.xml'."\n"; -dol_delete_file($outputdir.'/filelist-'.$release.'.xml',0,1,1); +$outputdir=dirname(dirname(__FILE__)).'/htdocs/install'; +print 'Delete current files '.$outputdir.'/filelist*.xml'."\n"; +dol_delete_file($outputdir.'/filelist*.xml',0,1,1); $checksumconcat=array(); diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php index 9b6435d8210..db05918e8a6 100644 --- a/htdocs/filefunc.inc.php +++ b/htdocs/filefunc.inc.php @@ -31,7 +31,7 @@ */ if (! defined('DOL_APPLICATION_TITLE')) define('DOL_APPLICATION_TITLE','Dolibarr'); -if (! defined('DOL_VERSION')) define('DOL_VERSION','6.0.0-rc'); // a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c +if (! defined('DOL_VERSION')) define('DOL_VERSION','6.0.0'); // a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c if (! defined('EURO')) define('EURO',chr(128));