Date: prev next · Thread: first prev next last
2013 Archives by date, by thread · List index


Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/3652

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/52/3652/1

fdo#63197: convert osxres

Change-Id: I969217263fdda3e61b38dc16f0a9251b745de885
---
M scp2/source/ooo/file_ooo.scp
M vcl/Module_vcl.mk
R vcl/Package_osxres.mk
3 files changed, 9 insertions(+), 7 deletions(-)



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 @@
 
 #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 @@
 
 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..e6ee3e5 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,vcl_osxres,Contents,\
     MainMenu.nib/classes.nib \
     MainMenu.nib/info.nib \
     MainMenu.nib/keyedobjects.nib \

-- 
To view, visit https://gerrit.libreoffice.org/3652
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I969217263fdda3e61b38dc16f0a9251b745de885
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Julien Nabet <serval2412@yahoo.fr>


Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.