You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by da...@apache.org on 2016/03/09 19:21:32 UTC
svn commit: r1734293 - in /openoffice/branches/gbuild-reintegration: ./
main/comphelper/ main/framework/ main/linguistic/ main/sfx2/
main/solenv/gbuild/ main/sot/ main/starmath/ main/svl/ main/svtools/
main/svx/ main/sw/ main/toolkit/ main/unotools/ ma...
Author: damjan
Date: Wed Mar 9 18:21:31 2016
New Revision: 1734293
URL: http://svn.apache.org/viewvc?rev=1734293&view=rev
Log:
Merge from branches/gbuild:
r1409546: gnumake4: #i117340#: JavaClassSet: replace broken multi-repo support
with explicit constructor parameter.
r1409547: gnumake4: #i117340#: JavaClassSet: adapt users
BUILDS
Also fixed a JUnit test in writerfilter that was breaking the build.
Build updates by: me
Modified:
openoffice/branches/gbuild-reintegration/ (props changed)
openoffice/branches/gbuild-reintegration/main/comphelper/JunitTest_comphelper_complex.mk
openoffice/branches/gbuild-reintegration/main/framework/JunitTest_framework_complex.mk
openoffice/branches/gbuild-reintegration/main/framework/JunitTest_framework_unoapi.mk
openoffice/branches/gbuild-reintegration/main/linguistic/JunitTest_linguistic_complex.mk
openoffice/branches/gbuild-reintegration/main/linguistic/JunitTest_linguistic_unoapi.mk
openoffice/branches/gbuild-reintegration/main/sfx2/JunitTest_sfx2_complex.mk
openoffice/branches/gbuild-reintegration/main/sfx2/JunitTest_sfx2_unoapi.mk
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/Jar.mk
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/JavaClassSet.mk
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/JunitTest.mk
openoffice/branches/gbuild-reintegration/main/sot/JunitTest_sot_complex.mk
openoffice/branches/gbuild-reintegration/main/starmath/JunitTest_sm_unoapi.mk
openoffice/branches/gbuild-reintegration/main/svl/JunitTest_svl_complex.mk
openoffice/branches/gbuild-reintegration/main/svtools/JunitTest_svtools_unoapi.mk
openoffice/branches/gbuild-reintegration/main/svx/JunitTest_svx_unoapi.mk
openoffice/branches/gbuild-reintegration/main/sw/JunitTest_sw_complex.mk
openoffice/branches/gbuild-reintegration/main/sw/JunitTest_sw_unoapi.mk
openoffice/branches/gbuild-reintegration/main/toolkit/JunitTest_toolkit_complex.mk
openoffice/branches/gbuild-reintegration/main/toolkit/JunitTest_toolkit_unoapi.mk
openoffice/branches/gbuild-reintegration/main/unotools/JunitTest_unotools_complex.mk
openoffice/branches/gbuild-reintegration/main/unoxml/JunitTest_unordf_complex.mk
openoffice/branches/gbuild-reintegration/main/unoxml/JunitTest_unoxml_complex.mk
openoffice/branches/gbuild-reintegration/main/wizards/Jar_agenda.mk
openoffice/branches/gbuild-reintegration/main/wizards/Jar_commonwizards.mk
openoffice/branches/gbuild-reintegration/main/wizards/Jar_fax.mk
openoffice/branches/gbuild-reintegration/main/wizards/Jar_form.mk
openoffice/branches/gbuild-reintegration/main/wizards/Jar_letter.mk
openoffice/branches/gbuild-reintegration/main/wizards/Jar_query.mk
openoffice/branches/gbuild-reintegration/main/wizards/Jar_report.mk
openoffice/branches/gbuild-reintegration/main/wizards/Jar_reportbuilder.mk
openoffice/branches/gbuild-reintegration/main/wizards/Jar_table.mk
openoffice/branches/gbuild-reintegration/main/wizards/Jar_web.mk
openoffice/branches/gbuild-reintegration/main/writerfilter/JunitTest_writerfilter_complex.mk
openoffice/branches/gbuild-reintegration/main/xmloff/JunitTest_xmloff_unoapi.mk
Propchange: openoffice/branches/gbuild-reintegration/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 18:21:31 2016
@@ -1,4 +1,4 @@
-/incubator/ooo/branches/gbuild:1409313-1409495,1409499-1409510,1409513,1409515,1409523,1409526,1409529-1409530,1409538-1409541,1409543-1409544
+/incubator/ooo/branches/gbuild:1409313-1409495,1409499-1409510,1409513,1409515,1409523,1409526,1409529-1409530,1409538-1409541,1409543-1409544,1409546-1409547
/openoffice/branches/AOO400:1503684
/openoffice/branches/AOO410:1572480,1573601,1583349,1583635,1583666
/openoffice/branches/alg_writerframes:1556289-1579189
Modified: openoffice/branches/gbuild-reintegration/main/comphelper/JunitTest_comphelper_complex.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/comphelper/JunitTest_comphelper_complex.mk?rev=1734293&r1=1734292&r2=1734293&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/comphelper/JunitTest_comphelper_complex.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/comphelper/JunitTest_comphelper_complex.mk Wed Mar 9 18:21:31 2016
@@ -21,7 +21,7 @@
-$(eval $(call gb_JunitTest_JunitTest,comphelper_complex))
+$(eval $(call gb_JunitTest_JunitTest,comphelper_complex,SRCDIR))
$(eval $(call gb_JunitTest_add_sourcefiles,comphelper_complex,\
comphelper/qa/complex/comphelper/Map \
Modified: openoffice/branches/gbuild-reintegration/main/framework/JunitTest_framework_complex.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/framework/JunitTest_framework_complex.mk?rev=1734293&r1=1734292&r2=1734293&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/framework/JunitTest_framework_complex.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/framework/JunitTest_framework_complex.mk Wed Mar 9 18:21:31 2016
@@ -21,7 +21,7 @@
-$(eval $(call gb_JunitTest_JunitTest,framework_complex))
+$(eval $(call gb_JunitTest_JunitTest,framework_complex,SRCDIR))
$(eval $(call gb_JunitTest_set_defs,framework_complex,\
$$(DEFS) \
Modified: openoffice/branches/gbuild-reintegration/main/framework/JunitTest_framework_unoapi.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/framework/JunitTest_framework_unoapi.mk?rev=1734293&r1=1734292&r2=1734293&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/framework/JunitTest_framework_unoapi.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/framework/JunitTest_framework_unoapi.mk Wed Mar 9 18:21:31 2016
@@ -21,7 +21,7 @@
-$(eval $(call gb_JunitTest_JunitTest,framework_unoapi))
+$(eval $(call gb_JunitTest_JunitTest,framework_unoapi,SRCDIR))
$(eval $(call gb_JunitTest_set_defs,framework_unoapi,\
$$(DEFS) \
Modified: openoffice/branches/gbuild-reintegration/main/linguistic/JunitTest_linguistic_complex.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/linguistic/JunitTest_linguistic_complex.mk?rev=1734293&r1=1734292&r2=1734293&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/linguistic/JunitTest_linguistic_complex.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/linguistic/JunitTest_linguistic_complex.mk Wed Mar 9 18:21:31 2016
@@ -25,7 +25,7 @@
#
#*************************************************************************
-$(eval $(call gb_JunitTest_JunitTest,linguistic_complex))
+$(eval $(call gb_JunitTest_JunitTest,linguistic_complex,SRCDIR))
$(eval $(call gb_JunitTest_set_defs,linguistic_complex,\
$$(DEFS) \
Modified: openoffice/branches/gbuild-reintegration/main/linguistic/JunitTest_linguistic_unoapi.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/linguistic/JunitTest_linguistic_unoapi.mk?rev=1734293&r1=1734292&r2=1734293&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/linguistic/JunitTest_linguistic_unoapi.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/linguistic/JunitTest_linguistic_unoapi.mk Wed Mar 9 18:21:31 2016
@@ -25,7 +25,7 @@
#
#*************************************************************************
-$(eval $(call gb_JunitTest_JunitTest,linguistic_unoapi))
+$(eval $(call gb_JunitTest_JunitTest,linguistic_unoapi,SRCDIR))
$(eval $(call gb_JunitTest_set_defs,linguistic_unoapi,\
$$(DEFS) \
Modified: openoffice/branches/gbuild-reintegration/main/sfx2/JunitTest_sfx2_complex.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sfx2/JunitTest_sfx2_complex.mk?rev=1734293&r1=1734292&r2=1734293&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sfx2/JunitTest_sfx2_complex.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/sfx2/JunitTest_sfx2_complex.mk Wed Mar 9 18:21:31 2016
@@ -21,7 +21,7 @@
-$(eval $(call gb_JunitTest_JunitTest,sfx2_complex))
+$(eval $(call gb_JunitTest_JunitTest,sfx2_complex,SRCDIR))
$(eval $(call gb_JunitTest_set_defs,sfx2_complex,\
$$(DEFS) \
Modified: openoffice/branches/gbuild-reintegration/main/sfx2/JunitTest_sfx2_unoapi.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sfx2/JunitTest_sfx2_unoapi.mk?rev=1734293&r1=1734292&r2=1734293&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sfx2/JunitTest_sfx2_unoapi.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/sfx2/JunitTest_sfx2_unoapi.mk Wed Mar 9 18:21:31 2016
@@ -21,7 +21,7 @@
-$(eval $(call gb_JunitTest_JunitTest,sfx2_unoapi))
+$(eval $(call gb_JunitTest_JunitTest,sfx2_unoapi,SRCDIR))
$(eval $(call gb_JunitTest_set_defs,sfx2_unoapi,\
$$(DEFS) \
Modified: openoffice/branches/gbuild-reintegration/main/solenv/gbuild/Jar.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/solenv/gbuild/Jar.mk?rev=1734293&r1=1734292&r2=1734293&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/solenv/gbuild/Jar.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/solenv/gbuild/Jar.mk Wed Mar 9 18:21:31 2016
@@ -81,7 +81,7 @@ $(call gb_Jar_get_target,$(1)) : CLASSPA
$(call gb_Jar_get_target,$(1)) : MANIFEST :=
$(call gb_Jar_get_target,$(1)) : JARCLASSPATH :=
$(call gb_Jar_get_target,$(1)) : PACKAGEROOTS :=
-$(call gb_JavaClassSet_JavaClassSet,$(call gb_Jar_get_classsetname,$(1)))
+$(call gb_JavaClassSet_JavaClassSet,$(call gb_Jar_get_classsetname,$(1)),$(2))
$(eval $(call gb_Module_register_target,$(call gb_Jar_get_final_target,$(1)),$(call gb_Jar_get_clean_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))
Modified: openoffice/branches/gbuild-reintegration/main/solenv/gbuild/JavaClassSet.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/solenv/gbuild/JavaClassSet.mk?rev=1734293&r1=1734292&r2=1734293&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/solenv/gbuild/JavaClassSet.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/solenv/gbuild/JavaClassSet.mk Wed Mar 9 18:21:31 2016
@@ -34,36 +34,32 @@ $(call gb_Helper_abbreviate_dirs_native,
endef
-define gb_JavaClassSet__rules
-$$(call gb_JavaClassSet_get_repo_target,$(1),%) :
- $$(call gb_JavaClassSet__command,$$@,$$*,$$?,$$^)
-
-$$(call gb_JavaClassSet_get_target,%) : $$(call gb_JavaClassSet_get_repo_target,$(1),%)
- $$(call gb_Output_announce,$$*,$$(true),JCS,3)
- $$(call gb_Helper_abbreviate_dirs,\
- touch $$@)
-
-endef
+$(call gb_JavaClassSet_get_target,%) :
+ $(call gb_Output_announce,$*,$(true),JCS,3)
+ $(call gb_JavaClassSet__command,$@,$*,$?,$^)
$(call gb_JavaClassSet_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),JCS,3)
$(call gb_Helper_abbreviate_dirs,\
rm -rf $(dir $(call gb_JavaClassSet_get_target,$*)))
-$(foreach reponame,$(gb_JavaClassSet_REPOSITORYNAMES),$(eval $(call gb_JavaClassSet__rules,$(reponame))))
-
# no initialization of scoped variable CLASSPATH as it is "inherited" from controlling instance (e.g. JUnitTest, Jar)
+# UGLY: cannot use target local variable for REPO because it's needed in prereq
define gb_JavaClassSet_JavaClassSet
+$(if $(filter $(2),$(gb_JavaClassSet_REPOSITORYNAMES)),,\
+ $(error JavaClassSet: no or invalid repository given; known repositories: \
+ $(gb_JavaClassSet_REPOSITORYNAMES)))
+gb_JavaClassSet_REPO_$(1) := $(2)
$(call gb_JavaClassSet_get_target,$(1)) : JARDEPS :=
endef
define gb_JavaClassSet__get_sourcefile
-$(1)/$(2).java
+$($(1))/$(2).java
endef
define gb_JavaClassSet_add_sourcefile
-$(foreach reponame,$(gb_JavaClassSet_REPOSITORYNAMES),\
- $(eval $(call gb_JavaClassSet_get_repo_target,$(reponame),$(1)) : $(call gb_JavaClassSet__get_sourcefile,$($(reponame)),$(2))))
+$(eval $(call gb_JavaClassSet_get_target,$(1)) : \
+ $(call gb_JavaClassSet__get_sourcefile,$(gb_JavaClassSet_REPO_$(1)),$(2)))
endef
define gb_JavaClassSet_add_sourcefiles
@@ -77,9 +73,8 @@ endef
# problem: currently we can't get these dependencies to work
# build order dependency is a hack to get these prerequisites out of the way in the build command
define gb_JavaClassSet_add_jar
-$(foreach reponame,$(gb_JavaClassSet_REPOSITORYNAMES),\
-$(eval $(call gb_JavaClassSet_get_repo_target,$(reponame),$(1)) : $(2))
-$(eval $(call gb_JavaClassSet_get_repo_target,$(reponame),$(1)) : JARDEPS += $(2)))
+$(eval $(call gb_JavaClassSet_get_target,$(1)) : $(2))
+$(eval $(call gb_JavaClassSet_get_target,$(1)) : JARDEPS += $(2))
endef
Modified: openoffice/branches/gbuild-reintegration/main/solenv/gbuild/JunitTest.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/solenv/gbuild/JunitTest.mk?rev=1734293&r1=1734292&r2=1734293&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/solenv/gbuild/JunitTest.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/solenv/gbuild/JunitTest.mk Wed Mar 9 18:21:31 2016
@@ -50,7 +50,7 @@ $(call gb_JunitTest_get_target,$(1)) : C
$(call gb_JunitTest_get_target,$(1)) : CLASSES :=
$(call gb_JunitTest_JunitTest_platform,$(1))
-$(call gb_JavaClassSet_JavaClassSet,$(call gb_JunitTest_get_classsetname,$(1)))
+$(call gb_JavaClassSet_JavaClassSet,$(call gb_JunitTest_get_classsetname,$(1)),$(2))
$(call gb_JunitTest_get_target,$(1)) : $(call gb_JavaClassSet_get_target,$(call gb_JunitTest_get_classsetname,$(1)))
$(eval $(call gb_Module_register_target,$(call gb_JunitTest_get_target,$(1)),$(call gb_JunitTest_get_clean_target,$(1))))
endef
Modified: openoffice/branches/gbuild-reintegration/main/sot/JunitTest_sot_complex.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sot/JunitTest_sot_complex.mk?rev=1734293&r1=1734292&r2=1734293&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sot/JunitTest_sot_complex.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/sot/JunitTest_sot_complex.mk Wed Mar 9 18:21:31 2016
@@ -21,7 +21,7 @@
-$(eval $(call gb_JunitTest_JunitTest,sot_complex))
+$(eval $(call gb_JunitTest_JunitTest,sot_complex,SRCDIR))
$(eval $(call gb_JunitTest_add_sourcefiles,sot_complex,\
sot/qa/complex/olesimplestorage/OLESimpleStorageTest \
Modified: openoffice/branches/gbuild-reintegration/main/starmath/JunitTest_sm_unoapi.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/starmath/JunitTest_sm_unoapi.mk?rev=1734293&r1=1734292&r2=1734293&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/starmath/JunitTest_sm_unoapi.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/starmath/JunitTest_sm_unoapi.mk Wed Mar 9 18:21:31 2016
@@ -25,7 +25,7 @@
#
#*************************************************************************
-$(eval $(call gb_JunitTest_JunitTest,sm_unoapi))
+$(eval $(call gb_JunitTest_JunitTest,sm_unoapi,SRCDIR))
$(eval $(call gb_JunitTest_set_defs,sm_unoapi,\
$$(DEFS) \
Modified: openoffice/branches/gbuild-reintegration/main/svl/JunitTest_svl_complex.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/svl/JunitTest_svl_complex.mk?rev=1734293&r1=1734292&r2=1734293&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/svl/JunitTest_svl_complex.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/svl/JunitTest_svl_complex.mk Wed Mar 9 18:21:31 2016
@@ -21,7 +21,7 @@
-$(eval $(call gb_JunitTest_JunitTest,svl_complex))
+$(eval $(call gb_JunitTest_JunitTest,svl_complex,SRCDIR))
$(eval $(call gb_JunitTest_set_defs,svl_complex,\
$$(DEFS) \
Modified: openoffice/branches/gbuild-reintegration/main/svtools/JunitTest_svtools_unoapi.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/svtools/JunitTest_svtools_unoapi.mk?rev=1734293&r1=1734292&r2=1734293&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/svtools/JunitTest_svtools_unoapi.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/svtools/JunitTest_svtools_unoapi.mk Wed Mar 9 18:21:31 2016
@@ -21,7 +21,7 @@
-$(eval $(call gb_JunitTest_JunitTest,svtools_unoapi))
+$(eval $(call gb_JunitTest_JunitTest,svtools_unoapi,SRCDIR))
$(eval $(call gb_JunitTest_set_defs,svtools_unoapi,\
$$(DEFS) \
Modified: openoffice/branches/gbuild-reintegration/main/svx/JunitTest_svx_unoapi.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/svx/JunitTest_svx_unoapi.mk?rev=1734293&r1=1734292&r2=1734293&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/svx/JunitTest_svx_unoapi.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/svx/JunitTest_svx_unoapi.mk Wed Mar 9 18:21:31 2016
@@ -21,7 +21,7 @@
-$(eval $(call gb_JunitTest_JunitTest,svx_unoapi))
+$(eval $(call gb_JunitTest_JunitTest,svx_unoapi,SRCDIR))
$(eval $(call gb_JunitTest_set_defs,svx_unoapi,\
$$(DEFS) \
Modified: openoffice/branches/gbuild-reintegration/main/sw/JunitTest_sw_complex.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sw/JunitTest_sw_complex.mk?rev=1734293&r1=1734292&r2=1734293&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sw/JunitTest_sw_complex.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/sw/JunitTest_sw_complex.mk Wed Mar 9 18:21:31 2016
@@ -21,7 +21,7 @@
-$(eval $(call gb_JunitTest_JunitTest,sw_complex))
+$(eval $(call gb_JunitTest_JunitTest,sw_complex,SRCDIR))
$(eval $(call gb_JunitTest_set_defs,sw_complex,\
$$(DEFS) \
Modified: openoffice/branches/gbuild-reintegration/main/sw/JunitTest_sw_unoapi.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sw/JunitTest_sw_unoapi.mk?rev=1734293&r1=1734292&r2=1734293&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sw/JunitTest_sw_unoapi.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/sw/JunitTest_sw_unoapi.mk Wed Mar 9 18:21:31 2016
@@ -21,7 +21,7 @@
-$(eval $(call gb_JunitTest_JunitTest,sw_unoapi))
+$(eval $(call gb_JunitTest_JunitTest,sw_unoapi,SRCDIR))
$(eval $(call gb_JunitTest_set_defs,sw_unoapi,\
$$(DEFS) \
Modified: openoffice/branches/gbuild-reintegration/main/toolkit/JunitTest_toolkit_complex.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/toolkit/JunitTest_toolkit_complex.mk?rev=1734293&r1=1734292&r2=1734293&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/toolkit/JunitTest_toolkit_complex.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/toolkit/JunitTest_toolkit_complex.mk Wed Mar 9 18:21:31 2016
@@ -21,7 +21,7 @@
-$(eval $(call gb_JunitTest_JunitTest,toolkit_complex))
+$(eval $(call gb_JunitTest_JunitTest,toolkit_complex,SRCDIR))
$(eval $(call gb_JunitTest_add_jars,toolkit_complex,\
$(OUTDIR)/bin/OOoRunner.jar \
Modified: openoffice/branches/gbuild-reintegration/main/toolkit/JunitTest_toolkit_unoapi.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/toolkit/JunitTest_toolkit_unoapi.mk?rev=1734293&r1=1734292&r2=1734293&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/toolkit/JunitTest_toolkit_unoapi.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/toolkit/JunitTest_toolkit_unoapi.mk Wed Mar 9 18:21:31 2016
@@ -21,7 +21,7 @@
-$(eval $(call gb_JunitTest_JunitTest,toolkit_unoapi))
+$(eval $(call gb_JunitTest_JunitTest,toolkit_unoapi,SRCDIR))
$(eval $(call gb_JunitTest_set_defs,toolkit_unoapi,\
$$(DEFS) \
Modified: openoffice/branches/gbuild-reintegration/main/unotools/JunitTest_unotools_complex.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/unotools/JunitTest_unotools_complex.mk?rev=1734293&r1=1734292&r2=1734293&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/unotools/JunitTest_unotools_complex.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/unotools/JunitTest_unotools_complex.mk Wed Mar 9 18:21:31 2016
@@ -25,7 +25,7 @@
#
#*************************************************************************
-$(eval $(call gb_JunitTest_JunitTest,unotools_complex))
+$(eval $(call gb_JunitTest_JunitTest,unotools_complex,SRCDIR))
$(eval $(call gb_JunitTest_set_defs,unotools_complex,\
$$(DEFS) \
Modified: openoffice/branches/gbuild-reintegration/main/unoxml/JunitTest_unordf_complex.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/unoxml/JunitTest_unordf_complex.mk?rev=1734293&r1=1734292&r2=1734293&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/unoxml/JunitTest_unordf_complex.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/unoxml/JunitTest_unordf_complex.mk Wed Mar 9 18:21:31 2016
@@ -21,7 +21,7 @@
-$(eval $(call gb_JunitTest_JunitTest,unordf_complex))
+$(eval $(call gb_JunitTest_JunitTest,unordf_complex,SRCDIR))
$(eval $(call gb_JunitTest_set_defs,unordf_complex,\
$$(DEFS) \
Modified: openoffice/branches/gbuild-reintegration/main/unoxml/JunitTest_unoxml_complex.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/unoxml/JunitTest_unoxml_complex.mk?rev=1734293&r1=1734292&r2=1734293&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/unoxml/JunitTest_unoxml_complex.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/unoxml/JunitTest_unoxml_complex.mk Wed Mar 9 18:21:31 2016
@@ -21,7 +21,7 @@
-$(eval $(call gb_JunitTest_JunitTest,unoxml_complex))
+$(eval $(call gb_JunitTest_JunitTest,unoxml_complex,SRCDIR))
$(eval $(call gb_JunitTest_set_defs,unoxml_complex,\
$$(DEFS) \
Modified: openoffice/branches/gbuild-reintegration/main/wizards/Jar_agenda.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/wizards/Jar_agenda.mk?rev=1734293&r1=1734292&r2=1734293&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/wizards/Jar_agenda.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/wizards/Jar_agenda.mk Wed Mar 9 18:21:31 2016
@@ -25,7 +25,7 @@
#
#*************************************************************************
-$(eval $(call gb_Jar_Jar,agenda))
+$(eval $(call gb_Jar_Jar,agenda,SRCDIR))
$(eval $(call gb_Jar_add_jars,agenda,\
$(OUTDIR)/bin/ridl.jar \
Modified: openoffice/branches/gbuild-reintegration/main/wizards/Jar_commonwizards.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/wizards/Jar_commonwizards.mk?rev=1734293&r1=1734292&r2=1734293&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/wizards/Jar_commonwizards.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/wizards/Jar_commonwizards.mk Wed Mar 9 18:21:31 2016
@@ -25,7 +25,7 @@
#
#*************************************************************************
-$(eval $(call gb_Jar_Jar,commonwizards))
+$(eval $(call gb_Jar_Jar,commonwizards,SRCDIR))
$(eval $(call gb_Jar_add_jars,commonwizards,\
$(OUTDIR)/bin/ridl.jar \
Modified: openoffice/branches/gbuild-reintegration/main/wizards/Jar_fax.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/wizards/Jar_fax.mk?rev=1734293&r1=1734292&r2=1734293&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/wizards/Jar_fax.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/wizards/Jar_fax.mk Wed Mar 9 18:21:31 2016
@@ -25,7 +25,7 @@
#
#*************************************************************************
-$(eval $(call gb_Jar_Jar,fax))
+$(eval $(call gb_Jar_Jar,fax,SRCDIR))
$(eval $(call gb_Jar_add_jars,fax,\
$(OUTDIR)/bin/ridl.jar \
Modified: openoffice/branches/gbuild-reintegration/main/wizards/Jar_form.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/wizards/Jar_form.mk?rev=1734293&r1=1734292&r2=1734293&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/wizards/Jar_form.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/wizards/Jar_form.mk Wed Mar 9 18:21:31 2016
@@ -25,7 +25,7 @@
#
#*************************************************************************
-$(eval $(call gb_Jar_Jar,form))
+$(eval $(call gb_Jar_Jar,form,SRCDIR))
$(eval $(call gb_Jar_add_jars,form,\
$(OUTDIR)/bin/ridl.jar \
Modified: openoffice/branches/gbuild-reintegration/main/wizards/Jar_letter.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/wizards/Jar_letter.mk?rev=1734293&r1=1734292&r2=1734293&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/wizards/Jar_letter.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/wizards/Jar_letter.mk Wed Mar 9 18:21:31 2016
@@ -25,7 +25,7 @@
#
#*************************************************************************
-$(eval $(call gb_Jar_Jar,letter))
+$(eval $(call gb_Jar_Jar,letter,SRCDIR))
$(eval $(call gb_Jar_add_jars,letter,\
$(OUTDIR)/bin/ridl.jar \
Modified: openoffice/branches/gbuild-reintegration/main/wizards/Jar_query.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/wizards/Jar_query.mk?rev=1734293&r1=1734292&r2=1734293&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/wizards/Jar_query.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/wizards/Jar_query.mk Wed Mar 9 18:21:31 2016
@@ -25,7 +25,7 @@
#
#*************************************************************************
-$(eval $(call gb_Jar_Jar,query))
+$(eval $(call gb_Jar_Jar,query,SRCDIR))
$(eval $(call gb_Jar_add_jars,query,\
$(OUTDIR)/bin/ridl.jar \
Modified: openoffice/branches/gbuild-reintegration/main/wizards/Jar_report.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/wizards/Jar_report.mk?rev=1734293&r1=1734292&r2=1734293&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/wizards/Jar_report.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/wizards/Jar_report.mk Wed Mar 9 18:21:31 2016
@@ -25,7 +25,7 @@
#
#*************************************************************************
-$(eval $(call gb_Jar_Jar,report))
+$(eval $(call gb_Jar_Jar,report,SRCDIR))
$(eval $(call gb_Jar_add_jars,report,\
$(OUTDIR)/bin/ridl.jar \
Modified: openoffice/branches/gbuild-reintegration/main/wizards/Jar_reportbuilder.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/wizards/Jar_reportbuilder.mk?rev=1734293&r1=1734292&r2=1734293&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/wizards/Jar_reportbuilder.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/wizards/Jar_reportbuilder.mk Wed Mar 9 18:21:31 2016
@@ -25,7 +25,7 @@
#
#*************************************************************************
-$(eval $(call gb_Jar_Jar,reportbuilderwizard))
+$(eval $(call gb_Jar_Jar,reportbuilderwizard,SRCDIR))
$(eval $(call gb_Jar_add_jars,reportbuilderwizard,\
$(OUTDIR)/bin/ridl.jar \
Modified: openoffice/branches/gbuild-reintegration/main/wizards/Jar_table.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/wizards/Jar_table.mk?rev=1734293&r1=1734292&r2=1734293&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/wizards/Jar_table.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/wizards/Jar_table.mk Wed Mar 9 18:21:31 2016
@@ -25,7 +25,7 @@
#
#*************************************************************************
-$(eval $(call gb_Jar_Jar,table))
+$(eval $(call gb_Jar_Jar,table,SRCDIR))
$(eval $(call gb_Jar_add_jars,table,\
$(OUTDIR)/bin/ridl.jar \
Modified: openoffice/branches/gbuild-reintegration/main/wizards/Jar_web.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/wizards/Jar_web.mk?rev=1734293&r1=1734292&r2=1734293&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/wizards/Jar_web.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/wizards/Jar_web.mk Wed Mar 9 18:21:31 2016
@@ -25,7 +25,7 @@
#
#*************************************************************************
-$(eval $(call gb_Jar_Jar,web))
+$(eval $(call gb_Jar_Jar,web,SRCDIR))
$(eval $(call gb_Jar_add_jars,web,\
$(OUTDIR)/bin/ridl.jar \
Modified: openoffice/branches/gbuild-reintegration/main/writerfilter/JunitTest_writerfilter_complex.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/writerfilter/JunitTest_writerfilter_complex.mk?rev=1734293&r1=1734292&r2=1734293&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/writerfilter/JunitTest_writerfilter_complex.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/writerfilter/JunitTest_writerfilter_complex.mk Wed Mar 9 18:21:31 2016
@@ -25,7 +25,7 @@
#
#*************************************************************************
-$(eval $(call gb_JunitTest_JunitTest,writerfilter_complex))
+$(eval $(call gb_JunitTest_JunitTest,writerfilter_complex,SRCDIR))
$(eval $(call gb_JunitTest_set_defs,writerfilter_complex,\
$$(DEFS) \
Modified: openoffice/branches/gbuild-reintegration/main/xmloff/JunitTest_xmloff_unoapi.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/xmloff/JunitTest_xmloff_unoapi.mk?rev=1734293&r1=1734292&r2=1734293&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/xmloff/JunitTest_xmloff_unoapi.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/xmloff/JunitTest_xmloff_unoapi.mk Wed Mar 9 18:21:31 2016
@@ -21,7 +21,7 @@
-$(eval $(call gb_JunitTest_JunitTest,xmloff_unoapi))
+$(eval $(call gb_JunitTest_JunitTest,xmloff_unoapi,SRCDIR))
$(eval $(call gb_JunitTest_set_defs,xmloff_unoapi,\
$$(DEFS) \