openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r1865077 - /openoffice/devtools/build-scripts/4.1.7/unxmacos/build_aoo64bit_on_macos.sh
Date Tue, 13 Aug 2019 22:17:59 GMT
Author: jim
Date: Tue Aug 13 22:17:58 2019
New Revision: 1865077

URL: http://svn.apache.org/viewvc?rev=1865077&view=rev
Log:
Update macOS build script

Modified:
    openoffice/devtools/build-scripts/4.1.7/unxmacos/build_aoo64bit_on_macos.sh

Modified: openoffice/devtools/build-scripts/4.1.7/unxmacos/build_aoo64bit_on_macos.sh
URL: http://svn.apache.org/viewvc/openoffice/devtools/build-scripts/4.1.7/unxmacos/build_aoo64bit_on_macos.sh?rev=1865077&r1=1865076&r2=1865077&view=diff
==============================================================================
--- openoffice/devtools/build-scripts/4.1.7/unxmacos/build_aoo64bit_on_macos.sh (original)
+++ openoffice/devtools/build-scripts/4.1.7/unxmacos/build_aoo64bit_on_macos.sh Tue Aug 13
22:17:58 2019
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/usr/bin/env bash
 #
-# Build-script for AOO 4.1.x on OSX 10.12
+# Build-script for AOO 4.1.x on OSX 10.13
 #
 # System Setup:
 #  XCode 7.3.1
@@ -13,21 +13,25 @@
 #     o p5-archive-*
 #     o p5-lwp-*
 #     o p5-xml-parser
+#     o autoconf (symlinked to ~/bin)
+#     o getopt (symlinked to ~/bin)
+#     o subversion
+#     o git
 #
 #   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.2p)
+#   o Apache ant 1.9.13 / 1.10.4
+#   o dmake 4.12.3 (https://github.com/jimjag/dmake/archive/dmake-4.12.3.tar.gz)
+#   o epm 4.4.2 (https://github.com/jimjag/epm/archive/epm-4.4.2.tar.gz)
+#   o openssl (1.0.2p)
 #         https://www.openssl.org/source/openssl-1.0.2p.tar.gz
 #         $ export MACOSX_DEPLOYMENT_TARGET=10.7
 #         $ ./Configure darwin64-x86_64-cc no-shared --prefix=/usr/local --openssldir=/usr/local
; make install
+#   o libxml2-2.9.8 (--prefix=/usr/local --enable-shared=no --without-iconv)
+#   o libxslt-1.1.32 (--prefix=/usr/local --enable-shared=no)
+#   o pkg-config 0.29.2 (--prefix=/usr/local)
+#   o GNU patch 2.7.6 (--prefix=/usr/local)
 #
 #   Env:
 #     LIBRARY_PATH=/usr/local/lib
@@ -44,14 +48,52 @@
 #       have just *one* version of te JDK installed.
 #
 
+#
+# Build options
+#
+AOO_MACOS_TARGET=10.7
+AOO_JAVA_VERSION=1.7
+AOO_ANT_VERSION=1.9
+
+#
+# Parse options
+#
+AOO_SKIP_CONFIG=
+AOO_JUST_CONFIG=
+AOO_VERBOSE_BUILD=
+AOO_BUILD_TYPE=
+AOO_BUILD_VERSION=
+AOO_BUILD_BETA=
+AOO_BUILD_DEV=
+
+AOPTS=`getopt -o vsjdba:j:m: --long verbose,skip-config,just-config,dev,beta,ant-version:,java-version:,macos-target:
-n 'parse-options' -- "$@"`
+if [ $? != 0 ] ; then echo "Failed parsing options." >&2 ; exit 1 ; fi
+#echo "$AOPTS"
+eval set -- "$AOPTS"
+
+while true; do
+  case "$1" in
+    -v | --verbose ) AOO_VERBOSE_BUILD="--enable-verbose"; shift ;;
+    -s | --skip-config ) AOO_SKIP_CONFIG="yes"; shift ;;
+    -j | --just-config ) AOO_JUST_CONFIG="yes"; shift ;;
+    -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"; 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
+done
+
+
 if [ ! -d ../main -o ! -d sal ] ; then
 	echo "CHDIR into AOO's main/ directory first!"
 	exit 1
 fi
 
-if [ -z "$JAVA_HOME" ] ; then
-	JAVA_HOME=$(/usr/libexec/java_home -v 1.7)
-fi
+
+JAVA_HOME=$(/usr/libexec/java_home -v ${AOO_JAVA_VERSION})
 if [ ! -d "$JAVA_HOME" ] ; then
     echo "JAVA_HOME not found: $JAVA_HOME"
     exit 1
