Kaydet (Commit) ab74a830 authored tarafından Michael Stahl's avatar Michael Stahl

unoil: build cli_oootypes.dll via CliUnoApi

Change-Id: I9f6a410515106941c4848edafaffaeacbc27b125
üst 968c735a
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
# thoese are hard-coded to URE for now since there are so few of them... # thoese are hard-coded to URE for now since there are so few of them...
gb_CliLibrary_get_target = $(INSTROOT)/$(LIBO_URE_LIB_FOLDER)/$(1)$(gb_CliLibrary_EXT) gb_CliLibrary_get_target = $(INSTROOT)/$(LIBO_URE_LIB_FOLDER)/$(1)$(gb_CliLibrary_EXT)
gb_CliNativeLibrary_get_target = $(INSTROOT)/$(LIBO_URE_LIB_FOLDER)/$(1)$(gb_CliNativeLibrary_EXT) gb_CliNativeLibrary_get_target = $(INSTROOT)/$(LIBO_URE_LIB_FOLDER)/$(1)$(gb_CliNativeLibrary_EXT)
gb_CliUnoApi_get_target = $(INSTROOT)/$(LIBO_URE_LIB_FOLDER)/$(1)$(gb_CliUnoApi_EXT) gb_CliUnoApi_get_target = $(INSTROOT)/$(if $(filter cli_uretypes,$(1)),$(LIBO_URE_LIB_FOLDER),$(LIBO_LIB_FOLDER))/$(1)$(gb_CliUnoApi_EXT)
gb_PackagePart_get_destinations = \ gb_PackagePart_get_destinations = \
$(INSTDIR) \ $(INSTDIR) \
$(OUTDIR)/bin \ $(OUTDIR)/bin \
......
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# #
# This file is part of the LibreOffice project. # This file is part of the LibreOffice project.
...@@ -7,10 +8,22 @@ ...@@ -7,10 +8,22 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
# #
$(eval $(call gb_Package_Package,unoil_climaker,$(WORKDIR)/CustomTarget/unoil/climaker)) include $(SRCDIR)/unoil/climaker/version.txt
$(eval $(call gb_CliUnoApi_CliUnoApi,cli_oootypes))
$(eval $(call gb_CliUnoApi_set_assembly_version,cli_oootypes,$(CLI_OOOTYPES_NEW_VERSION)))
$(eval $(call gb_CliUnoApi_set_configfile,cli_oootypes,unoil/climaker/cli_oootypes_config))
$(eval $(call gb_CliUnoApi_set_keyfile,cli_oootypes,$(SRCDIR)/cli_ure/source/cliuno.snk))
$(eval $(call gb_CliUnoApi_set_policy,cli_oootypes,$(CLI_OOOTYPES_POLICY_ASSEMBLY),$(CLI_OOOTYPES_POLICY_VERSION)))
$(eval $(call gb_CliUnoApi_wrap_api,cli_oootypes,offapi))
$(eval $(call gb_CliUnoApi_use_api,cli_oootypes,udkapi))
$(eval $(call gb_Package_add_file,unoil_climaker,bin/cli_oootypes.config,cli_oootypes.config)) $(eval $(call gb_CliUnoApi_use_assembly,cli_oootypes,cli_uretypes))
$(eval $(call gb_Package_add_file,unoil_climaker,bin/cli_oootypes.dll,cli_oootypes.dll))
$(eval $(call gb_Package_add_file,unoil_climaker,bin/policy.1.0.cli_oootypes.dll,policy.1.0.cli_oootypes.dll))
# vim:set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#
# This file is part of the LibreOffice project.
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
include $(SRCDIR)/unoil/climaker/version.txt
$(eval $(call gb_CustomTarget_CustomTarget,unoil/climaker))
unoil_CLIDIR := $(call gb_CustomTarget_get_workdir,unoil/climaker)
$(call gb_CustomTarget_get_target,unoil/climaker) : \
$(unoil_CLIDIR)/cli_oootypes.dll \
$(unoil_CLIDIR)/cli_oootypes.config \
$(unoil_CLIDIR)/$(CLI_OOOTYPES_POLICY_ASSEMBLY).dll
$(unoil_CLIDIR)/cli_oootypes.dll : $(SRCDIR)/unoil/climaker/version.txt \
$(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
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CLM,1)
$(call gb_Helper_abbreviate_dirs, \
$(call gb_Helper_execute,climaker \
$(if $(filter -s,$(MAKEFLAGS)),,--verbose) \
--out $@ \
--assembly-version $(CLI_OOOTYPES_NEW_VERSION) \
--assembly-company "LibreOffice" \
--assembly-description "This assembly contains metadata for the LibreOffice API." \
-X $(call gb_UnoApiTarget_get_target,udkapi) \
-r $(OUTDIR)/bin/cli_uretypes.dll \
--keyfile $(OUTDIR)/bin/cliuno.snk \
$(call gb_UnoApiTarget_get_target,offapi)) > /dev/null)
$(unoil_CLIDIR)/cli_oootypes.config : \
$(SRCDIR)/unoil/climaker/cli_oootypes_config \
$(SRCDIR)/unoil/climaker/version.txt | $(unoil_CLIDIR)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,1)
$(call gb_Helper_abbreviate_dirs, \
perl $(SRCDIR)/solenv/bin/clipatchconfig.pl $^ $@)
$(unoil_CLIDIR)/$(CLI_OOOTYPES_POLICY_ASSEMBLY).dll : \
$(unoil_CLIDIR)/cli_oootypes.config \
$(unoil_CLIDIR)/cli_oootypes.dll $(OUTDIR)/bin/cliuno.snk
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),AL ,1)
$(call gb_Helper_abbreviate_dirs, \
al -out:$@ \
-version:$(CLI_OOOTYPES_POLICY_VERSION) \
-keyfile:$(OUTDIR)/bin/cliuno.snk \
-link:$<)
# vim:set shiftwidth=4 tabstop=4 noexpandtab:
...@@ -22,8 +22,7 @@ endif ...@@ -22,8 +22,7 @@ endif
ifeq ($(COM),MSC) ifeq ($(COM),MSC)
$(eval $(call gb_Module_add_targets,unoil,\ $(eval $(call gb_Module_add_targets,unoil,\
CustomTarget_climaker \ CliUnoApi_oootypes \
Package_climaker \
)) ))
endif endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment