[Libreoffice-commits] .: Branch 'feature/gbuild_merge' - 5 commits - Makefile.top RepositoryExternal.mk shell/CustomTarget_shlxthdl_res.mk solenv/gbuild testtools/CustomTarget_bridgetest_climaker.mk testtools/CustomTarget_bridgetest.mk

Matus Kukan mkukan at kemper.freedesktop.org
Sat May 26 15:12:14 PDT 2012 

 Makefile.top                                  |    2 +-
 RepositoryExternal.mk                         |    4 ++--
 shell/CustomTarget_shlxthdl_res.mk            |    2 +-
 solenv/gbuild/InstallModuleTarget.mk          |    5 +----
 testtools/CustomTarget_bridgetest.mk          |   25 +++++++------------------
 testtools/CustomTarget_bridgetest_climaker.mk |    2 +-
 6 files changed, 13 insertions(+), 27 deletions(-)

New commits:
commit c774d2bea6f0549d09b04d288505371011bb4633
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Sat May 26 23:47:05 2012 +0200

    scp2: fix Windows build
    
    Change-Id: I6662bfca925f9dae99b3f70fd81dba04d36ac9c8

diff --git a/solenv/gbuild/InstallModuleTarget.mk b/solenv/gbuild/InstallModuleTarget.mk
index db8aa61..1b717a7 100644
--- a/solenv/gbuild/InstallModuleTarget.mk
+++ b/solenv/gbuild/InstallModuleTarget.mk
@@ -73,15 +73,12 @@ endef
 
 # ScpPreprocessTarget class
 
-gb_ScpPreprocessTarget_TARGET := $(call gb_Executable_get_target_for_build,cpp.lcc)
-gb_ScpPreprocessTarget_COMMAND := $(gb_Helper_set_ld_path) $(gb_ScpPreprocessTarget_TARGET)
-
 gb_ScpPreprocessTarget_get_source = $(SRCDIR)/$(1).scp
 
 define gb_ScpPreprocessTarget__command
 $(call gb_Output_announce,$(2),$(true),SPP,2)
 $(call gb_Helper_abbreviate_dirs,\
-	$(gb_ScpPreprocessTarget_COMMAND) \
+	$(call gb_Helper_execute,cpp.lcc) \
 		-+ -P \
 		$(SCPDEFS) $(SCP_DEFS) -DDLLPOSTFIX=$(gb_Library_DLLPOSTFIX) \
 		$(SCP_INCLUDE) $(SCP_TEMPLATE_INCLUDE) \
commit 46a222798acfc508e10ddb8ff470771eabbf8b3c
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Sat May 26 23:38:34 2012 +0200

    pq's name is different on Windows
    
    Change-Id: I63731a1114edcf60a19083e6ceafaae1b402e716

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index b1c1f11..25a6749 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1281,7 +1281,7 @@ $(call gb_LinkTarget_set_include,$(1),\
 )
 
 $(call gb_LinkTarget_use_static_libraries,$(1),\
-	pq \
+	$(if $(filter MSC,$(COM)),lib)pq \
 )
 
 ifeq ($(GUI)$(COM),WNTMSC)
@@ -1296,7 +1296,7 @@ endif
 endef
 
 $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS,\
-	pq \
+	$(if $(filter MSC,$(COM)),lib)pq \
 ))
 
 endif # SYSTEM_POSTGRESQL
commit a2dc0d67c4fcd25510a497b45c5dfe37df5208fe
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Sat May 26 23:12:53 2012 +0200

    shell is gbuildified
    
    Change-Id: Ia40e317a69883c578a349035604afb5a5dad4c86

diff --git a/Makefile.top b/Makefile.top
index 5bd62f0..192ddbd 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -111,6 +111,7 @@ scripting\
 sd\
 sdext\
 sfx2\
+shell\
 slideshow\
 smoketest\
 solenv\
@@ -231,7 +232,6 @@ remotebridges\
 rhino\
 saxon\
 setup_native\
-shell\
 soltools\
 stax\
 stlport\
commit 70477ab82e2d7657f7aed527649d89d9a5d4cff7
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Sat May 26 22:41:54 2012 +0200

    testttools: tweak makefiles, fix typos
    
    Change-Id: I4e7c7f2d79641772479924f8efc479beaf137f8f

diff --git a/testtools/CustomTarget_bridgetest.mk b/testtools/CustomTarget_bridgetest.mk
index a4237d3..473613d 100644
--- a/testtools/CustomTarget_bridgetest.mk
+++ b/testtools/CustomTarget_bridgetest.mk
@@ -43,14 +43,12 @@ bridgetest_TARGET := $(workdir_SERVER)/bridgetest_server$(BATCH_SUFFIX) \
 ifneq ($(SOLAR_JAVA),)
 bridgetest_TARGET := $(bridgetest_TARGET) \
 	$(workdir_SERVER)/bridgetest_javaserver$(BATCH_SUFFIX) \
-	$(workdir_SERVER)/bridgetest_inprocess_java(BATCH_SUFFIX)
+	$(workdir_SERVER)/bridgetest_inprocess_java$(BATCH_SUFFIX)
 endif
 
 $(call gb_CustomTarget_get_target,testtools/bridgetest) : $(bridgetest_TARGET)
 
