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 2017/10/19 12:43:06 UTC
svn commit: r1812630 - in /openoffice/devtools/build-scripts:
4.1.4/unxmacos/build_aooreleases.sh 4.1.4/unxmacos/config.log
4.2.0/unxmacos/build_aooreleases.sh
Author: jim
Date: Thu Oct 19 12:43:06 2017
New Revision: 1812630
URL: http://svn.apache.org/viewvc?rev=1812630&view=rev
Log:
release 4.1.4 artifacts for macOS
Modified:
openoffice/devtools/build-scripts/4.1.4/unxmacos/build_aooreleases.sh
openoffice/devtools/build-scripts/4.1.4/unxmacos/config.log
openoffice/devtools/build-scripts/4.2.0/unxmacos/build_aooreleases.sh
Modified: openoffice/devtools/build-scripts/4.1.4/unxmacos/build_aooreleases.sh
URL: http://svn.apache.org/viewvc/openoffice/devtools/build-scripts/4.1.4/unxmacos/build_aooreleases.sh?rev=1812630&r1=1812629&r2=1812630&view=diff
==============================================================================
--- openoffice/devtools/build-scripts/4.1.4/unxmacos/build_aooreleases.sh (original)
+++ openoffice/devtools/build-scripts/4.1.4/unxmacos/build_aooreleases.sh Thu Oct 19 12:43:06 2017
@@ -127,7 +127,7 @@ fi
--disable-systray \
--with-alloc=system \
--with-lang="${LANGS}" \
- | tee config.out
+ | tee config.out || exit 1
./bootstrap || exit 1
source ./MacOSXX64Env.Set.sh || exit 1
Modified: openoffice/devtools/build-scripts/4.1.4/unxmacos/config.log
URL: http://svn.apache.org/viewvc/openoffice/devtools/build-scripts/4.1.4/unxmacos/config.log?rev=1812630&r1=1812629&r2=1812630&view=diff
==============================================================================
--- openoffice/devtools/build-scripts/4.1.4/unxmacos/config.log (original)
+++ openoffice/devtools/build-scripts/4.1.4/unxmacos/config.log Thu Oct 19 12:43:06 2017
@@ -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=2017-09-21 16:48:52 (Thu, 21 Sep 2017) - Darwin x86_64 --with-vendor=Apache OpenOffice Community Build --enable-verbose --with-openldap --enable-category-b --enable-bundled-dictionaries --enable-wiki-publisher --with-junit=/usr/local/share/java/junit.jar --with-jdk-home=/Library/Java/JavaVirtualMachines/jdk1.7.0_79.jdk/Contents/Home --with-ant-home=/usr/local/share/java/apache-ant --with-epm=/usr/local/bin/epm --with-dmake-path=/usr/local/bin/dmake --without-stlport --with-package-format=installed dmg --disable-systray --with-alloc=system --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=2017-10-16 22:12:14 (Mon, 16 Oct 2017) - Darwin x86_64 --with-vendor=Apache OpenOffice Community Build --enable-verbose --with-openldap --enable-category-b --enable-bundled-dictionaries --enable-wiki-publisher --with-junit=/usr/local/share/java/junit.jar --with-jdk-home=/Library/Java/JavaVirtualMachines/jdk1.7.0_79.jdk/Contents/Home --with-ant-home=/usr/local/share/java/apache-ant --with-epm=/usr/local/bin/epm --with-dmake-path=/usr/local/bin/dmake --without-stlport --with-package-format=installed dmg --disable-systray --with-alloc=system --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 4 processors
Processor type: i486 (Intel 80486)
Processors active: 0 1 2 3
Primary memory available: 16.00 gigabytes
-Default processor set: 285 tasks, 916 threads, 4 processors
-Load average: 1.58, Mach factor: 2.41
+Default processor set: 264 tasks, 890 threads, 4 processors
+Load average: 2.01, Mach factor: 1.98
/bin/machine = unknown
/usr/bin/oslevel = unknown
/bin/universe = unknown
@@ -566,7 +566,7 @@ configure:10670: /Applications/Xcode.app
configure:10670: $? = 0
configure:10670: result: yes
configure:10815: checking whether to add custom build version
-configure:10819: result: yes, 2017-09-21 16:48:52 (Thu, 21 Sep 2017) - Darwin x86_64
+configure:10819: result: yes, 2017-10-16 22:12:14 (Mon, 16 Oct 2017) - Darwin x86_64
configure:10828: checking whether to build with Java support
configure:10831: result: yes
configure:10926: checking the installed JDK
@@ -584,10 +584,10 @@ configure:11676: result: OK, >= 3.7
configure:11687: checking which package format to use
configure:11755: result: installed dmg
configure:11927: checking for gperf
-configure:11945: found /opt/local/bin/gperf
-configure:11957: result: /opt/local/bin/gperf
+configure:11945: found /usr/bin/gperf
+configure:11957: result: /usr/bin/gperf
configure:11968: checking for gperf
-configure:11998: result: /opt/local/bin/gperf
+configure:11998: result: /usr/bin/gperf
configure:12016: checking gperf version
configure:12019: result: OK
configure:12027: checking whether to build the stax
@@ -671,8 +671,8 @@ configure:15016: result: internal
configure:15035: checking which curl to use
configure:15039: result: external
configure:15045: checking for curl-config
-configure:15063: found /opt/local/bin/curl-config
-configure:15075: result: /opt/local/bin/curl-config
+configure:15063: found /usr/bin/curl-config
+configure:15075: result: /usr/bin/curl-config
configure:15088: checking whether curl is >= 7.13.1
configure:15095: result: yes
configure:15110: checking which mdds to use
@@ -831,10 +831,10 @@ configure:22415: found /usr/local/share/
configure:22427: result: /usr/local/share/java/apache-ant/bin/ant
configure:22462: checking if /usr/local/share/java/apache-ant/bin/ant works
configure:22487: /usr/local/share/java/apache-ant/bin/ant -buildfile conftest.xml 1>&2
-Buildfile: /Users/jim/src/asf/code/follow/aoo-414/main/conftest.xml
+Buildfile: /Users/jim/src/asf/code/follow/AOO414/main/conftest.xml
conftest:
- [javac] /Users/jim/src/asf/code/follow/aoo-414/main/conftest.xml:3: warning: 'includeantruntime' was not set, defaulting to build.sysclasspath=last; set to false for repeatable builds
+ [javac] /Users/jim/src/asf/code/follow/AOO414/main/conftest.xml:3: warning: 'includeantruntime' was not set, defaulting to build.sysclasspath=last; set to false for repeatable builds
[javac] Compiling 1 source file
BUILD SUCCESSFUL
@@ -850,16 +850,16 @@ configure: ant_version_minor 9
configure:22573: result: yes, 1.9.9
configure:22580: checking whether ant supports mapper type="regexp"
configure:22613: /usr/local/share/java/apache-ant/bin/ant -buildfile conftest.xml 1>&2
-Buildfile: /Users/jim/src/asf/code/follow/aoo-414/main/conftest.xml
+Buildfile: /Users/jim/src/asf/code/follow/AOO414/main/conftest.xml
copytest:
conftest:
- [javac] /Users/jim/src/asf/code/follow/aoo-414/main/conftest.xml:3: warning: 'includeantruntime' was not set, defaulting to build.sysclasspath=last; set to false for repeatable builds
+ [javac] /Users/jim/src/asf/code/follow/AOO414/main/conftest.xml:3: warning: 'includeantruntime' was not set, defaulting to build.sysclasspath=last; set to false for repeatable builds
[javac] Compiling 1 source file
BUILD SUCCESSFUL
-Total time: 0 seconds
+Total time: 1 second
configure:22616: $? = 0
configure:22619: result: yes
configure:22634: checking for JUnit 4
@@ -1088,11 +1088,11 @@ ac_cv_path_ANT=/usr/local/share/java/apa
ac_cv_path_AWK=/usr/bin/awk
ac_cv_path_BISON=/usr/bin/bison
ac_cv_path_CCACHE=not_found
-ac_cv_path_CURLCONFIG=/opt/local/bin/curl-config
+ac_cv_path_CURLCONFIG=/usr/bin/curl-config
ac_cv_path_EGREP='/usr/bin/grep -E'
ac_cv_path_FLEX=/usr/bin/flex
ac_cv_path_GNUCP=/bin/cp
-ac_cv_path_GPERF=/opt/local/bin/gperf
+ac_cv_path_GPERF=/usr/bin/gperf
ac_cv_path_GREP=/usr/bin/grep
ac_cv_path_PATCH=/usr/bin/patch
ac_cv_path_PERL=/opt/local/bin/perl
@@ -1142,7 +1142,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='2017-09-21 16:48:52 (Thu, 21 Sep 2017) - Darwin x86_64'
+BUILD_VER_STRING='2017-10-16 22:12:14 (Mon, 16 Oct 2017) - Darwin x86_64'
BUILD_X64=''
BUNDLED_EXTENSION_BLOBS=''
BUNDLED_PREREG_EXTENSIONS=''
@@ -1168,9 +1168,9 @@ CPPUNIT_CFLAGS=''
CPPUNIT_LIBS=''
CRYPT_LINK=''
CSC_PATH=''
-CURLCONFIG='/opt/local/bin/curl-config'
-CURL_CFLAGS='-I/opt/local/include'
-CURL_LIBS='-L/opt/local/lib -lcurl -lssl -lcrypto -lssl -lcrypto -lz'
+CURLCONFIG='/usr/bin/curl-config'
+CURL_CFLAGS=''
+CURL_LIBS='-lcurl'
CUSTOM_PACK_LIST=''
CXX='/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++ -arch x86_64 -std=c++11'
CXXCPP='/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++ -arch x86_64 -std=c++11 -E'
@@ -1261,7 +1261,7 @@ GNUPATCH='/usr/bin/patch'
GNUTAR='gtar'
GOBJECT_CFLAGS=''
GOBJECT_LIBS=''
-GPERF='/opt/local/bin/gperf'
+GPERF='/usr/bin/gperf'
GRAPHITE_CFLAGS=''
GRAPHITE_LIBS=''
GREP='/usr/bin/grep'
Modified: openoffice/devtools/build-scripts/4.2.0/unxmacos/build_aooreleases.sh
URL: http://svn.apache.org/viewvc/openoffice/devtools/build-scripts/4.2.0/unxmacos/build_aooreleases.sh?rev=1812630&r1=1812629&r2=1812630&view=diff
==============================================================================
--- openoffice/devtools/build-scripts/4.2.0/unxmacos/build_aooreleases.sh (original)
+++ openoffice/devtools/build-scripts/4.2.0/unxmacos/build_aooreleases.sh Thu Oct 19 12:43:06 2017
@@ -127,6 +127,7 @@ export MACOSX_DEPLOYMENT_TARGET
#export CLANG_CXX_LIBRARY
#export CXX
+if test "$1" != "--skip-conf"; then
./configure \
--with-build-version="$(date +"%Y-%m-%d %H:%M:%S (%a, %d %b %Y)") - `uname -sm`" \
--with-vendor="Apache OpenOffice Community Build" \
@@ -146,6 +147,7 @@ export MACOSX_DEPLOYMENT_TARGET
--with-alloc=system \
--with-lang="${LANGS}" \
| tee config.out || exit 1
+fi
./bootstrap || exit 1
source ./MacOSXX64Env.Set.sh || exit 1