[Libreoffice-commits] core.git: 5 commits - accessibility/CustomTarget_bridge_inc.mk dbaccess/JunitTest_dbaccess_complex.mk desktop/Extension_test-passive.mk languagetool/ExternalProject_languagetool.mk nlpsolver/Extension_nlpsolver.mk odk/CustomTarget_javadoc.mk RepositoryExternal.mk scripting/Package_java_jars.mk smoketest/Extension_TestExtension.mk solenv/gbuild svl/JunitTest_svl_complex.mk swext/Extension_wiki-publisher.mk testtools/CustomTarget_bridgetest.mk unotest/Jar_test.mk

Michael Stahl mstahl at redhat.com
Fri Oct 25 02:45:45 PDT 2013 

 RepositoryExternal.mk                        |   12 +++---
 accessibility/CustomTarget_bridge_inc.mk     |    3 +
 dbaccess/JunitTest_dbaccess_complex.mk       |    1 
 desktop/Extension_test-passive.mk            |    2 -
 languagetool/ExternalProject_languagetool.mk |   13 ++++---
 nlpsolver/Extension_nlpsolver.mk             |    4 +-
 odk/CustomTarget_javadoc.mk                  |    5 +-
 scripting/Package_java_jars.mk               |    2 -
 smoketest/Extension_TestExtension.mk         |    2 -
 solenv/gbuild/ExternalProject.mk             |    9 ++++
 solenv/gbuild/Jar.mk                         |   49 ++++++++++++++++-----------
 solenv/gbuild/JavaClassSet.mk                |    6 +--
 solenv/gbuild/JunitTest.mk                   |    4 +-
 solenv/gbuild/TargetLocations.mk             |    3 -
 svl/JunitTest_svl_complex.mk                 |    1 
 swext/Extension_wiki-publisher.mk            |    2 -
 testtools/CustomTarget_bridgetest.mk         |    4 +-
 unotest/Jar_test.mk                          |    6 +--
 18 files changed, 78 insertions(+), 50 deletions(-)

New commits:
commit 30fc3d6cff15ceabea6e1f9c4683cd383c322d72
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Oct 24 21:58:25 2013 +0200

    gbuild: refactor Jar target to stop using OUTDIR
    
    - gb_Jar_get_target points to layer-specific location
    - remove gb_Jar_get_outdir_target
    - add OXT and NONE layers
    - add a rule for every installed Jar to avoid problems with conflicting
      pattern rules in instdir
    
    Change-Id: Icf11869a454a7a52791c5ae257fc5da87aa46dc2

diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk
index b71c9dc..2c6ba14 100644
--- a/solenv/gbuild/Jar.mk
+++ b/solenv/gbuild/Jar.mk
@@ -23,8 +23,11 @@ gb_Jar_JAVACOMMAND := $(JAVAINTERPRETER)
 gb_Jar_JARCOMMAND := jar
 
 gb_Jar_LAYER_DIRS := \
-	OOO:$(LIBO_SHARE_JAVA_FOLDER) \
-	URE:$(LIBO_URE_SHARE_JAVA_FOLDER)
+	URE:$(INSTROOT)/$(LIBO_URE_SHARE_JAVA_FOLDER) \
+	OOO:$(INSTROOT)/$(LIBO_SHARE_JAVA_FOLDER) \
+	OXT:$(WORKDIR)/Jar \
+	NONE:$(WORKDIR)/Jar \
+
 
 # location of files going to be packed into .jar file
 define gb_Jar_get_workdir
@@ -37,7 +40,7 @@ $(call gb_Jar_get_workdir,$(1))/META-INF/MANIFEST.MF
 endef
 
 gb_Jar__get_layer = $(strip $(foreach group,$(gb_Jar_VALIDGROUPS),$(if $(filter $(1),$(gb_Jar_$(group))),$(group))))
-gb_Jar__get_dir_for_layer = $(patsubst $(1):%,$(INSTROOT)/%,$(filter $(1):%,$(gb_Jar_LAYER_DIRS)))
+gb_Jar__get_dir_for_layer = $(patsubst $(1):%,%,$(filter $(1):%,$(gb_Jar_LAYER_DIRS)))
 gb_Jar_get_install_target = $(call gb_Jar__get_dir_for_layer,$(call gb_Jar__get_layer,$(1)))/$(1).jar
 
 # creates classset and META-INF folders if they don't exist
