From 8e602afd1e999e984e18d984a9986324831ac881 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Thu, 24 Oct 2013 21:58:38 +0200 Subject: stop looking for Jar files in solver Change-Id: I4d2a93fa7395354fbf2893df9e254ab39fa365af --- accessibility/CustomTarget_bridge_inc.mk | 3 ++- dbaccess/JunitTest_dbaccess_complex.mk | 1 + desktop/Extension_test-passive.mk | 2 +- languagetool/ExternalProject_languagetool.mk | 8 ++++---- nlpsolver/Extension_nlpsolver.mk | 4 ++-- odk/CustomTarget_javadoc.mk | 5 +++-- scripting/Package_java_jars.mk | 2 +- smoketest/Extension_TestExtension.mk | 2 +- svl/JunitTest_svl_complex.mk | 1 + swext/Extension_wiki-publisher.mk | 2 +- testtools/CustomTarget_bridgetest.mk | 4 ++-- unotest/Jar_test.mk | 6 +++--- 12 files changed, 22 insertions(+), 18 deletions(-) diff --git a/accessibility/CustomTarget_bridge_inc.mk b/accessibility/CustomTarget_bridge_inc.mk index db1527478686..8160e6a8c13d 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 5bd2f61a4e3f..e3f2c00a5995 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 dbd03cf313d4..9d235b6f03dd 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 1035bb612c08..0afba90d5f4f 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 5ca449e138ed..1dd3c75d2b49 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 5527fe3332f8..c5e3e67e2ae8 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 bb2fc38604fa..9d2670b7e3f6 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 8644a73784e3..83ab2517fa78 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 531c1df93191..765404236dc3 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 26d6a208a386..7dc713c6ae2e 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 d80e6096e6da..2c18eea801c0 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 714e8535e06b..cc5fde435c7b 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,\ -- cgit v1.2.3