mirror of https://github.com/CGAL/cgal
Replace --is_master by --integration
The old option was completely useless: it was ON by default, and had a flag to set it ON again!
This commit is contained in:
parent
ed377100ee
commit
4b489b4c02
|
|
@ -22,7 +22,7 @@ SOURCES_DIR="$PWD" # Directory containing the sources, default is "$PWD"
|
||||||
VERBOSE="" # Verbose mode (displays log to standard err)
|
VERBOSE="" # Verbose mode (displays log to standard err)
|
||||||
BETA="" #If set, will change the release number and version number accordingly.
|
BETA="" #If set, will change the release number and version number accordingly.
|
||||||
DESTINATION="$PWD"
|
DESTINATION="$PWD"
|
||||||
IS_MASTER="y"
|
INTEGRATION=""
|
||||||
|
|
||||||
SOURCES_DIR_HAS_BEEN_SET=
|
SOURCES_DIR_HAS_BEEN_SET=
|
||||||
|
|
||||||
|
|
@ -45,10 +45,10 @@ usage() {
|
||||||
printerr ' --no-testsuite : when used with --do-it, the tag is made, files are published,'
|
printerr ' --no-testsuite : when used with --do-it, the tag is made, files are published,'
|
||||||
printerr ' but the LATEST file is not updated.'
|
printerr ' but the LATEST file is not updated.'
|
||||||
printerr ' --verbose : print log to standard output, instead of the log file'
|
printerr ' --verbose : print log to standard output, instead of the log file'
|
||||||
printerr ' --beta <n> : followed by a number. When used with --public, will modify
|
printerr ' --beta <n> : followed by a number. When used with --public, will modify
|
||||||
the release number and the release version name to include beta<n>'
|
the release number and the release version name to include beta<n>'
|
||||||
printerr ' --dest : followed by the path to where the release should be created. Default is /tmp.'
|
printerr ' --dest : followed by the path to where the release should be created. Default is /tmp.'
|
||||||
printerr ' --is_master : replace the Ic in the name by I.'
|
printerr ' --integration : replace the I in the name by Ic.'
|
||||||
printerr ' <packages dir> : the directory containing the packages [default is trunk]'
|
printerr ' <packages dir> : the directory containing the packages [default is trunk]'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -103,8 +103,8 @@ while [ $1 ]; do
|
||||||
DESTINATION=$1
|
DESTINATION=$1
|
||||||
shift;continue
|
shift;continue
|
||||||
;;
|
;;
|
||||||
--is_master)
|
--integration)
|
||||||
IS_MASTER="y"
|
INTEGRATION="y"
|
||||||
shift;continue
|
shift;continue
|
||||||
;;
|
;;
|
||||||
-*)
|
-*)
|
||||||
|
|
@ -116,9 +116,9 @@ while [ $1 ]; do
|
||||||
SOURCES_DIR="$1"
|
SOURCES_DIR="$1"
|
||||||
SOURCES_DIR_HAS_BEEN_SET=y
|
SOURCES_DIR_HAS_BEEN_SET=y
|
||||||
shift; continue
|
shift; continue
|
||||||
elif [ -n "$IS_MASTER" ]; then
|
elif [ -z "$INTEGRATION" ]; then
|
||||||
# Compatibility with the old syntax with candidates
|
# Compatibility with the old syntax with candidates
|
||||||
IS_MASTER=""
|
INTEGRATION="y"
|
||||||
shift; continue
|
shift; continue
|
||||||
else
|
else
|
||||||
printerr "Unrecognized option : $1"
|
printerr "Unrecognized option : $1"
|
||||||
|
|
@ -206,7 +206,7 @@ if [ -z "$INTERNAL_NUMBER" ]; then
|
||||||
INTERNAL_NUMBER=1
|
INTERNAL_NUMBER=1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -z "${IS_MASTER}" ]; then
|
if [ -n "${INTEGRATION}" ]; then
|
||||||
INTERNAL_STRING="-Ic-${INTERNAL_NUMBER}"
|
INTERNAL_STRING="-Ic-${INTERNAL_NUMBER}"
|
||||||
else
|
else
|
||||||
INTERNAL_STRING="-I-${INTERNAL_NUMBER}"
|
INTERNAL_STRING="-I-${INTERNAL_NUMBER}"
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue