testtools/CustomTarget_bridgetest_climaker.mk | 6 ++---- unoil/CustomTarget_climaker.mk | 7 ++++--- 2 files changed, 6 insertions(+), 7 deletions(-)
New commits: commit ae75a0dd0b687242302ff2ad2369f7a5edaf09f3 Author: Stephan Bergmann <[email protected]> Date: Wed Apr 24 18:56:34 2013 +0200 More "Let climaker work on *.rdb.oldformat for now" ...also, the use of double use of udkapi.rdb in climaker call in testtools/CustomTarget_bridgetest_climaker.mk looked fishy. Change-Id: I8be22b184740d65e567df65bae51fe18066be102 diff --git a/testtools/CustomTarget_bridgetest_climaker.mk b/testtools/CustomTarget_bridgetest_climaker.mk index 19086d2..469e698 100644 --- a/testtools/CustomTarget_bridgetest_climaker.mk +++ b/testtools/CustomTarget_bridgetest_climaker.mk @@ -40,9 +40,7 @@ $(testtools_CLIDIR)/cli_types_bridgetest.dll : \ $(call gb_Helper_abbreviate_dirs, \ $(call gb_Helper_execute,climaker) \ $(if $(filter -s,$(MAKEFLAGS)),,--verbose) \ - --out $@ \ - -X $(call gb_UnoApiTarget_get_target,udkapi) \ - -r $(OUTDIR)/bin/cli_uretypes.dll \ - $< > /dev/null) + --out $@ -r $(OUTDIR)/bin/cli_uretypes.dll \ + $(call gb_UnoApiTarget_get_target,udkapi).oldformat > /dev/null) # vim:set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/unoil/CustomTarget_climaker.mk b/unoil/CustomTarget_climaker.mk index 990ed26..9d1ef46 100644 --- a/unoil/CustomTarget_climaker.mk +++ b/unoil/CustomTarget_climaker.mk @@ -19,7 +19,8 @@ $(call gb_CustomTarget_get_target,unoil/climaker) : \ $(unoil_CLIDIR)/$(CLI_OOOTYPES_POLICY_ASSEMBLY).dll $(unoil_CLIDIR)/cli_oootypes.dll : $(SRCDIR)/unoil/climaker/version.txt \ - $(OUTDIR)/bin/offapi.rdb $(OUTDIR)/bin/udkapi.rdb \ + $(call gb_UnoApiTarget_get_target,offapi) \ + $(call gb_UnoApiTarget_get_target,udkapi) \ $(OUTDIR)/bin/cliuno.snk $(OUTDIR)/bin/cli_uretypes.dll \ $(call gb_Executable_get_runtime_dependencies,climaker) \ | $(unoil_CLIDIR)/.dir @@ -31,10 +32,10 @@ $(unoil_CLIDIR)/cli_oootypes.dll : $(SRCDIR)/unoil/climaker/version.txt \ --assembly-version $(CLI_OOOTYPES_NEW_VERSION) \ --assembly-company "LibreOffice" \ --assembly-description "This assembly contains metadata for the LibreOffice API." \ - -X $(OUTDIR)/bin/udkapi.rdb \ + -X $(call gb_UnoApiTarget_get_target,udkapi).oldformat \ -r $(OUTDIR)/bin/cli_uretypes.dll \ --keyfile $(OUTDIR)/bin/cliuno.snk \ - $(OUTDIR)/bin/offapi.rdb) > /dev/null) + $(call gb_UnoApiTarget_get_target,offapi).oldformat) > /dev/null) $(unoil_CLIDIR)/cli_oootypes.config : \ $(SRCDIR)/unoil/climaker/cli_oootypes_config \ _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
