diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2013-04-28 18:11:56 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-04-28 18:23:10 +0000 |
| commit | 14a96e28c9dac64cfa0d1cf1c6fc3fece8ed6b0c (patch) | |
| tree | c51bd23ecec00461fdcf50e38f57ac368faf5380 | |
| parent | 9c4f99287c1ffc7119f6bf171926db6233e9de9c (diff) | |
fdo#63197: convert osxres
Change-Id: I969217263fdda3e61b38dc16f0a9251b745de885
Reviewed-on: https://gerrit.libreoffice.org/3652
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
| -rw-r--r-- | scp2/source/ooo/file_ooo.scp | 8 | ||||
| -rw-r--r-- | vcl/Module_vcl.mk | 2 | ||||
| -rw-r--r-- | vcl/Package_osxres.mk (renamed from vcl/Zip_osxres.mk) | 6 |
3 files changed, 9 insertions, 7 deletions
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index 00f1a94e64a4..aa477870e557 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -1232,10 +1232,10 @@ End #ifdef MACOSX File gid_File_Res_Bundle - ARCHIVE_TXT_FILE_BODY; - Dir = gid_Dir_Bundle_Contents_Resources; - Name = "osxres.zip"; - Styles = (ARCHIVE); + Dir = FILELIST_DIR; + TXT_FILE_BODY; + Styles = (FILELIST); + Name = "vcl_osxres.filelist"; End #endif diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk index 976b76985d2e..fd2be4c5ed54 100644 --- a/vcl/Module_vcl.mk +++ b/vcl/Module_vcl.mk @@ -71,7 +71,7 @@ endif ifeq ($(OS),MACOSX) $(eval $(call gb_Module_add_targets,vcl,\ - Zip_osxres \ + Package_osxres \ )) endif diff --git a/vcl/Zip_osxres.mk b/vcl/Package_osxres.mk index 10c0d12eaa8f..8f4849fbc502 100644 --- a/vcl/Zip_osxres.mk +++ b/vcl/Package_osxres.mk @@ -7,9 +7,11 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Zip_Zip,osxres,$(SRCDIR)/vcl/aqua/source/res)) +$(eval $(call gb_Package_Package,vcl_osxres,$(SRCDIR)/vcl/aqua/source/res)) -$(eval $(call gb_Zip_add_files,osxres,\ +$(eval $(call gb_Package_set_outdir,vcl_osxres,$(INSTDIR))) + +$(eval $(call gb_Package_add_files_with_dir,vcl_osxres,Resources,\ MainMenu.nib/classes.nib \ MainMenu.nib/info.nib \ MainMenu.nib/keyedobjects.nib \ |