svn commit: r1763647 - /openoffice/devtools/build-scripts/4.1.3/unxmacos/build_aoo64bit_on_osx10.11.sh

[ji...@apache.org]

Author: jim
Date: Thu Oct  6 19:47:33 2016
New Revision: 1763647

URL: http://svn.apache.org/viewvc?rev=1763647&view=rev
Log:
Update w/ latest

Modified:
    openoffice/devtools/build-scripts/4.1.3/unxmacos/build_aoo64bit_on_osx10.11.sh

Modified: openoffice/devtools/build-scripts/4.1.3/unxmacos/build_aoo64bit_on_osx10.11.sh
URL: http://svn.apache.org/viewvc/openoffice/devtools/build-scripts/4.1.3/unxmacos/build_aoo64bit_on_osx10.11.sh?rev=1763647&r1=1763646&r2=1763647&view=diff
==============================================================================
--- openoffice/devtools/build-scripts/4.1.3/unxmacos/build_aoo64bit_on_osx10.11.sh (original)
+++ openoffice/devtools/build-scripts/4.1.3/unxmacos/build_aoo64bit_on_osx10.11.sh Thu Oct  6 19:47:33 2016
@@ -1,4 +1,48 @@
 #!/bin/sh
+#
+# Build-script for AOO 4.[12].x on OSX 10.11
+#
+# System Setup:
+#  XCode 7.3.1
+#
+# Local Changes:
+#   MacPorts:
+#     o apache-ant (1.9.7)
+#     o gnutar (1.29) (symlink gnutar to gtar)
+#     o perl5 (perl5.22)
+#     o p5-archive-*
+#     o p5-lwp-*
+#     o p5-xml-parser
+#
+#   Oracle JAVA 1.7 JDK
+#
+#   /usr/local:
+#     o dmake
+#         http://sourceforge.net/projects/oooextras.mirror/files/dmake-4.12.tar.bz2
+#         ./configure --prefix=/usr/local ; make install
+#     o epm
+#         http://www.msweet.org/files/project2/epm-4.3-source.tar.gz
+#         $ ./configure --prefix=/usr/local ; make install
+#
+#     o openssl (1.0.2j)
+#         https://www.openssl.org/source/openssl-1.0.2j.tar.gz
+#         $ export MACOSX_DEPLOYMENT_TARGET=10.7
+#         $ ./Configure darwin64-x86_64-cc no-shared --prefix=/usr/local --openssldir=/usr/local ; make install
+#
+#   Env:
+#     LIBRARY_PATH=/usr/local/lib
+#     C_INCLUDE_PATH=/usr/local/include
+#     CPLUS_INCLUDE_PATH=/usr/local/include
+#     MACOSX_DEPLOYMENT_TARGET=10.7
+#     PATH=/opt/local/bin:/opt/local/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:.
+#
+#   Notes:
+#     o openssl required for serf; we build non-shared so all
+#       linkings are to the static libs
+#
+#     o JDK 1.7 seems to work better; and it's always best to
+#       have just *one* version of te JDK installed.
+#
 
 if [ ! -d ../main -o ! -d sal ] ; then
 	echo "CHDIR into AOO's main/ directory first!"
@@ -6,11 +50,17 @@ if [ ! -d ../main -o ! -d sal ] ; then
 fi
 
 if [ -z "$JAVA_HOME" ] ; then
-	JAVA_HOME=$(/usr/libexec/java_home)
+	JAVA_HOME=$(/usr/libexec/java_home -v 1.7)
 	export JAVA_HOME
 	echo "Setting JAVA_HOME to $JAVA_HOME..."
 fi
 
+if [ -z "$ANT_HOME" ] ; then
+	ANT_HOME=/opt/local/share/java/apache-ant
+	export ANT_HOME
+	echo "Setting ANT_HOME to $ANT_HOME..."
+fi
+
 if [ ! -e external/unowinreg/unowinreg.dll ] ; then
 	echo "Downloading unowinreg.dll..."
 	curl -o external/unowinreg/unowinreg.dll http://www.openoffice.org/tools/unowinreg_prebuild/680/unowinreg.dll
@@ -18,30 +68,35 @@ fi
 
 LANGS="ast bg ca ca-XR ca-XV cs da de el en-GB en-US es eu fi fr gd gl he hi hu it ja kid km ko lt nb nl pl pt pt-BR ru sk sl sr sv ta th tr vi zh-CN zh-TW"
 
-if [ ! -e ./configure ] ; then
+if [ ! -e configure -o configure.in -nt configure ] ; then
 	echo "Running autoconf..."
 	autoconf || exit 1
 fi
 ./configure   \
 	--with-build-version="$(date +"%Y-%m-%d %H:%M") - `uname -sm`" \
+	--with-vendor="Apache OpenOffice Community Build" \
 	--enable-verbose \
-	--enable-crashdump=yes \
+	--with-openldap \
 	--enable-category-b \
-	--enable-wiki-publisher \
 	--enable-bundled-dictionaries \
+	--enable-wiki-publisher \
 	--with-junit="/usr/local/share/java/junit.jar" \
-	--with-jdk-home="$(/usr/libexec/java_home)" \
+	--with-jdk-home="$JAVA_HOME" \
+	--with-ant-home="$ANT_HOME" \
+	--with-epm=/usr/local/bin/epm \
+	--with-dmake-path=/usr/local/bin/dmake \
 	--without-stlport \
-	--with-package-format="installed" \
+	--with-package-format="installed dmg" \
+	--disable-systray \
 	--with-lang="${LANGS}" 
 
 ./bootstrap || exit 1
 source ./MacOSXX64Env.Set.sh || exit 1 
 cd instsetoo_native
-time perl "$SOLARENV/bin/build.pl" --all -P4 -- -P4 || exit 1
-#cd util
-#dmake ooolanguagepack || exit 1
-#dmake sdkoo_en-US || exit 1 
+time perl "$SOLARENV/bin/build.pl" --all -P2 -- -P2 || exit 1
+cd util
+dmake ooolanguagepack || exit 1
+dmake sdkoo_en-US || exit 1 
 
 date "+Build ended at %H:%M:%S"