You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ji...@apache.org on 2019/03/19 13:54:45 UTC

svn commit: r1855833 - in /openoffice/devtools/build-scripts/4.2.0-dev: unxlngi6/build_aoo32bit_on_centos7.sh unxlngix6/build_aoo64bit_on_centos7.sh unxlngix6/build_aoo64bit_on_ubuntu14.sh unxmacos/build_aoo64bit_on_macos.sh

Author: jim
Date: Tue Mar 19 13:54:45 2019
New Revision: 1855833

URL: http://svn.apache.org/viewvc?rev=1855833&view=rev
Log:
Ensure last option (dev or beta) is the winner

Modified:
    openoffice/devtools/build-scripts/4.2.0-dev/unxlngi6/build_aoo32bit_on_centos7.sh
    openoffice/devtools/build-scripts/4.2.0-dev/unxlngix6/build_aoo64bit_on_centos7.sh
    openoffice/devtools/build-scripts/4.2.0-dev/unxlngix6/build_aoo64bit_on_ubuntu14.sh
    openoffice/devtools/build-scripts/4.2.0-dev/unxmacos/build_aoo64bit_on_macos.sh

Modified: openoffice/devtools/build-scripts/4.2.0-dev/unxlngi6/build_aoo32bit_on_centos7.sh
URL: http://svn.apache.org/viewvc/openoffice/devtools/build-scripts/4.2.0-dev/unxlngi6/build_aoo32bit_on_centos7.sh?rev=1855833&r1=1855832&r2=1855833&view=diff
==============================================================================
--- openoffice/devtools/build-scripts/4.2.0-dev/unxlngi6/build_aoo32bit_on_centos7.sh (original)
+++ openoffice/devtools/build-scripts/4.2.0-dev/unxlngi6/build_aoo32bit_on_centos7.sh Tue Mar 19 13:54:45 2019
@@ -16,8 +16,8 @@ while true; do
     "--verbose" ) AOO_VERBOSE_BUILD="--enable-verbose"; shift ;;
     "--skip-config" ) AOO_SKIP_CONFIG="yes"; shift ;;
     "--just-config" ) AOO_JUST_CONFIG="yes"; shift ;;
-    "--dev" ) AOO_BUILD_TYPE="Apache OpenOffice Test Development Build"; AOO_BUILD_VERSION=" [${AOO_BUILD_TYPE}]"; AOO_BUILD_DEV="yes"; shift ;;
-    "--beta" ) AOO_BUILD_TYPE="Apache OpenOffice Beta Build"; AOO_BUILD_VERSION=" [${AOO_BUILD_TYPE}]"; AOO_BUILD_BETA="yes"; shift ;;
+    "--dev" ) AOO_BUILD_TYPE="Apache OpenOffice Test Development Build"; AOO_BUILD_VERSION=" [${AOO_BUILD_TYPE}]"; AOO_BUILD_DEV="yes"; AOO_BUILD_BETA=""; shift ;;
+    "--beta" ) AOO_BUILD_TYPE="Apache OpenOffice Beta Build"; AOO_BUILD_VERSION=" [${AOO_BUILD_TYPE}]"; AOO_BUILD_BETA="yes"; AOO_BUILD_DEV=""; shift ;;
     "--" ) shift; break ;;
     "" ) break ;;
     * ) echo "unknown option: $1"; shift ;;

Modified: openoffice/devtools/build-scripts/4.2.0-dev/unxlngix6/build_aoo64bit_on_centos7.sh
URL: http://svn.apache.org/viewvc/openoffice/devtools/build-scripts/4.2.0-dev/unxlngix6/build_aoo64bit_on_centos7.sh?rev=1855833&r1=1855832&r2=1855833&view=diff
==============================================================================
--- openoffice/devtools/build-scripts/4.2.0-dev/unxlngix6/build_aoo64bit_on_centos7.sh (original)
+++ openoffice/devtools/build-scripts/4.2.0-dev/unxlngix6/build_aoo64bit_on_centos7.sh Tue Mar 19 13:54:45 2019
@@ -16,8 +16,8 @@ while true; do
     "--verbose" ) AOO_VERBOSE_BUILD="--enable-verbose"; shift ;;
     "--skip-config" ) AOO_SKIP_CONFIG="yes"; shift ;;
     "--just-config" ) AOO_JUST_CONFIG="yes"; shift ;;
-    "--dev" ) AOO_BUILD_TYPE="Apache OpenOffice Test Development Build"; AOO_BUILD_VERSION=" [${AOO_BUILD_TYPE}]"; AOO_BUILD_DEV="yes"; shift ;;
-    "--beta" ) AOO_BUILD_TYPE="Apache OpenOffice Beta Build"; AOO_BUILD_VERSION=" [${AOO_BUILD_TYPE}]"; AOO_BUILD_BETA="yes"; shift ;;
+    "--dev" ) AOO_BUILD_TYPE="Apache OpenOffice Test Development Build"; AOO_BUILD_VERSION=" [${AOO_BUILD_TYPE}]"; AOO_BUILD_DEV="yes"; AOO_BUILD_BETA=""; shift ;;
+    "--beta" ) AOO_BUILD_TYPE="Apache OpenOffice Beta Build"; AOO_BUILD_VERSION=" [${AOO_BUILD_TYPE}]"; AOO_BUILD_BETA="yes"; AOO_BUILD_DEV=""; shift ;;
     "--" ) shift; break ;;
     "" ) break ;;
     * ) echo "unknown option: $1"; shift ;;

