[Libreoffice-commits] core.git: scp2/source vcl/Module_vcl.mk vcl/Package_osxres.mk vcl/Zip_osxres.mk

[Julien Nabet]

 scp2/source/ooo/file_ooo.scp |    8 +--
 vcl/Module_vcl.mk            |    2 
 vcl/Package_osxres.mk        |   90 +++++++++++++++++++++++++++++++++++++++++++
 vcl/Zip_osxres.mk            |   88 ------------------------------------------
 4 files changed, 95 insertions(+), 93 deletions(-)

New commits:
commit 14a96e28c9dac64cfa0d1cf1c6fc3fece8ed6b0c
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Sun Apr 28 18:11:56 2013 +0200

    fdo#63197: convert osxres
    
    Change-Id: I969217263fdda3e61b38dc16f0a9251b745de885
    Reviewed-on: https://gerrit.libreoffice.org/3652
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Tested-by: David Tardon <dtardon at redhat.com>

diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 00f1a94..aa47787 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 976b7698..fd2be4c5 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
similarity index 91%
rename from vcl/Zip_osxres.mk
rename to vcl/Package_osxres.mk
index 10c0d12..8f4849f 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 \