@@ -52,7 +55,7 @@ gb_Jar_get_install_target = $(call gb_Jar__get_dir_for_layer,$(call gb_Jar__get_
 # the archive with the main class hierarchy and then updating it from
 # the other one(s), which seems to work .-)
 define gb_Jar__command
-	$(call gb_Output_announce,$*,$(true),JAR,3)
+	$(call gb_Output_announce,$(1),$(true),JAR,3)
 	$(call gb_Helper_abbreviate_dirs,\
 	mkdir -p $(call gb_Jar_get_workdir,$(1))/META-INF && \
 	echo Manifest-Version: 1.0 > $(call gb_Jar_get_manifest_target,$(1)) && \
@@ -70,20 +73,25 @@ endef
 $(call gb_Jar_get_clean_target,%) : $(call gb_JavaClassSet_get_clean_target,$(call gb_Jar_get_classsetname,%))
 	$(call gb_Output_announce,$*,$(false),JAR,3)
 	$(call gb_Helper_abbreviate_dirs,\
-		rm -f $(call gb_Jar_get_target,$*) $(call gb_Jar_get_outdir_target,$*))
+		rm -f $(call gb_Jar_get_target,$*))
 
-# the outdir target depends on the workdir target and is built by delivering the latter
 # the workdir target is created by cd'ing to the target directory and adding/updating the files
 
 # rule for creating the jar file using the command defined above
-$(call gb_Jar_get_target,%) : $(call gb_JavaClassSet_get_target,$(call gb_Jar_get_classsetname,%))
-	$(call gb_Jar__command,$*,$@,$*,$?)
+$(WORKDIR)/Jar/%.jar :
+	$(call gb_Jar__command,$*,$@)
+
+# call gb_Jar__make_installed_rule,jar
+define gb_Jar__make_installed_rule
+$(call gb_Jar_get_target,$(1)) :
+	$$(call gb_Jar__command,$(1),$(call gb_Jar_get_target,$(1)))
+
+endef
 
 # resets scoped variables (see explanations where they are set)
 # creates a class set and a dependency to it 
 # registers target and clean target
 # adds jar files to DeliverLogTarget
-# adds dependency for outdir target to workdir target (pattern rule for delivery is in Package.mk)
 define gb_Jar_Jar
 ifeq (,$$(findstring $(1),$$(gb_Jar_KNOWN)))
 $$(eval $$(call gb_Output_info,Currently known jars are: $(sort $(gb_Jar_KNOWN)),ALL))
@@ -94,18 +102,14 @@ $(call gb_Jar_get_target,$(1)) : JARCLASSPATH :=
 $(call gb_Jar_get_target,$(1)) : PACKAGEROOTS :=
 $(call gb_Jar_get_target,$(1)) : PACKAGEDIRS :=
 $(call gb_Jar_get_target,$(1)) : PACKAGEFILES :=
+$(call gb_Jar_get_target,$(1)) : \
+	$(call gb_JavaClassSet_get_target,$(call gb_Jar_get_classsetname,$(1)))
 $(call gb_JavaClassSet_JavaClassSet,$(call gb_Jar_get_classsetname,$(1)))
-$(eval $(call gb_Module_register_target,$(call gb_Jar_get_outdir_target,$(1)),$(call gb_Jar_get_clean_target,$(1))))
-$(call gb_Helper_make_userfriendly_targets,$(1),Jar,$(call gb_Jar_get_outdir_target,$(1)))
-$(call gb_Deliver_add_deliverable,$(call gb_Jar_get_outdir_target,$(1)),$(call gb_Jar_get_target,$(1)),$(1))
-$(call gb_Jar_get_outdir_target,$(1)) : $(call gb_Jar_get_target,$(1))
-$(call gb_Jar_get_outdir_target,$(1)) :| $(dir $(call gb_Jar_get_outdir_target,$(1))).dir
-
-$(if $(filter OOO URE,$(call gb_Jar__get_layer,$(1))),\
-$(call gb_Helper_install,$(call gb_Jar_get_outdir_target,$(1)), \
-	$(call gb_Jar_get_install_target,$(1)), \
-	$(call gb_Jar_get_target,$(1))) \
-)
+$(eval $(call gb_Module_register_target,$(call gb_Jar_get_target,$(1)),$(call gb_Jar_get_clean_target,$(1))))
+$(call gb_Helper_make_userfriendly_targets,$(1),Jar,$(call gb_Jar_get_target,$(1)))
+
+# installed jars need a rule to build!
+$(if $(findstring $(INSTDIR),$(call gb_Jar_get_target,$(1))),$(call gb_Jar__make_installed_rule,$(1)))
 
 endef
 
diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk
index 64a2fdc..8063008 100644
--- a/solenv/gbuild/JavaClassSet.mk
+++ b/solenv/gbuild/JavaClassSet.mk
@@ -120,9 +120,9 @@ ifneq (,$$(filter-out $(gb_Jar_KNOWN),$(2)))
 $$(eval $$(call gb_Output_info,currently known jars are: $(sort $(gb_Jar_KNOWN)),ALL))
 $$(eval $$(call gb_Output_error,Cannot link against jar $$(filter-out $(gb_Jar_KNOWN),$(2)). Jars must be registered in Repository.mk))
 endif
-$(call gb_JavaClassSet_get_target,$(1)) : $(call gb_Jar_get_outdir_target,$(2))
-$(call gb_JavaClassSet_get_target,$(1)) : JARDEPS += $(call gb_Jar_get_outdir_target,$(2))
-$(call gb_JavaClassSet_add_classpath,$(1),$(call gb_Jar_get_outdir_target,$(2)))
+$(call gb_JavaClassSet_get_target,$(1)) : $(call gb_Jar_get_target,$(2))
+$(call gb_JavaClassSet_get_target,$(1)) : JARDEPS += $(call gb_Jar_get_target,$(2))
+$(call gb_JavaClassSet_add_classpath,$(1),$(call gb_Jar_get_target,$(2)))
 
 endef
 
diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk
index 3d01c5c..5e6e695 100644
--- a/solenv/gbuild/JunitTest.mk
+++ b/solenv/gbuild/JunitTest.mk
@@ -102,8 +102,8 @@ endef
 
 define gb_JunitTest_use_jar
 $(call gb_JavaClassSet_use_jar,$(call gb_JunitTest_get_classsetname,$(1)),$(2))
-$(call gb_JunitTest_get_target,$(1)) : T_CP := $$(T_CP)$$(gb_CLASSPATHSEP)$(call gb_Jar_get_outdir_target,$(2))
-$(call gb_JunitTest_get_target,$(1)) : $(call gb_Jar_get_outdir_target,$(2))
+$(call gb_JunitTest_get_target,$(1)) : T_CP := $$(T_CP)$$(gb_CLASSPATHSEP)$(call gb_Jar_get_target,$(2))
+$(call gb_JunitTest_get_target,$(1)) : $(call gb_Jar_get_target,$(2))
 
 endef
 
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 040dfdf..6131af1 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -36,7 +36,6 @@ gb_InstallScript_get_target = $(OUTDIR)/bin/$(1)$(gb_InstallScript_EXT)
 gb_ResTarget_get_unittest_target = \
     $(OUTDIR)/unittest/install/$(LIBO_SHARE_RESOURCE_FOLDER)/$(1).res
 gb_UnoApi_get_target = $(OUTDIR)/bin/$(1).rdb
-gb_Jar_get_outdir_target = $(OUTDIR)/bin/$(1).jar
 
 # instdir target patterns
 
@@ -121,7 +120,7 @@ gb_InstallModuleTarget_get_filelist = $(WORKDIR)/InstallModuleTarget/$(1).fileli
 gb_InstallModuleTarget_get_target = $(WORKDIR)/InstallModuleTarget/$(1).filelist
 gb_InstallScriptTarget_get_target = $(WORKDIR)/InstallScriptTarget/$(1)$(gb_InstallScript_EXT)
 gb_InternalUnoApi_get_target = $(WORKDIR)/InternalUnoApi/$(1).done
-gb_Jar_get_target = $(WORKDIR)/Jar/$(1).jar
+gb_Jar_get_target = $(call gb_Jar_get_install_target,$(1))
 gb_Jar_get_classsetname = Jar/$(1)
 gb_JavaClassSet_get_classdir = $(WORKDIR)/JavaClassSet/$(1)
 gb_JavaClassSet_get_repo_target = $(WORKDIR)/JavaClassSet/$(2)/$(1).done
commit 4bd53d1a8011988920a33d89b4d70b7d232bdbeb
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Oct 24 22:00:29 2013 +0200

    gbuild: add gb_ExternalProject_use_jars
    
    Change-Id: Idd67548cb5f0e49e539459ed7f2fbd107d37c1b3

diff --git a/languagetool/ExternalProject_languagetool.mk b/languagetool/ExternalProject_languagetool.mk
index 0afba90..c32434d 100644
--- a/languagetool/ExternalProject_languagetool.mk
+++ b/languagetool/ExternalProject_languagetool.mk
@@ -13,11 +13,14 @@ $(eval $(call gb_ExternalProject_register_targets,languagetool,\
 	build \
 ))
 
-$(call gb_ExternalProject_get_state_target,languagetool,build) : \
-            $(call gb_Jar_get_target,juh) \
-            $(call gb_Jar_get_target,jurt) \
-            $(call gb_Jar_get_target,ridl) \
-            $(call gb_Jar_get_target,unoil)
+$(eval $(call gb_ExternalProject_use_jars,languagetool,\
+	juh \
+	jurt \
+	ridl \
+	unoil \
+))
+
+$(call gb_ExternalProject_get_state_target,languagetool,build) :
 	cd "$(call gb_UnpackedTarball_get_dir,languagetool)" && \
 	$(ICECREAM_RUN) "$(ANT)" \
 		-q \
diff --git a/solenv/gbuild/ExternalProject.mk b/solenv/gbuild/ExternalProject.mk
index 9b5466b..2dd034a 100644
--- a/solenv/gbuild/ExternalProject.mk
+++ b/solenv/gbuild/ExternalProject.mk
@@ -184,6 +184,15 @@ $(call gb_ExternalProject_get_preparation_target,$(1)) : \
 
 endef
 
+# Make an external project depend on a Jar file
+#
+# gb_ExternalProject_use_jars external jars
+define gb_ExternalProject_use_jars
+$(call gb_ExternalProject_get_preparation_target,$(1)) : \
+	$(foreach jar,$(2),$(call gb_Jar_get_target,$(lib)))
+
+endef
+
 # Run a target command
 #
 # This provides a wrapper that changes to the right directory,
commit 8e602afd1e999e984e18d984a9986324831ac881
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Oct 24 21:58:38 2013 +0200

    stop looking for Jar files in solver
    
    Change-Id: I4d2a93fa7395354fbf2893df9e254ab39fa365af

diff --git a/accessibility/CustomTarget_bridge_inc.mk b/accessibility/CustomTarget_bridge_inc.mk
index db15274..8160e6a 100644
--- a/accessibility/CustomTarget_bridge_inc.mk
+++ b/accessibility/CustomTarget_bridge_inc.mk
@@ -17,6 +17,7 @@ $(call gb_CustomTarget_get_workdir,accessibility/bridge/inc)/WindowsAccessBridge
         $(call gb_Jar_get_target,java_uno_accessbridge)
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JVH,1)
 	cd $(call gb_JavaClassSet_get_classdir,$(call gb_Jar_get_classsetname,java_uno_accessbridge)) && \
-    javah -classpath "$(OUTDIR)/bin/ridl.jar$(gb_CLASSPATHSEP)$(OUTDIR)/bin/unoil.jar$(gb_CLASSPATHSEP)." -o $@ org.openoffice.accessibility.WindowsAccessBridgeAdapter
+    javah -classpath "$(call gb_Jar_get_target,ridl)$(gb_CLASSPATHSEP)$(call gb_Jar_get_target,unoil)$(gb_CLASSPATHSEP)." \
+        -o $@ org.openoffice.accessibility.WindowsAccessBridgeAdapter
 
 # vim: set ts=4 sw=4 et:
diff --git a/dbaccess/JunitTest_dbaccess_complex.mk b/dbaccess/JunitTest_dbaccess_complex.mk
index 5bd2f61..e3f2c00 100644
--- a/dbaccess/JunitTest_dbaccess_complex.mk
+++ b/dbaccess/JunitTest_dbaccess_complex.mk
@@ -12,6 +12,7 @@ $(eval $(call gb_JunitTest_JunitTest,dbaccess_complex))
 $(eval $(call gb_JunitTest_use_jars,dbaccess_complex,\
     ConnectivityTools \
     OOoRunner \
+	juh \
     jurt \
     ridl \
     test \
diff --git a/desktop/Extension_test-passive.mk b/desktop/Extension_test-passive.mk
index dbd03cf..9d235b6 100644
--- a/desktop/Extension_test-passive.mk
+++ b/desktop/Extension_test-passive.mk
@@ -17,7 +17,7 @@ $(eval $(call gb_Extension_add_files,test-passive,, \
     $(SRCDIR)/desktop/test/deployment/passive/Addons.xcu \
     $(SRCDIR)/desktop/test/deployment/passive/ProtocolHandler.xcu \
     $(SRCDIR)/desktop/test/deployment/passive/passive_python.py \
-    $(call gb_Jar_get_outdir_target,passive_java) \
+    $(call gb_Jar_get_target,passive_java) \
 ))
 
 $(eval $(call gb_Extension_add_libraries,test-passive, \
diff --git a/languagetool/ExternalProject_languagetool.mk b/languagetool/ExternalProject_languagetool.mk
index 1035bb6..0afba90 100644
--- a/languagetool/ExternalProject_languagetool.mk
+++ b/languagetool/ExternalProject_languagetool.mk
@@ -14,10 +14,10 @@ $(eval $(call gb_ExternalProject_register_targets,languagetool,\
 ))
 
 $(call gb_ExternalProject_get_state_target,languagetool,build) : \
-            $(call gb_Jar_get_outdir_target,juh) \
-            $(call gb_Jar_get_outdir_target,jurt) \
-            $(call gb_Jar_get_outdir_target,ridl) \
-            $(call gb_Jar_get_outdir_target,unoil)
+            $(call gb_Jar_get_target,juh) \
+            $(call gb_Jar_get_target,jurt) \
+            $(call gb_Jar_get_target,ridl) \
+            $(call gb_Jar_get_target,unoil)
 	cd "$(call gb_UnpackedTarball_get_dir,languagetool)" && \
 	$(ICECREAM_RUN) "$(ANT)" \
 		-q \
diff --git a/nlpsolver/Extension_nlpsolver.mk b/nlpsolver/Extension_nlpsolver.mk
index 5ca449e..1dd3c75 100644
--- a/nlpsolver/Extension_nlpsolver.mk
+++ b/nlpsolver/Extension_nlpsolver.mk
@@ -15,8 +15,8 @@ $(eval $(call gb_Extension_use_default_description,nlpsolver))
 $(eval $(call gb_Extension_use_default_license,nlpsolver))
 
 $(eval $(call gb_Extension_add_file,nlpsolver,components.rdb,$(SRCDIR)/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/components.rdb))
-$(eval $(call gb_Extension_add_file,nlpsolver,nlpsolver.jar,$(OUTDIR)/bin/nlpsolver.jar))
-$(eval $(call gb_Extension_add_file,nlpsolver,EvolutionarySolver.jar,$(OUTDIR)/bin/EvolutionarySolver.jar))
+$(eval $(call gb_Extension_add_file,nlpsolver,nlpsolver.jar,$(call gb_Jar_get_target,nlpsolver)))
+$(eval $(call gb_Extension_add_file,nlpsolver,EvolutionarySolver.jar,$(call gb_Jar_get_target,EvolutionarySolver)))
 
 $(eval $(call gb_Extension_add_file,nlpsolver,locale/NLPSolverCommon_en_US.default,$(SRCDIR)/nlpsolver/src/locale/NLPSolverCommon_en_US.default))
 $(eval $(call gb_Extension_add_file,nlpsolver,locale/NLPSolverStatusDialog_en_US.default,$(SRCDIR)/nlpsolver/src/locale/NLPSolverStatusDialog_en_US.default))
diff --git a/odk/CustomTarget_javadoc.mk b/odk/CustomTarget_javadoc.mk
index 5527fe3..c5e3e67 100644
--- a/odk/CustomTarget_javadoc.mk
+++ b/odk/CustomTarget_javadoc.mk
@@ -28,7 +28,8 @@ $(call gb_CustomTarget_get_workdir,odk/docs/java/ref)/%.html : \
 		$(call gb_CustomTarget_get_workdir,odk/docs/java/ref)/javadoc_log.txt
 	touch $@
 
-$(call gb_CustomTarget_get_workdir,odk/docs/java/ref)/javadoc_log.txt : $(call gb_Jar_get_outdir_target,ridl)
+$(call gb_CustomTarget_get_workdir,odk/docs/java/ref)/javadoc_log.txt : \
+		$(call gb_Jar_get_target,ridl)
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JDC,1)
 	$(JAVADOC) -J-Xmx120m -use -splitindex \
 		-windowtitle "Java UNO Runtime Reference" \
@@ -36,7 +37,7 @@ $(call gb_CustomTarget_get_workdir,odk/docs/java/ref)/javadoc_log.txt : $(call g
 		-tag attention:a:"Attention:" \
 		-d $(dir $@) \
 		-sourcepath "$(SRCDIR)/ridljar/source/unoloader$(gb_CLASSPATHSEP)$(SRCDIR)/ridljar$(gb_CLASSPATHSEP)$(SRCDIR)/jurt$(gb_CLASSPATHSEP)$(SRCDIR)/javaunohelper" \
-		-classpath $(OUTDIR)/bin/ridl.jar \
+		-classpath $(call gb_Jar_get_target,ridl) \
 		-linkoffline ../../common/reg $(SRCDIR)/odk/docs/java-uno \
 		-linkoffline http://java.sun.com/j2se/1.5/docs/api $(SRCDIR)/odk/docs/java \
 		$(odk_JAVAPACKAGES) \
diff --git a/scripting/Package_java_jars.mk b/scripting/Package_java_jars.mk
index bb2fc38..9d2670b 100644
--- a/scripting/Package_java_jars.mk
+++ b/scripting/Package_java_jars.mk
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Package_Package,scripting_java_jars,$(OUTDIR)/bin))
+$(eval $(call gb_Package_Package,scripting_java_jars,$(WORKDIR)/Jar))
 
 $(eval $(call gb_Package_set_outdir,scripting_java_jars,$(INSTROOT)))
 
diff --git a/smoketest/Extension_TestExtension.mk b/smoketest/Extension_TestExtension.mk
index 8644a73..83ab251 100644
--- a/smoketest/Extension_TestExtension.mk
+++ b/smoketest/Extension_TestExtension.mk
@@ -9,6 +9,6 @@
 
 $(eval $(call gb_Extension_Extension,TestExtension,smoketest/com/sun/star/comp/smoketest,nodeliver))
 
-$(eval $(call gb_Extension_add_file,TestExtension,TestExtension.jar,$(call gb_Jar_get_outdir_target,TestExtension)))
+$(eval $(call gb_Extension_add_file,TestExtension,TestExtension.jar,$(call gb_Jar_get_target,TestExtension)))
 
 # vim: set noet sw=4 ts=4:
diff --git a/svl/JunitTest_svl_complex.mk b/svl/JunitTest_svl_complex.mk
index 531c1df..7654042 100644
--- a/svl/JunitTest_svl_complex.mk
+++ b/svl/JunitTest_svl_complex.mk
@@ -30,6 +30,7 @@ $(eval $(call gb_JunitTest_use_jars,svl_complex,\
     test \
     unoil \
     jurt \
+	juh \
     ConnectivityTools \
 ))
 
diff --git a/swext/Extension_wiki-publisher.mk b/swext/Extension_wiki-publisher.mk
index 26d6a20..7dc713c 100644
--- a/swext/Extension_wiki-publisher.mk
+++ b/swext/Extension_wiki-publisher.mk
@@ -30,7 +30,7 @@ $(eval $(call gb_Extension_add_file,wiki-publisher,ProtocolHandler.xcu,$(SRCDIR)
 $(eval $(call gb_Extension_add_file,wiki-publisher,Types.xcu,$(SRCDIR)/swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/Types.xcu))
 $(eval $(call gb_Extension_add_file,wiki-publisher,WikiExtension.xcs,$(SRCDIR)/swext/mediawiki/src/registry/schema/org/openoffice/Office/Custom/WikiExtension.xcs))
 $(eval $(call gb_Extension_add_file,wiki-publisher,WikiExtension.xcu,$(call gb_XcuFile_for_extension,swext/mediawiki/src/registry/data/org/openoffice/Office/Custom/WikiExtension.xcu)))
-$(eval $(call gb_Extension_add_file,wiki-publisher,mediawiki.jar,$(OUTDIR)/bin/mediawiki.jar))
+$(eval $(call gb_Extension_add_file,wiki-publisher,mediawiki.jar,$(call gb_Jar_get_target,mediawiki)))
 $(eval $(call gb_Extension_add_file,wiki-publisher,components.rdb,$(SRCDIR)/swext/mediawiki/src/components.rdb))
 $(eval $(call gb_Extension_add_file,wiki-publisher,WikiEditor/EditSetting.xdl,$(SRCDIR)/swext/mediawiki/dialogs/EditSetting.xdl))
 $(eval $(call gb_Extension_add_file,wiki-publisher,WikiEditor/Settings.xdl,$(SRCDIR)/swext/mediawiki/dialogs/Settings.xdl))
diff --git a/testtools/CustomTarget_bridgetest.mk b/testtools/CustomTarget_bridgetest.mk
index d80e609..2c18eea 100644
--- a/testtools/CustomTarget_bridgetest.mk
+++ b/testtools/CustomTarget_bridgetest.mk
@@ -39,7 +39,7 @@ $(testtools_BRIDGEDIR)/bridgetest_server$(testtools_BATCHSUFFIX) :| $(testtools_
 	$(if $(filter-out WNT,$(OS)),chmod +x $@)
 
 
-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
+testtools_MY_CLASSPATH := $(call gb_Jar_get_target,ridl)$(gb_CLASSPATHSEP)$(call gb_Jar_get_target,java_uno)$(gb_CLASSPATHSEP)$(call gb_Jar_get_target,jurt)$(gb_CLASSPATHSEP)$(call gb_Jar_get_target,juh)
 
 $(testtools_BRIDGEDIR)/bridgetest_javaserver$(testtools_BATCHSUFFIX) :| $(testtools_BRIDGEDIR)/.dir
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
@@ -48,7 +48,7 @@ $(testtools_BRIDGEDIR)/bridgetest_javaserver$(testtools_BATCHSUFFIX) :| $(testto
 		"URE_MORE_SERVICES=$(call gb_Helper_make_url,$(call gb_Rdb_get_target,uno_services))" \
 		"URE_MORE_TYPES=$(call gb_Helper_make_url,$(WORKDIR)/UnoApiTarget/bridgetest.rdb)" \
 		"java" \
-		"-classpath $(testtools_MY_CLASSPATH)$(gb_CLASSPATHSEP)$(OUTDIR)/bin/testComponent.jar" \
+		"-classpath $(testtools_MY_CLASSPATH)$(gb_CLASSPATHSEP)$(call gb_Jar_get_target,testComponent)" \
 		"com.sun.star.comp.bridge.TestComponentMain" \
 		\""uno:socket$(COMMA)host=127.0.0.1$(COMMA)port=2002;urp;test"\" \
 		"singleaccept" \
diff --git a/unotest/Jar_test.mk b/unotest/Jar_test.mk
index 714e853..cc5fde4 100644
--- a/unotest/Jar_test.mk
+++ b/unotest/Jar_test.mk
@@ -11,9 +11,9 @@
 $(eval $(call gb_Jar_Jar,test))
 
 $(eval $(call gb_Jar_add_manifest_classpath,test,\
-	juh.jar \
-	ridl.jar \
-	unoil.jar \
+	$(call gb_Helper_make_url,$(call gb_Jar_get_target,juh)) \
+	$(call gb_Helper_make_url,$(call gb_Jar_get_target,ridl)) \
+	$(call gb_Helper_make_url,$(call gb_Jar_get_target,unoil)) \
 ))
 
 $(eval $(call gb_Jar_use_jars,test,\
commit 7da7682965c0465a4c6ae017870daadc2b9ac099
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Oct 24 23:11:02 2013 +0200

    gbuild: add gb_Jar_use_external_jar
    
    ... which is an ugly hack to handle jar files that are from externals
    and are not bundled in the main instset, only in extensions.
    
    Change-Id: I992242b7c990c24318b040e98b6632e3b78b6f63

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index d2d0602..2232710 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2820,21 +2820,21 @@ $(eval $(call gb_Helper_register_jars,OXT,\
 ))
 
 define gb_Jar__use_commons-codec
-$(call gb_Jar_use_jar,$(1),commons-codec-1.6)
+$(call gb_Jar_use_external_jar,$(1),$(OUTDIR)/bin/commons-codec-1.6.jar)
 endef
 define gb_ExternalProject__use_commons-codec
 $(call gb_ExternalProject_use_external_project,$(1),apache_commons_codec)
 endef
 
 define gb_Jar__use_commons-httpclient
-$(call gb_Jar_use_jar,$(1),commons-httpclient-3.1)
+$(call gb_Jar_use_external_jar,$(1),$(OUTDIR)/bin/commons-httpclient-3.1.jar)
 endef
 define gb_ExternalProject__use_commons-httpclient
 $(call gb_ExternalProject_use_external_project,$(1),apache_commons_httpclient)
 endef
 
 define gb_Jar__use_commons-lang
-$(call gb_Jar_use_jar,$(1),commons-lang-2.4)
+$(call gb_Jar_use_external_jar,$(1),$(OUTDIR)/bin/commons-lang-2.4.jar)
 endef
 define gb_ExternalProject__use_commons-lang
 $(call gb_ExternalProject_use_external_project,$(1),apache_commons_lang)
diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk
index cef34e8..b71c9dc 100644
--- a/solenv/gbuild/Jar.mk
+++ b/solenv/gbuild/Jar.mk
@@ -217,6 +217,13 @@ $(call gb_Jar_add_manifest_classpath,$(1),$(call gb_Helper_make_url,$(2)))
 
 endef
 
+define gb_Jar_use_external_jar
+$(call gb_JavaClassSet_use_system_jar,$(call gb_Jar_get_classsetname,$(1)),$(2))
+$(call gb_Jar_add_manifest_classpath,$(1),$(notdir $(2)))
+$(call gb_Jar_get_target,$(1)) : $(2)
+
+endef
+
 define gb_Jar_add_jars
 $$(call gb_Output_error,\
  gb_Jar_add_jars: use gb_Jar_use_jars instead.)
commit db23d4b0e3fde9aef91bd333b259092ddea58306
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Oct 24 23:10:27 2013 +0200

    RepositoryExternal: fix layer of de-extensionized Jars
    
    Change-Id: I16b72d7603ff08305fb4f24cf64b0ef74123e146

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 9a138b5..d2d0602 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2810,11 +2810,13 @@ gb_ExternalProject__use_commons-logging :=
 
 else # !SYSTEM_APACHE_COMMONS
 
+$(eval $(call gb_Helper_register_jars,OOO,\
+	commons-logging-1.1.1 \
+))
 $(eval $(call gb_Helper_register_jars,OXT,\
 	commons-codec-1.6 \
 	commons-httpclient-3.1 \
 	commons-lang-2.4 \
-	commons-logging-1.1.1 \
 ))
 
 define gb_Jar__use_commons-codec
@@ -2896,7 +2898,7 @@ endef
 
 else # !SYSTEM_JFREEREPORT
 
-$(eval $(call gb_Helper_register_jars,OXT,\
+$(eval $(call gb_Helper_register_jars,OOO,\
 	flow-engine-0.9.4 \
 	flute-1.1.6 \
 	libbase-1.1.6 \

More information about the Libreoffice-commits mailing list