You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ms...@apache.org on 2018/05/22 19:23:16 UTC
svn commit: r1832057 - in /openoffice/trunk/main: configure.ac
nss/makefile.mk
Author: mseidel
Date: Tue May 22 19:23:15 2018
New Revision: 1832057
URL: http://svn.apache.org/viewvc?rev=1832057&view=rev
Log:
Enabling the use of Mozilla Build versions >= 3.0.
(From 3.0 on Mozilla Build is 64-bit only and requires Windows 64-bit)
Changed locations of nsinstall.exe:
Version <= 2.2.0: $(moz_build)/moztools/bin (32-bit)
Version 3.0 - 3.1.1: $(moz_build)/msys/local/bin (64-bit only)
Version >= 3.2: $(moz_build)/bin (64-bit only)
Modified:
openoffice/trunk/main/configure.ac
openoffice/trunk/main/nss/makefile.mk
Modified: openoffice/trunk/main/configure.ac
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/configure.ac?rev=1832057&r1=1832056&r2=1832057&view=diff
==============================================================================
--- openoffice/trunk/main/configure.ac (original)
+++ openoffice/trunk/main/configure.ac Tue May 22 19:23:15 2018
@@ -4732,8 +4732,7 @@ AC_MSG_ERROR([Mozilla build tooling inco
AC_MSG_RESULT([ok])
fi
else
- if test ! -d "$MOZILLABUILD/moztools" \
- -o ! -d "$MOZILLABUILD/msys" ; then
+ if test ! -d "$MOZILLABUILD/msys" ; then
AC_MSG_ERROR([Mozilla build tooling incomplete!])
else
AC_MSG_RESULT([ok])
Modified: openoffice/trunk/main/nss/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/nss/makefile.mk?rev=1832057&r1=1832056&r2=1832057&view=diff
==============================================================================
--- openoffice/trunk/main/nss/makefile.mk (original)
+++ openoffice/trunk/main/nss/makefile.mk Tue May 22 19:23:15 2018
@@ -129,10 +129,9 @@ OS_TARGET=WIN95
# make use of stlport headerfiles
EXT_USE_STLPORT=TRUE
-#To build nss one has to call "make nss_build_all" in
-#nss
+# To build nss one has to call "make nss_build_all" in nss
NSS_BUILD_DIR= $(subst,\,/ $(PWD)/$(MISC)/build/$(TARFILE_ROOTDIR)/nss)
-BUILD_ACTION= PATH="$(PATH):$(moz_build)/msys/bin:$(moz_build)/moztools/bin" && $(subst,/,$/ $(MOZILLABUILD)/msys/bin/bash) -i \
+BUILD_ACTION= PATH="$(PATH):$(moz_build)/msys/bin:$(moz_build)/bin:$(moz_build)/msys/local/bin:$(moz_build)/moztools/bin" && $(subst,/,$/ $(MOZILLABUILD)/msys/bin/bash) -i \
-c "cd $(NSS_BUILD_DIR) && make nss_build_all NSS_DISABLE_GTESTS=1"
OUT2LIB= \