strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ct2n: use a Zip target after all, because...

Browse source 
... the ExtensionTarget requires the description.xml to have a
translation in the --with-lang case.

Change-Id: I155e47d8a44590995ffcd63cb9ac8f02822a82e9
This commit is contained in:
Michael Stahl 2012-10-25 00:19:30 +02:00
parent f5e2af01af
commit ca284bb746
5 changed files with 11 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
ct2n/Extension_ct2n.mk
View file

@ -1,55 +0,0 @@
# -*- 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/.
#
$(eval $(call gb_Extension_Extension,ConvertTextToNumber,\
$(call gb_UnpackedTarball_get_dir,ConvertTextToNumber),nodefaults))
CT2N_DIR := $(call gb_UnpackedTarball_get_dir,ConvertTextToNumber)
$(eval $(call gb_Extension_use_unpacked,ConvertTextToNumber,ConvertTextToNumber))
# we have our own LICENSE file; force using it instead of the default one
$(call gb_Extension_set_license,ConvertTextToNumber,$(CT2N_DIR)/registration/COPYING)
$(eval $(call gb_Extension_add_files,ConvertTextToNumber,,\
$(CT2N_DIR)/Addons.xcu \
))
$(eval $(call gb_Extension_add_files,ConvertTextToNumber,CT2N,\
$(CT2N_DIR)/CT2N/MainCode.xba \
$(CT2N_DIR)/CT2N/ToClipbord.xba \
$(CT2N_DIR)/CT2N/Language.xba \
$(CT2N_DIR)/CT2N/dialog.xlb \
$(CT2N_DIR)/CT2N/dlgCode.xba \
$(CT2N_DIR)/CT2N/script.xlb \
$(CT2N_DIR)/CT2N/dlgCT2N.xdl \
$(CT2N_DIR)/CT2N/UserSettings.xba \
))
$(eval $(call gb_Extension_add_files,ConvertTextToNumber,Office/UI,\
$(CT2N_DIR)/Office/UI/BaseWindowState.xcu \
$(CT2N_DIR)/Office/UI/ImpressWindowState.xcu \
$(CT2N_DIR)/Office/UI/StartModuleWindowState.xcu \
$(CT2N_DIR)/Office/UI/BasicIDEWindowState.xcu \
$(CT2N_DIR)/Office/UI/CalcWindowState.xcu \
$(CT2N_DIR)/Office/UI/WriterWindowState.xcu \
$(CT2N_DIR)/Office/UI/DrawWindowState.xcu \
$(CT2N_DIR)/Office/UI/MathWindowState.xcu \
))
$(eval $(call gb_Extension_add_files,ConvertTextToNumber,icons,\
$(CT2N_DIR)/icons/image1_26.bmp \
$(CT2N_DIR)/icons/image1_16.bmp \
))
$(eval $(call gb_Extension_add_files,ConvertTextToNumber,pkg-desc,\
$(CT2N_DIR)/pkg-desc/pkg-description.txt \
))
# vim: set shiftwidth=4 tabstop=4 noexpandtab:

2
ct2n/Module_ct2n.mk
View file

@ -13,7 +13,7 @@ ifneq (,$(filter CT2N,$(BUILD_TYPE)))
$(eval $(call gb_Module_add_targets,ConvertTextToNumber,\
UnpackedTarball_ct2n \
Extension_ct2n \
Zip_ct2n \
))
endif

2
ct2n/UnpackedTarball_ct2n.mk
View file

@ -28,6 +28,4 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,ConvertTextToNumber,\
Office/UI/WriterWindowState.xcu \
))
$(eval $(call gb_UnpackedTarball_mark_output_file,ConvertTextToNumber,description.xml))
# vim: set noet sw=4 ts=4:

8
ct2n/Zip_ct2n.mk
View file

@ -7,11 +7,9 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
$(eval $(call gb_Zip_Zip,ct2n,$(call gb_UnpackedTarball_get_dir,ct2n)))
$(eval $(call gb_Zip_Zip,ct2n,$(call gb_UnpackedTarball_get_dir,ConvertTextToNumber)))
$(eval $(call gb_Zip_add_dependencies,ct2n,\
$(call gb_UnpackedTarball_get_target,ct2n) \
))
$(eval $(call gb_Zip_use_unpacked,ct2n,ConvertTextToNumber))
$(eval $(call gb_Zip_add_files,ct2n,\
Addons.xcu \
@ -46,6 +44,8 @@ $(eval $(call gb_Zip_add_files,ct2n,\
registration/COPYING \
))
# UGLY: the Zip target always has .zip suffix, so copy the file to .oxt here...
$(call gb_Zip_get_final_target,ct2n) : $(OUTDIR)/bin/ConvertTextToNumber.oxt
$(call gb_Zip_get_clean_target,ct2n) : Clean_ConvertTextToNumber_oxt

6
solenv/gbuild/Zip.mk
View file

@ -128,4 +128,10 @@ $(call gb_Zip_get_target,$(1)) : gb_Zip_ZIPCOMMAND += $(2)
endef
define gb_Zip_use_unpacked
$(call gb_Zip__get_preparation_target,$(1)) \
:| $(call gb_UnpackedTarball_get_final_target,$(2))
endef
# vim: set noet sw=4 ts=4: