diff options
| author | David Tardon <dtardon@redhat.com> | 2013-04-14 12:21:33 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-04-14 13:52:27 +0200 |
| commit | 25b75577efed9f04f3ea5936aceb66c84e9e4b4e (patch) | |
| tree | 408cc665ecbb6f96a77111f5425685c3f8703dc0 | |
| parent | drop unused macros (diff) | |
| download | core-25b75577efed9f04f3ea5936aceb66c84e9e4b4e.tar.gz core-25b75577efed9f04f3ea5936aceb66c84e9e4b4e.zip | |
install ConvertTextToNumber ext. using filelist
Change-Id: I59c132239a410653c27be569c45b789fcb109898
| -rw-r--r-- | ct2n/ExternalPackage_ct2n.mk (renamed from ct2n/Zip_ct2n.mk) | 27 | ||||
| -rw-r--r-- | ct2n/Module_ct2n.mk | 2 | ||||
| -rw-r--r-- | scp2/source/extensions/file_extensions.scp | 6 |
3 files changed, 9 insertions, 26 deletions
diff --git a/ct2n/Zip_ct2n.mk b/ct2n/ExternalPackage_ct2n.mk index 1ca489c97183..6d2e6b6b39b2 100644 --- a/ct2n/Zip_ct2n.mk +++ b/ct2n/ExternalPackage_ct2n.mk @@ -7,13 +7,14 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Zip_Zip,ct2n,$(call gb_UnpackedTarball_get_dir,ConvertTextToNumber))) +$(eval $(call gb_ExternalPackage_ExternalPackage,ct2n,ConvertTextToNumber)) -$(eval $(call gb_Zip_use_unpacked,ct2n,ConvertTextToNumber)) +$(eval $(call gb_ExternalPackage_set_outdir,ct2n,$(INSTDIR))) -$(eval $(call gb_Zip_add_files,ct2n,\ +$(eval $(call gb_ExternalPackage_use_unpacked,ct2n,ConvertTextToNumber)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files_with_dir,ct2n,share/extensions/ConvertTextToNumber,\ Addons.xcu \ - CT2N \ CT2N/MainCode.xba \ CT2N/ToClipbord.xba \ CT2N/Language.xba \ @@ -22,10 +23,7 @@ $(eval $(call gb_Zip_add_files,ct2n,\ CT2N/script.xlb \ CT2N/dlgCT2N.xdl \ CT2N/UserSettings.xba \ - META-INF \ META-INF/manifest.xml \ - Office \ - Office/UI \ Office/UI/BaseWindowState.xcu \ Office/UI/ImpressWindowState.xcu \ Office/UI/StartModuleWindowState.xcu \ @@ -35,25 +33,10 @@ $(eval $(call gb_Zip_add_files,ct2n,\ Office/UI/DrawWindowState.xcu \ Office/UI/MathWindowState.xcu \ description.xml \ - icons \ icons/image1_26.bmp \ icons/image1_16.bmp \ - pkg-desc \ pkg-desc/pkg-description.txt \ - registration \ 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 - -$(OUTDIR)/bin/ConvertTextToNumber.oxt : $(call gb_Zip_get_target,ct2n) | $(OUTDIR)/bin/.dir - $(call gb_Deliver_deliver,$<,$@) - -.PHONY : Clean_ConvertTextToNumber_oxt -Clean_ConvertTextToNumber_oxt : - rm -f $(OUTDIR)/bin/ConvertTextToNumber.oxt - # vim: set noet sw=4 ts=4: diff --git a/ct2n/Module_ct2n.mk b/ct2n/Module_ct2n.mk index acc9d5f5514e..873f31bbe738 100644 --- a/ct2n/Module_ct2n.mk +++ b/ct2n/Module_ct2n.mk @@ -12,8 +12,8 @@ $(eval $(call gb_Module_Module,ConvertTextToNumber)) ifneq (,$(filter CT2N,$(BUILD_TYPE))) $(eval $(call gb_Module_add_targets,ConvertTextToNumber,\ + ExternalPackage_ct2n \ UnpackedTarball_ct2n \ - Zip_ct2n \ )) endif diff --git a/scp2/source/extensions/file_extensions.scp b/scp2/source/extensions/file_extensions.scp index 936f15a617bb..80843358f783 100644 --- a/scp2/source/extensions/file_extensions.scp +++ b/scp2/source/extensions/file_extensions.scp @@ -78,9 +78,9 @@ End File gid_File_Oxt_CT2N TXT_FILE_BODY; - Styles = (PACKED, ARCHIVE); - Dir = gid_Brand_Dir_Share_Extensions_CT2N; - Name = "ConvertTextToNumber.oxt"; + Styles = (PACKED, FILELIST); + Dir = FILELIST_DIR; + Name = "ct2n.filelist"; End #endif |