|
@@ -45,7 +45,7 @@ $includeconstants=array();
|
|
|
|
|
|
if (empty($argv[1]))
|
|
|
{
|
|
|
- print "Usage: ".$script_file." release=autostable|auto|x.y.z[-mybuild] [includecustom=1] [includeconstant=CC:MY_CONF_NAME:value]\n";
|
|
|
+ print "Usage: ".$script_file." release=autostable|auto[-mybuild]|x.y.z[-mybuild] [includecustom=1] [includeconstant=CC:MY_CONF_NAME:value]\n";
|
|
|
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;
|
|
|
}
|
|
@@ -68,6 +68,13 @@ while ($i < $argc)
|
|
|
$i++;
|
|
|
}
|
|
|
|
|
|
+if (empty($release))
|
|
|
+{
|
|
|
+ print "Error: Missing release paramater\n";
|
|
|
+ print "Usage: ".$script_file." release=autostable|auto[-mybuild]|x.y.z[-mybuild] [includecustom=1] [includeconstant=CC:MY_CONF_NAME:value]\n";
|
|
|
+ exit -1;
|
|
|
+}
|
|
|
+
|
|
|
$savrelease = $release;
|
|
|
|
|
|
// If release is auto, we take current version
|
|
@@ -86,7 +93,7 @@ if (empty($includecustom))
|
|
|
if (DOL_VERSION != $tmpverbis[0] && $savrelease != 'auto')
|
|
|
{
|
|
|
print 'Error: When parameter "includecustom" is not set and there is no suffix in release parameter, version declared into filefunc.in.php ('.DOL_VERSION.') must be exact same value than "release" parameter ('.$tmpverbis[0].')'."\n";
|
|
|
- print "Usage: ".$script_file." release=x.y.z[-...] [includecustom=1]\n";
|
|
|
+ print "Usage: ".$script_file." release=autostable|auto[-mybuild]|x.y.z[-mybuild] [includecustom=1] [includeconstant=CC:MY_CONF_NAME:value]\n";
|
|
|
exit -1;
|
|
|
}
|
|
|
}
|
|
@@ -96,7 +103,7 @@ if (empty($includecustom))
|
|
|
if ($tmpverter[0] != $tmpverbis[0])
|
|
|
{
|
|
|
print 'Error: When parameter "includecustom" is not set, version declared into filefunc.in.php ('.DOL_VERSION.') must have value without prefix ('.$tmpverter[0].') that is exact same value than "release" parameter ('.$tmpverbis[0].')'."\n";
|
|
|
- print "Usage: ".$script_file." release=x.y.z[-...] [includecustom=1]\n";
|
|
|
+ print "Usage: ".$script_file." release=autostable|auto[-mybuild]|x.y.z[-mybuild] [includecustom=1] [includeconstant=CC:MY_CONF_NAME:value]\n";
|
|
|
exit -1;
|
|
|
}
|
|
|
}
|
|
@@ -106,7 +113,7 @@ else
|
|
|
if (! preg_match('/'.preg_quote(DOL_VERSION,'/').'-/',$release))
|
|
|
{
|
|
|
print 'Error: When parameter "includecustom" is set, version declared into filefunc.inc.php ('.DOL_VERSION.') must be used with a suffix into "release" parameter (ex: '.DOL_VERSION.'-mydistrib).'."\n";
|
|
|
- print "Usage: ".$script_file." release=x.y.z[-...] [includecustom=1]\n";
|
|
|
+ print "Usage: ".$script_file." release=autostable|auto[-mybuild]|x.y.z[-mybuild] [includecustom=1] [includeconstant=CC:MY_CONF_NAME:value]\n";
|
|
|
exit -1;
|
|
|
}
|
|
|
}
|