openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r1850065 - /openoffice/devtools/build-scripts/4.2.0-dev/unxmacos/build_aoo64bit_on_macos.sh
Date Mon, 31 Dec 2018 18:57:48 GMT
Author: jim
Date: Mon Dec 31 18:57:47 2018
New Revision: 1850065

URL: http://svn.apache.org/viewvc?rev=1850065&view=rev
Log:
Needs these for macOS and junit 4.12

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

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=1850065&r1=1850064&r2=1850065&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 Dec
31 18:57:47 2018
@@ -91,7 +91,7 @@ export ANT_HOME
 echo "ANT_HOME is: $ANT_HOME..."
 
 if [ -z "$JUNIT_PATH" ] ; then
-	JUNIT_PATH=/usr/local/share/java/junit.jar
+	JUNIT_PATH=/usr/local/share/java/junit-4.12.jar
 fi
 if [ ! -e "$JUNIT_PATH" ] ; then
     echo "JUNIT_PATH not found: $JUNIT_PATH"
@@ -132,6 +132,7 @@ if [ "$AOO_SKIP_CONFIG" != "yes" ]; then
 	--enable-bundled-dictionaries \
 	--enable-wiki-publisher \
 	--with-junit="$JUNIT_PATH" \
+	--with-hamcrest-core=/usr/local/share/java/hamcrest-core-2.1.jar \
 	--with-jdk-home="$JAVA_HOME" \
 	--with-ant-home="$ANT_HOME" \
 	--with-epm=/usr/local/bin/epm \



Mime
View raw message