Author: jim
Date: Mon Oct 22 16:51:49 2018
New Revision: 1844573
URL: http://svn.apache.org/viewvc?rev=1844573&view=rev
Log:
Update vendor stuff
Modified:
openoffice/devtools/build-scripts/4.2.0-dev/unxlngi6/build_aoo32bit_on_centos6.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_centos6.sh
URL:
http://svn.apache.org/viewvc/openoffice/devtools/build-scripts/4.2.0-dev/unxlngi6/build_aoo32bit_on_centos6.sh?rev=1844573&r1=1844572&r2=1844573&view=diff
==============================================================================
---
openoffice/devtools/build-scripts/4.2.0-dev/unxlngi6/build_aoo32bit_on_centos6.sh
(original)
+++
openoffice/devtools/build-scripts/4.2.0-dev/unxlngi6/build_aoo32bit_on_centos6.sh
Mon Oct 22 16:51:49 2018
@@ -6,7 +6,7 @@
AOO_SKIP_CONFIG=
AOO_JUST_CONFIG=
AOO_VERBOSE_BUILD=
-AOO_BUILD_TYPE="Community Build"
+AOO_BUILD_TYPE=
AOO_BUILD_VERSION=
AOO_BUILD_BETA=
@@ -15,8 +15,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="Development Build"; AOO_BUILD_VERSION="
[${AOO_BUILD_TYPE}]"; shift ;;
- "--beta" ) AOO_BUILD_TYPE="Beta Build"; AOO_BUILD_VERSION="
[${AOO_BUILD_TYPE}]"; AOO_BUILD_BETA="yes"; shift ;;
+ "--dev" ) AOO_BUILD_TYPE="Apache OpenOffice Development Build";
AOO_BUILD_VERSION=" [${AOO_BUILD_TYPE}]"; shift ;;
+ "--beta" ) AOO_BUILD_TYPE="Apache OpenOffice Beta Build";
AOO_BUILD_VERSION=" [${AOO_BUILD_TYPE}]"; AOO_BUILD_BETA="yes"; shift ;;
"--" ) shift; break ;;
"" ) break ;;
* ) echo "unknown option: $1"; shift ;;
@@ -48,8 +48,7 @@ fi
if [ "$AOO_SKIP_CONFIG" != "yes" ]; then
( ./configure \
--with-build-version="$(date +"%Y-%m-%d %H:%M:%S (%a, %d %b %Y)") -
`uname -sm`${AOO_BUILD_VERSION}" \
- ${AOO_VERBOSE_BUILD} \
- --with-vendor="Apache OpenOffice ${AOO_BUILD_TYPE}" \
+ ${AOO_VERBOSE_BUILD} ${AOO_BUILD_TYPE} \
--with-system-stdlibs \
--enable-crashdump=yes \
--enable-category-b \
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=1844573&r1=1844572&r2=1844573&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
Mon Oct 22 16:51:49 2018
@@ -6,7 +6,7 @@
AOO_SKIP_CONFIG=
AOO_JUST_CONFIG=
AOO_VERBOSE_BUILD=
-AOO_BUILD_TYPE="Community Build"
+AOO_BUILD_TYPE=
AOO_BUILD_VERSION=
AOO_BUILD_BETA=
@@ -15,8 +15,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="Development Build"; AOO_BUILD_VERSION="
[${AOO_BUILD_TYPE}]"; shift ;;
- "--beta" ) AOO_BUILD_TYPE="Beta Build"; AOO_BUILD_VERSION="
[${AOO_BUILD_TYPE}]"; AOO_BUILD_BETA="yes"; shift ;;
+ "--dev" ) AOO_BUILD_TYPE="Apache OpenOffice Development Build";
AOO_BUILD_VERSION=" [${AOO_BUILD_TYPE}]"; shift ;;
+ "--beta" ) AOO_BUILD_TYPE="Apache OpenOffice Beta Build";
AOO_BUILD_VERSION=" [${AOO_BUILD_TYPE}]"; AOO_BUILD_BETA="yes"; shift ;;
"--" ) shift; break ;;
"" ) break ;;
* ) echo "unknown option: $1"; shift ;;
@@ -48,8 +48,7 @@ fi
if [ "$AOO_SKIP_CONFIG" != "yes" ]; then
( ./configure \
--with-build-version="$(date +"%Y-%m-%d %H:%M:%S (%a, %d %b %Y)") -
`uname -sm`${AOO_BUILD_VERSION}" \
- ${AOO_VERBOSE_BUILD} \
- --with-vendor="Apache OpenOffice ${AOO_BUILD_TYPE}" \
+ ${AOO_VERBOSE_BUILD} ${AOO_BUILD_TYPE} \
--with-system-stdlibs \
--enable-crashdump=yes \
--enable-category-b \
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=1844573&r1=1844572&r2=1844573&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
Mon Oct 22 16:51:49 2018
@@ -6,7 +6,7 @@
AOO_SKIP_CONFIG=
AOO_JUST_CONFIG=
AOO_VERBOSE_BUILD=
-AOO_BUILD_TYPE="Community Build"
+AOO_BUILD_TYPE=
AOO_BUILD_VERSION=
AOO_BUILD_BETA=
@@ -15,8 +15,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="Development Build"; AOO_BUILD_VERSION="
[${AOO_BUILD_TYPE}]"; shift ;;
- "--beta" ) AOO_BUILD_TYPE="Beta Build"; AOO_BUILD_VERSION="
[${AOO_BUILD_TYPE}]"; AOO_BUILD_BETA="yes"; shift ;;
+ "--dev" ) AOO_BUILD_TYPE="Apache OpenOffice Development Build";
AOO_BUILD_VERSION=" [${AOO_BUILD_TYPE}]"; shift ;;
+ "--beta" ) AOO_BUILD_TYPE="Apache OpenOffice Beta Build";
AOO_BUILD_VERSION=" [${AOO_BUILD_TYPE}]"; AOO_BUILD_BETA="yes"; shift ;;
"--" ) shift; break ;;
"" ) break ;;
* ) echo "unknown option: $1"; shift ;;
@@ -48,8 +48,7 @@ fi
if [ "$AOO_SKIP_CONFIG" != "yes" ]; then
( ./configure \
--with-build-version="$(date +"%Y-%m-%d %H:%M:%S (%a, %d %b %Y)") -
`uname -sm`${AOO_BUILD_VERSION}" \
- ${AOO_VERBOSE_BUILD} \
- --with-vendor="Apache OpenOffice ${AOO_BUILD_TYPE}" \
+ ${AOO_VERBOSE_BUILD} ${AOO_BUILD_TYPE} \
--with-system-stdlibs \
--enable-crashdump=yes \
--enable-category-b \
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=1844573&r1=1844572&r2=1844573&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
Mon Oct 22 16:51:49 2018
@@ -48,7 +48,7 @@
AOO_SKIP_CONFIG=
AOO_JUST_CONFIG=
AOO_VERBOSE_BUILD=
-AOO_BUILD_TYPE="Community Build"
+AOO_BUILD_TYPE=
AOO_BUILD_VERSION=
AOO_BUILD_BETA=
@@ -57,8 +57,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="Development Build"; AOO_BUILD_VERSION="
[${AOO_BUILD_TYPE}]"; shift ;;
- "--beta" ) AOO_BUILD_TYPE="Beta Build"; AOO_BUILD_VERSION="
[${AOO_BUILD_TYPE}]"; AOO_BUILD_BETA="yes"; shift ;;
+ "--dev" ) AOO_BUILD_TYPE="Apache OpenOffice Development Build";
AOO_BUILD_VERSION=" [${AOO_BUILD_TYPE}]"; shift ;;
+ "--beta" ) AOO_BUILD_TYPE="Apache OpenOffice Beta Build";
AOO_BUILD_VERSION=" [${AOO_BUILD_TYPE}]"; AOO_BUILD_BETA="yes"; shift ;;
"--" ) shift; break ;;
"" ) break ;;
* ) echo "unknown option: $1"; shift ;;
@@ -126,8 +126,7 @@ fi
if [ "$AOO_SKIP_CONFIG" != "yes" ]; then
( ./configure \
--with-build-version="$(date +"%Y-%m-%d %H:%M:%S (%a, %d %b %Y)") -
`uname -sm`${AOO_BUILD_VERSION}" \
- ${AOO_VERBOSE_BUILD} \
- --with-vendor="Apache OpenOffice ${AOO_BUILD_TYPE}" \
+ ${AOO_VERBOSE_BUILD} ${AOO_BUILD_TYPE} \
--with-openldap \
--enable-category-b \
--enable-bundled-dictionaries \
