Makefile | 6 ++++-- configure.in | 3 +++ scp2/source/ooo/file_library_ooo.scp | 11 +++++++++++ scp2/source/ooo/shortcut_ooo.scp | 4 ++++ sw/CppunitTest_sw_macros_test.mk | 2 +- 5 files changed, 23 insertions(+), 3 deletions(-)
New commits: commit 03c6bfff92b10fc9f8ab82dcea1303dfe763f94c Author: Tor Lillqvist <t...@iki.fi> Date: Thu Mar 8 11:52:10 2012 +0200 The instsetoo_native part is unnecessary when doing dev-install diff --git a/Makefile b/Makefile index 905829b..84d8c46 100644 --- a/Makefile +++ b/Makefile @@ -389,7 +389,7 @@ bootstrap: $(WORKDIR_BOOTSTRAP) # # Build # -build: bootstrap fetch $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross-toolset) +build-packimages: bootstrap fetch $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross-toolset) ifeq ($(DISABLE_SCRIPTING),TRUE) # We must get the headers from vbahelper "delivered" because # as we don't link to any libs from there they won't otherwise be, or @@ -404,6 +404,8 @@ ifeq ($(DISABLE_DBCONNECTIVITY),TRUE) endif cd packimages && unset MAKEFLAGS && \ $(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) --all -- -P$(GMAKE_PARALLELISM) + +build: build-packimages ifeq ($(OS_FOR_BUILD),WNT) cd instsetoo_native && unset MAKEFLAGS && $(SOLARENV)/bin/build.pl else @@ -426,7 +428,7 @@ install: echo "Installation finished, you can now execute:" && \ echo "$(INSTALLDIR)/program/soffice" -dev-install: build +dev-install: build-packimages @rm -rf $(OUTDIR)/installation @mkdir $(OUTDIR)/installation ifeq ($(DISABLE_LINKOO),TRUE) commit 67381d234f4ce73db5b4f5cdaadb06c2b602788e Author: Tor Lillqvist <t...@iki.fi> Date: Wed Mar 7 14:32:29 2012 +0200 Look for SCRIPTING in BUILD_TYPE diff --git a/sw/CppunitTest_sw_macros_test.mk b/sw/CppunitTest_sw_macros_test.mk index 00d092a..a9a0060 100644 --- a/sw/CppunitTest_sw_macros_test.mk +++ b/sw/CppunitTest_sw_macros_test.mk @@ -136,6 +136,6 @@ $(eval $(call gb_CppunitTest_set_args,sw_macros_test,\ $(call gb_CppunitTest_get_target,sw_macros_test) : \ $(call gb_Library_get_target,localedata_en) \ $(call gb_Library_get_target,msword) \ - $(if $(filter-out $(OS),IOS),$(call gb_Library_get_target,vbaswobj)) \ + $(if $(filter SCRIPTING,$(BUILD_TYPE)),$(call gb_Library_get_target,vbaswobj)) \ # vim: set noet sw=4 ts=4: commit 37a6cf755a45c5c624f4b4747d9c5a550d370924 Author: Tor Lillqvist <t...@iki.fi> Date: Wed Mar 7 13:58:37 2012 +0200 Check SOLAR_JAVA for gid_Shortcut_Lib_Hsqldb_2 diff --git a/scp2/source/ooo/shortcut_ooo.scp b/scp2/source/ooo/shortcut_ooo.scp index 9f400af..a70c225 100644 --- a/scp2/source/ooo/shortcut_ooo.scp +++ b/scp2/source/ooo/shortcut_ooo.scp @@ -80,6 +80,8 @@ End #ifdef MACOSX +#ifdef SOLAR_JAVA + Shortcut gid_Shortcut_Lib_Hsqldb_2 FileID = gid_File_Lib_Hsqldb_2; Dir = SCP2_OOO_BIN_DIR; @@ -87,6 +89,8 @@ Shortcut gid_Shortcut_Lib_Hsqldb_2 Styles = (NETWORK, RELATIVE); End +#endif + Shortcut gid_Shortcut_Lib_Libcroco FileID = gid_File_Lib_Libcroco; Dir = SCP2_OOO_BIN_DIR; commit c3fe8e2fd53ea37ce3e1d8fa583c80795991f550 Author: Tor Lillqvist <t...@iki.fi> Date: Wed Mar 7 13:57:46 2012 +0200 Obey DISABLE_SCRIPTING diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index fe08906..716f590 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -39,6 +39,8 @@ End STD_LIB_FILE( gid_File_Lib_Ado, ado) #endif +#ifndef DISABLE_SCRIPTING + STD_LIB_FILE( gid_File_Lib_Basctl, basctl) File gid_File_Lib_Basprov @@ -63,6 +65,8 @@ File gid_File_Lib_Vbaevent #endif End +#endif + STD_LIB_FILE( gid_File_Lib_Bib , bib) File gid_File_Lib_Cached1 @@ -309,6 +313,8 @@ File gid_File_Lib_Textconv_Dict Styles = (PACKED); End +#ifndef DISABLE_SCRIPTING + File gid_File_Lib_Dlgprov LIB_FILE_BODY; Styles = (PACKED); @@ -320,6 +326,8 @@ File gid_File_Lib_Dlgprov #endif End +#endif + File gid_File_Lib_Stringresource LIB_FILE_BODY; Styles = (PACKED); @@ -331,6 +339,8 @@ File gid_File_Lib_Stringresource #endif End +#ifndef DISABLE_SCRIPTING + File gid_File_Lib_Vbaobj LIB_FILE_BODY; Styles = (PACKED); @@ -375,6 +385,7 @@ File gid_File_Lib_Vbahelper #endif End +#endif #ifdef WNT commit 8db978d3fa7916462fc7e6232532336e3a602e40 Author: Tor Lillqvist <t...@iki.fi> Date: Wed Mar 7 13:57:06 2012 +0200 Add DISABLE_DBCONNECTIVITY and DISABLE_SCRIPTING to SCPDEFS when needed diff --git a/configure.in b/configure.in index 973a978..d9f8741 100644 --- a/configure.in +++ b/configure.in @@ -2056,6 +2056,7 @@ if test "$enable_database_connectivity" = yes; then BUILD_TYPE="$BUILD_TYPE DBCONNECTIVITY" else DISABLE_DBCONNECTIVITY='TRUE' + SCPDEFS="$SCPDEFS -DDISABLE_DBCONNECTIVITY" fi AC_SUBST(DISABLE_DBCONNECTIVITY) @@ -2088,6 +2089,7 @@ if test "$enable_scripting" = yes; then BUILD_TYPE="$BUILD_TYPE SCRIPTING" else DISABLE_SCRIPTING='TRUE' + SCPDEFS="$SCPDEFS -DDISABLE_SCRIPTING" fi AC_SUBST(DISABLE_SCRIPTING) commit 703e7b390ef69c43b5ad9ed7af01af23ad4b4bcf Author: Tor Lillqvist <t...@iki.fi> Date: Wed Mar 7 13:55:57 2012 +0200 Also set with_java=no in the disable-scripting case diff --git a/configure.in b/configure.in index ad50261..973a978 100644 --- a/configure.in +++ b/configure.in @@ -4589,6 +4589,7 @@ if test "$with_java" != "no"; then if test "$DISABLE_SCRIPTING" = TRUE; then AC_MSG_RESULT([no, overridden by --disable-scripting]) SOLAR_JAVA="" + with_java=no else AC_MSG_RESULT([yes]) SOLAR_JAVA="TRUE" _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits