mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More "Let climaker work on *.rdb.oldformat for now"

Browse Source 
...also, the use of double use of udkapi.rdb in climaker call in
testtools/CustomTarget_bridgetest_climaker.mk looked fishy.

Change-Id: I8be22b184740d65e567df65bae51fe18066be102
This commit is contained in:
Stephan Bergmann
2013-04-24 18:56:34 +02:00
parent 82b1e07f62
commit ae75a0dd0b
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
testtools/CustomTarget_bridgetest_climaker.mk
View File

@@ -40,9 +40,7 @@ $(testtools_CLIDIR)/cli_types_bridgetest.dll : \
$(call gb_Helper_abbreviate_dirs, \ $(call gb_Helper_abbreviate_dirs, \
$(call gb_Helper_execute,climaker) \ $(call gb_Helper_execute,climaker) \
$(if $(filter -s,$(MAKEFLAGS)),,--verbose) \ $(if $(filter -s,$(MAKEFLAGS)),,--verbose) \
--out $@ \ --out $@ -r $(OUTDIR)/bin/cli_uretypes.dll \
-X $(call gb_UnoApiTarget_get_target,udkapi) \ $(call gb_UnoApiTarget_get_target,udkapi).oldformat > /dev/null)
-r $(OUTDIR)/bin/cli_uretypes.dll \
$< > /dev/null)
# vim:set shiftwidth=4 tabstop=4 noexpandtab: # vim:set shiftwidth=4 tabstop=4 noexpandtab:

7
unoil/CustomTarget_climaker.mk
View File

@@ -19,7 +19,8 @@ $(call gb_CustomTarget_get_target,unoil/climaker) : \
$(unoil_CLIDIR)/$(CLI_OOOTYPES_POLICY_ASSEMBLY).dll $(unoil_CLIDIR)/$(CLI_OOOTYPES_POLICY_ASSEMBLY).dll
$(unoil_CLIDIR)/cli_oootypes.dll : $(SRCDIR)/unoil/climaker/version.txt \ $(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 \ $(OUTDIR)/bin/cliuno.snk $(OUTDIR)/bin/cli_uretypes.dll \
$(call gb_Executable_get_runtime_dependencies,climaker) \ $(call gb_Executable_get_runtime_dependencies,climaker) \
| $(unoil_CLIDIR)/.dir | $(unoil_CLIDIR)/.dir
@@ -31,10 +32,10 @@ $(unoil_CLIDIR)/cli_oootypes.dll : $(SRCDIR)/unoil/climaker/version.txt \
--assembly-version $(CLI_OOOTYPES_NEW_VERSION) \ --assembly-version $(CLI_OOOTYPES_NEW_VERSION) \
--assembly-company "LibreOffice" \ --assembly-company "LibreOffice" \
--assembly-description "This assembly contains metadata for the LibreOffice API." \ --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 \ -r $(OUTDIR)/bin/cli_uretypes.dll \
--keyfile $(OUTDIR)/bin/cliuno.snk \ --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 : \ $(unoil_CLIDIR)/cli_oootypes.config : \
$(SRCDIR)/unoil/climaker/cli_oootypes_config \ $(SRCDIR)/unoil/climaker/cli_oootypes_config \