Modified: openoffice/devtools/build-scripts/4.2.0-dev/unxlngix6/build_aoo64bit_on_ubuntu14.sh
URL: http://svn.apache.org/viewvc/openoffice/devtools/build-scripts/4.2.0-dev/unxlngix6/build_aoo64bit_on_ubuntu14.sh?rev=1855833&r1=1855832&r2=1855833&view=diff
==============================================================================
--- openoffice/devtools/build-scripts/4.2.0-dev/unxlngix6/build_aoo64bit_on_ubuntu14.sh (original)
+++ openoffice/devtools/build-scripts/4.2.0-dev/unxlngix6/build_aoo64bit_on_ubuntu14.sh Tue Mar 19 13:54:45 2019
@@ -16,8 +16,8 @@ while true; do
     "--verbose" ) AOO_VERBOSE_BUILD="--enable-verbose"; shift ;;
     "--skip-config" ) AOO_SKIP_CONFIG="yes"; shift ;;
     "--just-config" ) AOO_JUST_CONFIG="yes"; shift ;;
-    "--dev" ) AOO_BUILD_TYPE="Apache OpenOffice Test Development Build"; AOO_BUILD_VERSION=" [${AOO_BUILD_TYPE}]"; AOO_BUILD_DEV="yes"; shift ;;
-    "--beta" ) AOO_BUILD_TYPE="Apache OpenOffice Beta Build"; AOO_BUILD_VERSION=" [${AOO_BUILD_TYPE}]"; AOO_BUILD_BETA="yes"; shift ;;
+    "--dev" ) AOO_BUILD_TYPE="Apache OpenOffice Test Development Build"; AOO_BUILD_VERSION=" [${AOO_BUILD_TYPE}]"; AOO_BUILD_DEV="yes"; AOO_BUILD_BETA=""; shift ;;
+    "--beta" ) AOO_BUILD_TYPE="Apache OpenOffice Beta Build"; AOO_BUILD_VERSION=" [${AOO_BUILD_TYPE}]"; AOO_BUILD_BETA="yes"; AOO_BUILD_DEV=""; shift ;;
     "--" ) shift; break ;;
     "" ) break ;;
     * ) echo "unknown option: $1"; shift ;;

Modified: openoffice/devtools/build-scripts/4.2.0-dev/unxmacos/build_aoo64bit_on_macos.sh
URL: http://svn.apache.org/viewvc/openoffice/devtools/build-scripts/4.2.0-dev/unxmacos/build_aoo64bit_on_macos.sh?rev=1855833&r1=1855832&r2=1855833&view=diff
==============================================================================
--- openoffice/devtools/build-scripts/4.2.0-dev/unxmacos/build_aoo64bit_on_macos.sh (original)
+++ openoffice/devtools/build-scripts/4.2.0-dev/unxmacos/build_aoo64bit_on_macos.sh Tue Mar 19 13:54:45 2019
@@ -71,8 +71,8 @@ while true; do
     -a | --ant-version ) AOO_ANT_VERSION=$2; shift 2 ;;
     -j | --java-version ) AOO_JAVA_VERSION=$2; shift 2 ;;
     -m | --macos-target ) AOO_MACOS_TARGET=$2; shift 2 ;;
-    -d | --dev ) AOO_BUILD_TYPE="Apache OpenOffice Test Development Build"; AOO_BUILD_VERSION=" [${AOO_BUILD_TYPE}]"; AOO_BUILD_DEV="yes"; shift ;;
-    -b | --beta ) AOO_BUILD_TYPE="Apache OpenOffice Beta Build"; AOO_BUILD_VERSION=" [${AOO_BUILD_TYPE}]"; AOO_BUILD_BETA="yes"; shift ;;
+    -d | --dev ) AOO_BUILD_TYPE="Apache OpenOffice Test Development Build"; AOO_BUILD_VERSION=" [${AOO_BUILD_TYPE}]"; AOO_BUILD_DEV="yes"; AOO_BUILD_BETA=""; shift ;;
+    -b | --beta ) AOO_BUILD_TYPE="Apache OpenOffice Beta Build"; AOO_BUILD_VERSION=" [${AOO_BUILD_TYPE}]"; AOO_BUILD_BETA="yes"; AOO_BUILD_DEV=""; shift ;;
     -- ) shift; break ;;
     * ) echo "unknown option: $1"; shift ;;
   esac