@@ -59,25 +101,27 @@ fi
 export JAVA_HOME
 echo "JAVA_HOME is: $JAVA_HOME..."
 
-if [ -z "$ANT_HOME" ] ; then
-	ANT_HOME=/usr/local/share/java/apache-ant
-fi
+ANT_HOME=/usr/local/share/java/apache-ant-${AOO_ANT_VERSION}
 if [ ! -d "$ANT_HOME" ] ; then
     echo "ANT_HOME not found: $ANT_HOME"
     exit 1
 fi
 export ANT_HOME
+ANT_CLASSPATH=${ANT_HOME}/lib
+export ANT_CLASSPATH
 echo "ANT_HOME is: $ANT_HOME..."
+echo "ANT_CLASSPATH is: $ANT_CLASSPATH..."
 
-if [ -z "$JUNIT_PATH" ] ; then
-	JUNIT_PATH=/usr/local/share/java/junit.jar
-fi
-if [ ! -e "$JUNIT_PATH" ] ; then
-    echo "JUNIT_PATH not found: $JUNIT_PATH"
-    exit 1
-fi
-export JUNIT_PATH
-echo "JUNIT_PATH is: $JUNIT_PATH..."
+echo "Building for ${AOO_BUILD_TYPE}: min macOS ${AOO_MACOS_TARGET}, Java $(echo ${AOO_JAVA_VERSION}
| sed -e s/..//) : Ant ${AOO_ANT_VERSION}"
+echo "---"
+echo "Starting build:"
+echo ""
+sleep 5
+#Setup build Env
+export MACOSX_DEPLOYMENT_TARGET=${AOO_MACOS_TARGET}
+export LIBRARY_PATH=/usr/local/lib
+export C_INCLUDE_PATH=/usr/local/include
+export CPLUS_INCLUDE_PATH=/usr/local/include
 
 if [ ! -e external/unowinreg/unowinreg.dll ] ; then
 	echo "Downloading unowinreg.dll..."
@@ -86,35 +130,57 @@ 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 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 -o configure.in -nt configure ] ; then
+if [ -e configure.in ]; then
+    AOO_CONF_T="configure.in"
+else
+    AOO_CONF_T="configure.ac"
+fi
+if [ ! -e configure -o $AOO_CONF_T -nt configure ] ; then
 	echo "Running autoconf..."
 	autoconf || exit 1
 fi
-./configure   \
-    --with-build-version="$(date +"%Y-%m-%d %H:%M:%S (%a, %d %b %Y)") - `uname -sm`" \
-	--enable-verbose \
+
+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-openldap \
 	--enable-category-b \
 	--enable-bundled-dictionaries \
 	--enable-wiki-publisher \
-	--with-junit="$JUNIT_PATH" \
 	--with-jdk-home="$JAVA_HOME" \
 	--with-ant-home="$ANT_HOME" \
+	--without-junit \
 	--with-epm=/usr/local/bin/epm \
 	--with-dmake-path=/usr/local/bin/dmake \
 	--without-stlport \
 	--with-package-format="dmg" \
 	--disable-systray \
-	--with-alloc=internal \
+	--with-macosx-target=${AOO_MACOS_TARGET} \
+	--with-alloc=system \
 	--with-lang="${LANGS}" \
-	| tee config.out || exit 1
+	| tee config.out ) || exit 1
+fi
 
+if [ "$AOO_JUST_CONFIG" = "yes" ]; then
+    exit
+fi
 ./bootstrap || exit 1
 source ./MacOSXX64Env.Set.sh || exit 1
 cd instsetoo_native
-time perl "$SOLARENV/bin/build.pl" --all -- -P5 || exit 1
-cd util
-dmake -P2 ooolanguagepack || exit 1
-dmake -P2 sdkoo_en-US || exit 1
+time perl "$SOLARENV/bin/build.pl" --all -- -P6 || exit 1
 
+cd util
+if [ "$AOO_BUILD_BETA" = "yes" ]; then
+    dmake -P5 openofficebeta  || exit 1
+	dmake -P5 sdkoobeta_en-US || exit 1
+	dmake -P5 ooobetalanguagepack || exit 1
+elif [ "$AOO_BUILD_DEV" = "yes" ]; then
+    dmake -P5 openofficedev  || exit 1
+	dmake -P5 sdkoodev_en-US || exit 1
+	dmake -P5 ooodevlanguagepack || exit 1
+else
+	dmake -P5 ooolanguagepack || exit 1
+	dmake -P5 sdkoo_en-US || exit 1 
+fi
 date "+Build ended at %H:%M:%S"



Mime
View raw message