-# which other prerequisites do we need here?
-$(workdir_SERVER)/bridgetest_server$(BATCH_SUFFIX) : \
-	$(SRCDIR)/testtools/source/bridgetest/*.component | $(workdir_SERVER)/.dir
+$(workdir_SERVER)/bridgetest_server$(BATCH_SUFFIX) :| $(workdir_SERVER)/.dir
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
 	$(call gb_Helper_abbreviate_dirs,\
 		echo "$(UNO_EXE)" \
@@ -62,26 +60,20 @@ $(workdir_SERVER)/bridgetest_server$(BATCH_SUFFIX) : \
 		"--singleaccept" > $@)
 	$(GIVE_EXEC_RIGHTS) $@
 
-ifneq ($(SOLAR_JAVA),)
 
-# how to do it more elegantly?
-MY_CLASSPATH := $(OUTDIR)/bin/ridl.jar$(gb_CLASSPATHSEP)$(OUTDIR)/bin/java_uno.jar$(gb_CLASSPATHSEP)$(OUTDIR)/bin/jurt.jar$(gb_CLASSPATHSEP)$(OUTDIR)/bin/juh.jar
+testtools_MY_CLASSPATH := $(OUTDIR)/bin/ridl.jar$(gb_CLASSPATHSEP)$(OUTDIR)/bin/java_uno.jar$(gb_CLASSPATHSEP)$(OUTDIR)/bin/jurt.jar$(gb_CLASSPATHSEP)$(OUTDIR)/bin/juh.jar
 
-# which other prerequisites do we need here?
-$(workdir_SERVER)/bridgetest_javaserver$(BATCH_SUFFIX) : \
-	$(SRCDIR)/testtools/source/bridgetest/*.component | $(workdir_SERVER)/.dir
+$(workdir_SERVER)/bridgetest_javaserver$(BATCH_SUFFIX) :| $(workdir_SERVER)/.dir
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
 	$(call gb_Helper_abbreviate_dirs,\
 		echo "java" \
-		"-classpath $(MY_CLASSPATH)$(gb_CLASSPATHSEP)$(OUTDIR)/bin/testComponent.jar" \
+		"-classpath $(testtools_MY_CLASSPATH)$(gb_CLASSPATHSEP)$(OUTDIR)/bin/testComponent.jar" \
 		"com.sun.star.comp.bridge.TestComponentMain" \
 		\""uno:socket$(COMMA)host=127.0.0.1$(COMMA)port=2002;urp;test"\" \
 		"singleaccept"> $@)
 	$(GIVE_EXEC_RIGHTS) $@
 
-# which other prerequisites do we need here?
-$(workdir_SERVER)/bridgetest_inprocess_java(BATCH_SUFFIX) : \
-	$(SRCDIR)/testtools/source/bridgetest/*.component | $(workdir_SERVER)/.dir
+$(workdir_SERVER)/bridgetest_inprocess_java$(BATCH_SUFFIX) :| $(workdir_SERVER)/.dir
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
 	$(call gb_Helper_abbreviate_dirs,\
 		echo "JAVA_HOME=$(JAVA_HOME)" \
@@ -97,11 +89,8 @@ $(workdir_SERVER)/bridgetest_inprocess_java(BATCH_SUFFIX) : \
 		"-- com.sun.star.test.bridge.JavaTestObject noCurrentContext" \
 		> $@)
 	$(GIVE_EXEC_RIGHTS) $@
-endif
 
-# which other prerequisites do we need here?
-$(workdir_SERVER)/bridgetest_client$(BATCH_SUFFIX) : \
-	$(SRCDIR)/testtools/source/bridgetest/*.component | $(workdir_SERVER)/.dir
+$(workdir_SERVER)/bridgetest_client$(BATCH_SUFFIX) :| $(workdir_SERVER)/.dir
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
 	$(call gb_Helper_abbreviate_dirs,\
 		echo "$(UNO_EXE)" \
diff --git a/testtools/CustomTarget_bridgetest_climaker.mk b/testtools/CustomTarget_bridgetest_climaker.mk
index 87ee4f6..b66d8a3 100644
--- a/testtools/CustomTarget_bridgetest_climaker.mk
+++ b/testtools/CustomTarget_bridgetest_climaker.mk
@@ -36,7 +36,7 @@ $(climaker_DIR)/cli_types_bridgetest.dll : $(OUTDIR)/bin/bridgetest.rdb \
 		$(call gb_Executable_get_target_for_build,climaker) | $(climaker_DIR)/.dir
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CLM,1)
 	$(call gb_Helper_abbreviate_dirs, \
-	$(call gb_Helper_execute,climaker \
+	$(call gb_Helper_execute,climaker) \
 		$(if $(filter -s,$(MAKEFLAGS)),,--verbose) \
 		--out $@ \
 		-X $(OUTDIR)/bin/types.rdb \
commit c9c32ccfe94bc34fff98e9190b7b6789fe543111
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Fri May 25 18:37:02 2012 +0200

    shell: change last gb_Helper_abbreviate_dirs_native
    
    Change-Id: I51e6db0a6b6da2adf42e3d759865994d8624c192

diff --git a/shell/CustomTarget_shlxthdl_res.mk b/shell/CustomTarget_shlxthdl_res.mk
index 125d4df..67e27a6 100644
--- a/shell/CustomTarget_shlxthdl_res.mk
+++ b/shell/CustomTarget_shlxthdl_res.mk
@@ -40,7 +40,7 @@ $(call gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl
 
 $(call gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl_impl.rc :
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),LCX,1)
-	$(call gb_Helper_abbreviate_dirs_native,\
+	$(call gb_Helper_abbreviate_dirs,\
 		cd $(SRCDIR)/shell/source/win32/shlxthandler/res && \
 		$(call gb_Executable_get_target_for_build,lngconvex) \
 			-ulf shlxthdl.ulf \

More information about the Libreoffice-commits mailing list