Repository.mk | 9 +++------ solenv/gbuild/Library.mk | 2 +- solenv/gbuild/platform/IOS_ARM_GCC.mk | 1 + solenv/gbuild/platform/android.mk | 1 + solenv/gbuild/platform/solaris.mk | 1 + solenv/gbuild/platform/unxgcc.mk | 1 + testtools/CustomTarget_bridgetest.mk | 3 +++ testtools/CustomTarget_uno_test.mk | 1 + 8 files changed, 12 insertions(+), 7 deletions(-)
New commits: commit b7b89c9696534d015a7631e959cd03f5e8b29be2 Author: Stephan Bergmann <sberg...@redhat.com> Date: Mon Aug 26 21:24:41 2013 +0200 The testtools component libs are layer NONE, not URELIB Change-Id: I513ca71792ed9d4010a90041f3f5b818816374c8 diff --git a/Repository.mk b/Repository.mk index bd8a4ee..f69f10f 100644 --- a/Repository.mk +++ b/Repository.mk @@ -435,6 +435,9 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \ smoketest \ subsequenttest \ test \ + testtools_cppobj \ + testtools_bridgetest \ + testtools_constructors \ unobootstrapprotector \ unoexceptionprotector \ unotest \ @@ -608,12 +611,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ pythonloader \ )) -$(eval $(call gb_Helper_register_libraries,UNOLIBS_URE, \ - testtools_cppobj \ - testtools_bridgetest \ - testtools_constructors \ -)) - $(eval $(call gb_Helper_register_libraries,UNOVERLIBS, \ cppu \ sal \ diff --git a/testtools/CustomTarget_bridgetest.mk b/testtools/CustomTarget_bridgetest.mk index e51601b..a6f8c99 100644 --- a/testtools/CustomTarget_bridgetest.mk +++ b/testtools/CustomTarget_bridgetest.mk @@ -31,6 +31,7 @@ $(testtools_BRIDGEDIR)/bridgetest_server$(testtools_BATCHSUFFIX) :| $(testtools_ "-s com.sun.star.test.bridge.CppTestObject" \ "-u 'uno:socket$(COMMA)host=127.0.0.1$(COMMA)port=2002;urp;test'" \ "--singleaccept" \ + "-env:LO_BUILD_LIB_DIR=$(call gb_Helper_make_url,$(gb_Helper_OUTDIR_FOR_BUILDLIBDIR))" \ "-env:URE_MORE_SERVICES=$(call gb_Helper_make_url,$(call gb_Rdb_get_outdir_target,uno_services))" \ "-env:URE_MORE_TYPES=$(call gb_Helper_make_url,$(WORKDIR)/UnoApiTarget/bridgetest.rdb)" \ > $@) @@ -60,6 +61,7 @@ $(testtools_BRIDGEDIR)/bridgetest_inprocess_java$(testtools_BATCHSUFFIX) :| $(te "LD_LIBRARY_PATH=$(OUTDIR)/lib" \ "$(call gb_Executable_get_target_for_build,uno)" \ "-s com.sun.star.test.bridge.BridgeTest" \ + "-env:LO_BUILD_LIB_DIR=$(call gb_Helper_make_url,$(gb_Helper_OUTDIR_FOR_BUILDLIBDIR))" \ "-env:URE_INTERNAL_JAVA_DIR=file://$(OUTDIR)/bin" \ "-env:URE_MORE_SERVICES=$(call gb_Helper_make_url,$(call gb_Rdb_get_outdir_target,uno_services))" \ "-env:URE_MORE_TYPES=$(call gb_Helper_make_url,$(WORKDIR)/UnoApiTarget/bridgetest.rdb)" \ @@ -73,6 +75,7 @@ $(testtools_BRIDGEDIR)/bridgetest_client$(testtools_BATCHSUFFIX) :| $(testtools_ echo "$(call gb_Executable_get_target_for_build,uno)" \ "-s com.sun.star.test.bridge.BridgeTest --" \ "-u 'uno:socket$(COMMA)host=127.0.0.1$(COMMA)port=2002;urp;test'" \ + "-env:LO_BUILD_LIB_DIR=$(call gb_Helper_make_url,$(gb_Helper_OUTDIR_FOR_BUILDLIBDIR))" \ "-env:URE_MORE_SERVICES=$(call gb_Helper_make_url,$(call gb_Rdb_get_outdir_target,uno_services))" \ "-env:URE_MORE_TYPES=$(call gb_Helper_make_url,$(WORKDIR)/UnoApiTarget/bridgetest.rdb)" \ > $@) diff --git a/testtools/CustomTarget_uno_test.mk b/testtools/CustomTarget_uno_test.mk index 7485890..89e098e 100644 --- a/testtools/CustomTarget_uno_test.mk +++ b/testtools/CustomTarget_uno_test.mk @@ -22,6 +22,7 @@ $(call gb_CustomTarget_get_target,testtools/uno_test) : \ $(call gb_Executable_get_command,uno) \ -s com.sun.star.test.bridge.BridgeTest \ -- com.sun.star.test.bridge.CppTestObject \ + -env:LO_BUILD_LIB_DIR=$(call gb_Helper_make_url,$(gb_Helper_OUTDIR_FOR_BUILDLIBDIR)) \ -env:URE_MORE_SERVICES=$(call gb_Helper_make_url,$(call gb_Rdb_get_outdir_target,uno_services)) \ -env:URE_MORE_TYPES=$(call gb_Helper_make_url,$(WORKDIR)/UnoApiTarget/bridgetest.rdb)) commit 85561702015659f8943abb23f316a32702b46411 Author: Stephan Bergmann <sberg...@redhat.com> Date: Mon Aug 26 21:23:39 2013 +0200 Introduce LO_BUILD_LIB_DIR for NONE .component files ...instead of reusing LO_LIB_DIR. Change-Id: Ifb1ea672e35d4bb93a27b64445ecadf4cbe8f647 diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk index e8cd313..95d9d2e 100644 --- a/solenv/gbuild/Library.mk +++ b/solenv/gbuild/Library.mk @@ -190,7 +190,7 @@ gb_Library__get_layer_componentprefix = \ # Make/awk/sed/whatever syntax. gb_Library__COMPONENTPREFIXES := \ - NONE:vnd.sun.star.expand:\dLO_LIB_DIR/ \ + NONE:vnd.sun.star.expand:\dLO_BUILD_LIB_DIR/ \ OOO:vnd.sun.star.expand:\dLO_LIB_DIR/ \ URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \ OXT:./ \ commit 0c1f76c54fbdca4b3f3f71e207227c9d9ea15415 Author: Stephan Bergmann <sberg...@redhat.com> Date: Mon Aug 26 21:05:36 2013 +0200 PLAINLIBS_NONE missing from some platforms' gb_Library_LAYER definitions Change-Id: Ic403e265e04f9499d3b2da13d4d268af97272088 diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk b/solenv/gbuild/platform/IOS_ARM_GCC.mk index a251178..2724a35 100644 --- a/solenv/gbuild/platform/IOS_ARM_GCC.mk +++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk @@ -178,6 +178,7 @@ gb_Library_LAYER := \ $(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOO) \ $(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):OOO) \ $(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):OOO) \ + $(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):NONE) \ $(foreach lib,$(gb_Library_RTVERLIBS),$(lib):OOO) \ $(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):OOO) \ $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):OOO) \ diff --git a/solenv/gbuild/platform/android.mk b/solenv/gbuild/platform/android.mk index 0161f97..4774337 100644 --- a/solenv/gbuild/platform/android.mk +++ b/solenv/gbuild/platform/android.mk @@ -90,6 +90,7 @@ gb_Library_LAYER := \ $(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOO) \ $(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):OOO) \ $(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):OOO) \ + $(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):NONE) \ $(foreach lib,$(gb_Library_RTVERLIBS),$(lib):OOO) \ $(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):OOO) \ $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):OOO) \ diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk index 26a1c69..4bf95b0 100644 --- a/solenv/gbuild/platform/solaris.mk +++ b/solenv/gbuild/platform/solaris.mk @@ -252,6 +252,7 @@ gb_Library_LAYER := \ $(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOO) \ $(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):URELIB) \ $(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):OOO) \ + $(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):NONE) \ $(foreach lib,$(gb_Library_RTVERLIBS),$(lib):URELIB) \ $(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):URELIB) \ $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):URELIB) \ diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk index 18f2493..ac549fc 100644 --- a/solenv/gbuild/platform/unxgcc.mk +++ b/solenv/gbuild/platform/unxgcc.mk @@ -249,6 +249,7 @@ gb_Library_LAYER := \ $(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOO) \ $(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):URELIB) \ $(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):OOO) \ + $(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):NONE) \ $(foreach lib,$(gb_Library_RTVERLIBS),$(lib):URELIB) \ $(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):URELIB) \ $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):URELIB) \ _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits