Author: jim
Date: Thu Jan 17 20:31:06 2019
New Revision: 1851578
URL: http://svn.apache.org/viewvc?rev=1851578&view=rev
Log:
With beanshell no longer catB, be explicit that we now enable it.
For backwards compatibilty for builders though, including catB will still
bring bsh along
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
openoffice/devtools/build-scripts/4.2.0-dev/wntmsci/build_aoo64bit_on_win7.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=1851578&r1=1851577&r2=1851578&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
Thu Jan 17 20:31:06 2019
@@ -52,6 +52,7 @@ if [ "$AOO_SKIP_CONFIG" != "yes" ]; then
--with-system-stdlibs \
--enable-crashdump=yes \
--enable-category-b \
+ --enable-beanshell \
--enable-wiki-publisher \
--enable-bundled-dictionaries \
--enable-opengl \
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=1851578&r1=1851577&r2=1851578&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
Thu Jan 17 20:31:06 2019
@@ -52,6 +52,7 @@ if [ "$AOO_SKIP_CONFIG" != "yes" ]; then
--with-system-stdlibs \
--enable-crashdump=yes \
--enable-category-b \
+ --enable-beanshell \
--enable-wiki-publisher \
--enable-bundled-dictionaries \
--enable-opengl \
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=1851578&r1=1851577&r2=1851578&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
Thu Jan 17 20:31:06 2019
@@ -52,6 +52,7 @@ if [ "$AOO_SKIP_CONFIG" != "yes" ]; then
--with-system-stdlibs \
--enable-crashdump=yes \
--enable-category-b \
+ --enable-beanshell \
--enable-wiki-publisher \
--enable-bundled-dictionaries \
--enable-opengl \
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=1851578&r1=1851577&r2=1851578&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
Thu Jan 17 20:31:06 2019
@@ -136,6 +136,7 @@ if [ "$AOO_SKIP_CONFIG" != "yes" ]; then
${AOO_VERBOSE_BUILD} \
--with-openldap \
--enable-category-b \
+ --enable-beanshell \
--enable-bundled-dictionaries \
--enable-wiki-publisher \
--with-jdk-home="$JAVA_HOME" \
Modified:
openoffice/devtools/build-scripts/4.2.0-dev/wntmsci/build_aoo64bit_on_win7.sh
URL:
http://svn.apache.org/viewvc/openoffice/devtools/build-scripts/4.2.0-dev/wntmsci/build_aoo64bit_on_win7.sh?rev=1851578&r1=1851577&r2=1851578&view=diff
==============================================================================
---
openoffice/devtools/build-scripts/4.2.0-dev/wntmsci/build_aoo64bit_on_win7.sh
(original)
+++
openoffice/devtools/build-scripts/4.2.0-dev/wntmsci/build_aoo64bit_on_win7.sh
Thu Jan 17 20:31:06 2019
@@ -103,6 +103,7 @@ if [ "$AOO_SKIP_CONFIG" != "yes" ]; then
--with-vendor="Apache OpenOffice ${AOO_BUILD_TYPE}" \
--enable-wiki-publisher \
--enable-category-b \
+ --enable-beanshell \
--enable-bundled-dictionaries \
--with-jdk-home="$JDK_HOME" \
--with-ant-home="$ANT_HOME" \
