scp2/source/ooo/file_ooo.scp | 8 ++++----
sysui/Module_sysui.mk | 2 +-
sysui/Package_osxicons.mk | 41 +++++++++++++++++++++++++++++++++++++++++
sysui/Zip_osxicons.mk | 39 ---------------------------------------
4 files changed, 46 insertions(+), 44 deletions(-)
New commits:
commit 0b4315077a6827798e1d2bdae73298365ba9a018
Author: Julien Nabet <serval2...@yahoo.fr>
Date: Wed Apr 17 21:28:40 2013 +0200
fdo#63197, convert sysui osxicons
Change-Id: Iab9cb3704385c115e1d25189a3d8833bd6721e24
Reviewed-on: https://gerrit.libreoffice.org/3440
Reviewed-by: David Tardon <dtar...@redhat.com>
Tested-by: David Tardon <dtar...@redhat.com>
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index bd5b571..b5fe2a2 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -1267,10 +1267,10 @@ End
#ifdef MACOSX
File gid_File_Icns_Bundle
- ARCHIVE_TXT_FILE_BODY;
- Dir = gid_Dir_Bundle_Contents_Resources;
- Name = "osxicons.zip";
- Styles = (ARCHIVE);
+ Dir = FILELIST_DIR;
+ TXT_FILE_BODY;
+ Styles = (FILELIST);
+ Name = "sysui_osxicons.filelist";
End
#endif
diff --git a/sysui/Module_sysui.mk b/sysui/Module_sysui.mk
index 9c5c76a..c668730 100644
--- a/sysui/Module_sysui.mk
+++ b/sysui/Module_sysui.mk
@@ -22,7 +22,7 @@ $(eval $(call gb_Module_add_targets,sysui,\
ifeq ($(OS),MACOSX)
$(eval $(call gb_Module_add_targets,sysui,\
- Zip_osxicons \
+ Package_osxicons \
CustomTarget_infoplist \
Package_infoplist \
))
diff --git a/sysui/Package_osxicons.mk b/sysui/Package_osxicons.mk
new file mode 100644
index 0000000..ed84e10
--- /dev/null
+++ b/sysui/Package_osxicons.mk
@@ -0,0 +1,41 @@
+# -*- 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_Package_Package,sysui_osxicons,$(SRCDIR)/sysui/desktop))
+
+$(eval $(call gb_Package_set_outdir,sysui_osxicons,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files_with_dir,sysui_osxicons,Resources,\
+ icons/text.icns \
+ icons/oasis-text.icns \
+ icons/spreadsheet.icns \
+ icons/oasis-spreadsheet.icns \
+ icons/presentation.icns \
+ icons/oasis-presentation.icns \
+ icons/drawing.icns \
+ icons/oasis-drawing.icns \
+ icons/master-document.icns \
+ icons/oasis-master-document.icns \
+ icons/formula.icns \
+ icons/oasis-formula.icns \
+ icons/text-template.icns \
+ icons/oasis-text-template.icns \
+ icons/spreadsheet-template.icns \
+ icons/oasis-spreadsheet-template.icns \
+ icons/presentation-template.icns \
+ icons/oasis-presentation-template.icns \
+ icons/drawing-template.icns \
+ icons/oasis-drawing-template.icns \
+ icons/oasis-database.icns \
+ icons/extension.icns \
+ icons/main.icns \
+ macosx/Info.plist \
+))
+
+# vim: set ts=4 sw=4 et:
diff --git a/sysui/Zip_osxicons.mk b/sysui/Zip_osxicons.mk
deleted file mode 100644
index d9c1901..0000000
--- a/sysui/Zip_osxicons.mk
+++ /dev/null
@@ -1,39 +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_Zip_Zip,osxicons,$(SRCDIR)/sysui/desktop))
-
-$(eval $(call gb_Zip_add_files,osxicons,\
- icons/text.icns \
- icons/oasis-text.icns \
- icons/spreadsheet.icns \
- icons/oasis-spreadsheet.icns \
- icons/presentation.icns \
- icons/oasis-presentation.icns \
- icons/drawing.icns \
- icons/oasis-drawing.icns \
- icons/master-document.icns \
- icons/oasis-master-document.icns \
- icons/formula.icns \
- icons/oasis-formula.icns \
- icons/text-template.icns \
- icons/oasis-text-template.icns \
- icons/spreadsheet-template.icns \
- icons/oasis-spreadsheet-template.icns \
- icons/presentation-template.icns \
- icons/oasis-presentation-template.icns \
- icons/drawing-template.icns \
- icons/oasis-drawing-template.icns \
- icons/oasis-database.icns \
- icons/extension.icns \
- icons/main.icns \
- macosx/Info.plist \
-))
-
-# vim: set ts=4 sw=4 et:
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
