You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ji...@apache.org on 2019/08/14 15:10:49 UTC
svn commit: r1865157 - in /openoffice/devtools/build-scripts/4.1.7/unxmacos: build_aoo64bit_on_macos.sh config.log

Author: jim
Date: Wed Aug 14 15:10:49 2019
New Revision: 1865157

URL: http://svn.apache.org/viewvc?rev=1865157&view=rev
Log:
Update to include junit, which was included w/ previous 4.1.x builds.

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

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=1865157&r1=1865156&r2=1865157&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 Wed Aug 14 15:10:49 2019
@@ -112,6 +112,17 @@ 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:"
@@ -150,7 +161,7 @@ if [ "$AOO_SKIP_CONFIG" != "yes" ]; then
 	--enable-wiki-publisher \
 	--with-jdk-home="$JAVA_HOME" \
 	--with-ant-home="$ANT_HOME" \
-	--without-junit \
+	--with-junit="$JUNIT_PATH" \
 	--with-epm=/usr/local/bin/epm \
 	--with-dmake-path=/usr/local/bin/dmake \
 	--without-stlport \

Modified: openoffice/devtools/build-scripts/4.1.7/unxmacos/config.log
URL: http://svn.apache.org/viewvc/openoffice/devtools/build-scripts/4.1.7/unxmacos/config.log?rev=1865157&r1=1865156&r2=1865157&view=diff
==============================================================================
--- openoffice/devtools/build-scripts/4.1.7/unxmacos/config.log (original)
+++ openoffice/devtools/build-scripts/4.1.7/unxmacos/config.log Wed Aug 14 15:10:49 2019
@@ -4,7 +4,7 @@ running configure, to aid debugging if c
 It was created by configure, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
-  $ ./configure --with-build-version=2019-08-13 18:32:42 (Tue, 13 Aug 2019) - Darwin x86_64 --enable-verbose --with-openldap --enable-category-b --enable-bundled-dictionaries --enable-wiki-publisher --with-jdk-home=/Library/Java/JavaVirtualMachines/jdk1.7.0_80.jdk/Contents/Home --with-ant-home=/usr/local/share/java/apache-ant-1.9 --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-lang=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
+  $ ./configure --with-build-version=2019-08-14 11:03:52 (Wed, 14 Aug 2019) - Darwin x86_64 --enable-verbose --with-openldap --enable-category-b --enable-bundled-dictionaries --enable-wiki-publisher --with-jdk-home=/Library/Java/JavaVirtualMachines/jdk1.7.0_80.jdk/Contents/Home --with-ant-home=/usr/local/share/java/apache-ant-1.9 --with-junit=/usr/local/share/java/junit.jar --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-lang=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
 
 ## --------- ##
 ## Platform. ##
@@ -30,8 +30,8 @@ Kernel configured for up to 8 processors
 Processor type: i486 (Intel 80486)
 Processors active: 0 1 2 3 4 5 6 7
 Primary memory available: 16.00 gigabytes
-Default processor set: 271 tasks, 869 threads, 8 processors
-Load average: 1.64, Mach factor: 6.35
+Default processor set: 263 tasks, 838 threads, 8 processors
+Load average: 1.76, Mach factor: 6.22
 /bin/machine           = unknown
 /usr/bin/oslevel       = unknown
 /bin/universe          = unknown
@@ -111,8 +111,8 @@ configure:6298: result: yes
 configure:6319: checking whether to use dicts from external paths
 configure:6353: result: no
 configure:6402: checking for bash
-configure:6420: found /bin/bash
-configure:6432: result: /bin/bash
+configure:6420: found /usr/local/bin/bash
+configure:6432: result: /usr/local/bin/bash
 configure:6447: checking gcc home
 configure:6454: result: /usr
 configure:6516: checking for gcc
@@ -534,7 +534,7 @@ configure:10467: not enabling --ccache-s
 configure:10659: checking which memory allocator to use
 configure:10807: result: internal
 configure:10813: checking whether to add custom build version
-configure:10817: result: yes, 2019-08-13 18:32:42 (Tue, 13 Aug 2019) - Darwin x86_64
+configure:10817: result: yes, 2019-08-14 11:03:52 (Wed, 14 Aug 2019) - Darwin x86_64
 configure:10826: checking whether to build with Java support
 configure:10829: result: yes
 configure:10924: checking the installed JDK
@@ -830,6 +830,8 @@ BUILD SUCCESSFUL
 Total time: 1 second
 configure:22614: $? = 0
 configure:22617: result: yes
+configure:22632: checking for JUnit 4
+configure:22653: result: /usr/local/share/java/junit.jar
 configure:22665: checking which languages to be built
 configure:22672: result: 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
 configure:22679: checking which languages have poor help localizations
@@ -1059,7 +1061,7 @@ ac_cv_path_GREP=/usr/bin/grep
 ac_cv_path_PATCH=/usr/local/bin/patch
 ac_cv_path_PERL=/Users/jim/bin/perl
 ac_cv_path_SED=/usr/bin/sed
-ac_cv_path_SHELLPATH=/bin/bash
+ac_cv_path_SHELLPATH=/usr/local/bin/bash
 ac_cv_path_UNZIP=/usr/bin/unzip
 ac_cv_path_XSLTPROC=/usr/local/bin/xsltproc
 ac_cv_path_ZIP=/usr/bin/zip
@@ -1104,7 +1106,7 @@ BUILD_PIXMAN=''
 BUILD_STAX='YES'
 BUILD_TYPE='OOo ODK JPEG EXPAT LIBXMLSEC LUCENE HSQLDB BSH SAXON RHINO APR APR_UTIL SERF COINMP COINMP MDDS BOOST VIGRA UNIXODBC NSS SANE ICU X11_EXTENSIONS NSS REDLAND HUNSPELL HYPHEN MYTHES LIBTEXTCAT LIBTEXTCATDATA SWEXT TOMCAT APACHE_COMMONS TOMCAT MATHMLDTD CATB_FONTS MORE_FONTS AFMS L10N'
 BUILD_UNOWINREG='NO'
-BUILD_VER_STRING='2019-08-13 18:32:42 (Tue, 13 Aug 2019) - Darwin x86_64'
+BUILD_VER_STRING='2019-08-14 11:03:52 (Wed, 14 Aug 2019) - Darwin x86_64'
 BUILD_X64=''
 BUNDLED_EXTENSION_BLOBS=''
 BUNDLED_PREREG_EXTENSIONS=''
@@ -1327,7 +1329,7 @@ NSIS_PATH=''
 NSS_CFLAGS=''
 NSS_LIBS=''
 OBJEXT='o'
-OOO_JUNIT_JAR=''
+OOO_JUNIT_JAR='/usr/local/share/java/junit.jar'
 OOO_VENDOR=''
 OPENSSL_CFLAGS=''
 OPENSSL_LIBS='-lssl -lcrypto'
@@ -1376,7 +1378,7 @@ SERF_LIBS=''
 SERIALIZER_JAR=''
 SERVLETAPI_JAR=''
 SHELL='/bin/sh'
-SHELLPATH='/bin'
+SHELLPATH='/usr/local/bin'
 SIZEOF_LONG='8'
 SOLAR_JAVA='TRUE'
 SOURCEVERSION='AOO417'