[Libreoffice-commits] core.git: extras/ExternalPackage_accessoriesgallery.mk extras/Module_extras.mk extras/Zip_accessoriesgallery.mk scp2/source
Julien Nabet
serval2412 at yahoo.fr
Tue Apr 16 21:36:40 PDT 2013
extras/ExternalPackage_accessoriesgallery.mk | 317 ++++++++++++++++++
extras/Module_extras.mk | 2
extras/Zip_accessoriesgallery.mk | 319 -------------------
scp2/source/accessories/file_gallery_accessories.scp | 7
4 files changed, 322 insertions(+), 323 deletions(-)
New commits:
commit a0879a54aed42b3e90d34b37aede434b1c84f7d0
Author: Julien Nabet <serval2412 at yahoo.fr>
Date: Tue Apr 16 14:51:59 2013 +0200
fdo#63197, convert Zip_accessoriesgallery
Change-Id: I23d31c9574269f9d945a6940728c90cb7a9ae51d
Reviewed-on: https://gerrit.libreoffice.org/3416
Reviewed-by: David Tardon <dtardon at redhat.com>
Tested-by: David Tardon <dtardon at redhat.com>
diff --git a/extras/ExternalPackage_accessoriesgallery.mk b/extras/ExternalPackage_accessoriesgallery.mk
new file mode 100644
index 0000000..3e3bc88
--- /dev/null
+++ b/extras/ExternalPackage_accessoriesgallery.mk
@@ -0,0 +1,317 @@
+# -*- 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_ExternalPackage_ExternalPackage,extras_accessoriesgallery,gallery-pack))
+
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgallery,$(INSTDIR)))
+
+$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgallery,share/gallery,\
+ accessories/sg1010.sdg \
+ accessories/sg1010.sdv \
+ accessories/sg1010.thm \
+ accessories/sg1011.sdg \
+ accessories/sg1011.sdv \
+ accessories/sg1011.thm \
+ accessories/sg101.sdg \
+ accessories/sg101.sdv \
+ accessories/sg101.thm \
+ accessories/sg102.sdg \
+ accessories/sg102.sdv \
+ accessories/sg102.thm \
+ accessories/sg103.sdg \
+ accessories/sg103.sdv \
+ accessories/sg103.thm \
+ accessories/sg105.sdg \
+ accessories/sg105.sdv \
+ accessories/sg105.thm \
+ accessories/sg1067.sdg \
+ accessories/sg1067.sdv \
+ accessories/sg1067.thm \
+ accessories/sg106.sdg \
+ accessories/sg106.sdv \
+ accessories/sg106.thm \
+ accessories/sg107.sdg \
+ accessories/sg107.sdv \
+ accessories/sg107.thm \
+ accessories/sg108.sdg \
+ accessories/sg108.sdv \
+ accessories/sg108.thm \
+ accessories/sg109.sdg \
+ accessories/sg109.sdv \
+ accessories/sg109.thm \
+ accessories/sg110.sdg \
+ accessories/sg110.sdv \
+ accessories/sg110.thm \
+ accessories/sg111.sdg \
+ accessories/sg111.sdv \
+ accessories/sg111.thm \
+ accessories/sg1208.sdg \
+ accessories/sg1208.sdv \
+ accessories/sg1208.thm \
+ accessories/sg121.sdg \
+ accessories/sg121.sdv \
+ accessories/sg121.thm \
+ accessories/sg127.sdg \
+ accessories/sg127.sdv \
+ accessories/sg127.thm \
+ accessories/sg133.sdg \
+ accessories/sg133.sdv \
+ accessories/sg133.thm \
+ accessories/sg200.sdg \
+ accessories/sg200.sdv \
+ accessories/sg200.thm \
+ accessories/sg201.sdg \
+ accessories/sg201.sdv \
+ accessories/sg201.thm \
+ accessories/sg203.sdg \
+ accessories/sg203.sdv \
+ accessories/sg203.thm \
+ accessories/sg204.sdg \
+ accessories/sg204.sdv \
+ accessories/sg204.thm \
+ accessories/sg205.sdg \
+ accessories/sg205.sdv \
+ accessories/sg205.thm \
+ accessories/sg206.sdg \
+ accessories/sg206.sdv \
+ accessories/sg206.thm \
+ accessories/sg207.sdg \
+ accessories/sg207.sdv \
+ accessories/sg207.thm \
+ accessories/sg2101.sdg \
+ accessories/sg2101.sdv \
+ accessories/sg2101.thm \
+ accessories/sg210.sdg \
+ accessories/sg210.sdv \
+ accessories/sg210.thm \
+ accessories/sg212.sdg \
+ accessories/sg212.sdv \
+ accessories/sg212.thm \
+ accessories/sg2245.sdg \
+ accessories/sg2245.sdv \
+ accessories/sg2245.thm \
+ accessories/sg2246.sdg \
+ accessories/sg2246.sdv \
+ accessories/sg2246.thm \
+ accessories/sg2247.sdg \
+ accessories/sg2247.sdv \
+ accessories/sg2247.thm \
+ accessories/sg2248.sdg \
+ accessories/sg2248.sdv \
+ accessories/sg2248.thm \
+ accessories/sg2249.sdg \
+ accessories/sg2249.sdv \
+ accessories/sg2249.thm \
+ accessories/sg2250.sdg \
+ accessories/sg2250.sdv \
+ accessories/sg2250.thm \
+ accessories/sg2251.sdg \
+ accessories/sg2251.sdv \
+ accessories/sg2251.thm \
+ accessories/sg2253.sdg \
+ accessories/sg2253.sdv \
+ accessories/sg2253.thm \
+ accessories/sg2254.sdg \
+ accessories/sg2254.sdv \
+ accessories/sg2254.thm \
+ accessories/sg2255.sdg \
+ accessories/sg2255.sdv \
+ accessories/sg2255.thm \
+ accessories/sg2256.sdg \
+ accessories/sg2256.sdv \
+ accessories/sg2256.thm \
+ accessories/sg2257.sdg \
+ accessories/sg2257.sdv \
+ accessories/sg2257.thm \
+ accessories/sg2258.sdg \
+ accessories/sg2258.sdv \
+ accessories/sg2258.thm \
+ accessories/sg2259.sdg \
+ accessories/sg2259.sdv \
+ accessories/sg2259.thm \
+ accessories/sg2261.sdg \
+ accessories/sg2261.sdv \
+ accessories/sg2261.thm \
+ accessories/sg2262.sdg \
+ accessories/sg2262.sdv \
+ accessories/sg2262.thm \
+ accessories/sg2264.sdg \
+ accessories/sg2264.sdv \
+ accessories/sg2264.thm \
+ accessories/sg2265.sdg \
+ accessories/sg2265.sdv \
+ accessories/sg2265.thm \
+ accessories/sg2266.sdg \
+ accessories/sg2266.sdv \
+ accessories/sg2266.thm \
+ accessories/sg2267.sdg \
+ accessories/sg2267.sdv \
+ accessories/sg2267.thm \
+ accessories/sg2268.sdg \
+ accessories/sg2268.sdv \
+ accessories/sg2268.thm \
+ accessories/sg2269.sdg \
+ accessories/sg2269.sdv \
+ accessories/sg2269.thm \
+ accessories/sg2270.sdg \
+ accessories/sg2270.sdv \
+ accessories/sg2270.thm \
+ accessories/sg2272.sdg \
+ accessories/sg2272.sdv \
+ accessories/sg2272.thm \
+ accessories/sg2273.sdg \
+ accessories/sg2273.sdv \
+ accessories/sg2273.thm \
+ accessories/sg2274.sdg \
+ accessories/sg2274.sdv \
+ accessories/sg2274.thm \
+ accessories/sg2275.sdg \
+ accessories/sg2275.sdv \
+ accessories/sg2275.thm \
+ accessories/sg2276.sdg \
+ accessories/sg2276.sdv \
+ accessories/sg2276.thm \
+ accessories/sg2277.sdg \
+ accessories/sg2277.sdv \
+ accessories/sg2277.thm \
+ accessories/sg2278.sdg \
+ accessories/sg2278.sdv \
+ accessories/sg2278.thm \
+ accessories/sg2279.sdg \
+ accessories/sg2279.sdv \
+ accessories/sg2279.thm \
+ accessories/sg2280.sdg \
+ accessories/sg2280.sdv \
+ accessories/sg2280.thm \
+ accessories/sg2281.sdg \
+ accessories/sg2281.sdv \
+ accessories/sg2281.thm \
+ accessories/sg2282.sdg \
+ accessories/sg2282.sdv \
+ accessories/sg2282.thm \
+ accessories/sg2283.sdg \
+ accessories/sg2283.sdv \
+ accessories/sg2283.thm \
+ accessories/sg2284.sdg \
+ accessories/sg2284.sdv \
+ accessories/sg2284.thm \
+ accessories/sg2285.sdg \
+ accessories/sg2285.sdv \
+ accessories/sg2285.thm \
+ accessories/sg2303.sdg \
+ accessories/sg2303.sdv \
+ accessories/sg2303.thm \
+ accessories/sg2304.sdg \
+ accessories/sg2304.sdv \
+ accessories/sg2304.thm \
+ accessories/sg2305.sdg \
+ accessories/sg2305.sdv \
+ accessories/sg2305.thm \
+ accessories/sg2306.sdg \
+ accessories/sg2306.sdv \
+ accessories/sg2306.thm \
+ accessories/sg2307.sdg \
+ accessories/sg2307.sdv \
+ accessories/sg2307.thm \
+ accessories/sg2308.sdg \
+ accessories/sg2308.sdv \
+ accessories/sg2308.thm \
+ accessories/sg2309.sdg \
+ accessories/sg2309.sdv \
+ accessories/sg2309.thm \
+ accessories/sg2310.sdg \
+ accessories/sg2310.sdv \
+ accessories/sg2310.thm \
+ accessories/sg2311.sdg \
+ accessories/sg2311.sdv \
+ accessories/sg2311.thm \
+ accessories/sg2312.sdg \
+ accessories/sg2312.sdv \
+ accessories/sg2312.thm \
+ accessories/sg231.sdg \
+ accessories/sg231.sdv \
+ accessories/sg231.thm \
+ accessories/sg301.sdg \
+ accessories/sg301.sdv \
+ accessories/sg301.thm \
+ accessories/sg302.sdg \
+ accessories/sg302.sdv \
+ accessories/sg302.thm \
+ accessories/sg303.sdg \
+ accessories/sg303.sdv \
+ accessories/sg303.thm \
+ accessories/sg304.sdg \
+ accessories/sg304.sdv \
+ accessories/sg304.thm \
+ accessories/sg305.sdg \
+ accessories/sg305.sdv \
+ accessories/sg305.thm \
+ accessories/sg307.sdg \
+ accessories/sg307.sdv \
+ accessories/sg307.thm \
+ accessories/sg308.sdg \
+ accessories/sg308.sdv \
+ accessories/sg308.thm \
+ accessories/sg309.sdg \
+ accessories/sg309.sdv \
+ accessories/sg309.thm \
+ accessories/sg310.sdg \
+ accessories/sg310.sdv \
+ accessories/sg310.thm \
+ accessories/sg311.sdg \
+ accessories/sg311.sdv \
+ accessories/sg311.thm \
+ accessories/sg312.sdg \
+ accessories/sg312.sdv \
+ accessories/sg312.thm \
+ accessories/sg313.sdg \
+ accessories/sg313.sdv \
+ accessories/sg313.thm \
+ accessories/sg314.sdg \
+ accessories/sg314.sdv \
+ accessories/sg314.thm \
+ accessories/sg315.sdg \
+ accessories/sg315.sdv \
+ accessories/sg315.thm \
+ accessories/sg316.sdg \
+ accessories/sg316.sdv \
+ accessories/sg316.thm \
+ accessories/sg317.sdg \
+ accessories/sg317.sdv \
+ accessories/sg317.thm \
+ accessories/sg318.sdg \
+ accessories/sg318.sdv \
+ accessories/sg318.thm \
+ accessories/sg319.sdg \
+ accessories/sg319.sdv \
+ accessories/sg319.thm \
+ accessories/sg320.sdg \
+ accessories/sg320.sdv \
+ accessories/sg320.thm \
+ accessories/sg402.sdg \
+ accessories/sg402.sdv \
+ accessories/sg402.thm \
+ accessories/sg403.sdg \
+ accessories/sg403.sdv \
+ accessories/sg403.thm \
+ accessories/sg404.sdg \
+ accessories/sg404.sdv \
+ accessories/sg404.thm \
+ accessories/sg405.sdg \
+ accessories/sg405.sdv \
+ accessories/sg405.thm \
+ accessories/sg412.sdg \
+ accessories/sg412.sdv \
+ accessories/sg412.thm \
+ accessories/sg555.sdg \
+ accessories/sg555.sdv \
+ accessories/sg555.thm \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/extras/Module_extras.mk b/extras/Module_extras.mk
index 77223c3..7b494e4 100644
--- a/extras/Module_extras.mk
+++ b/extras/Module_extras.mk
@@ -60,7 +60,7 @@ endif
ifeq ($(WITH_EXTRA_GALLERY),YES)
$(eval $(call gb_Module_add_targets,extras,\
UnpackedTarball_gallery_pack \
- Zip_accessoriesgallery \
+ ExternalPackage_accessoriesgallery \
Zip_accessoriesgallerydrawspeople \
Zip_accessoriesgalleryelementsbullets2 \
Zip_accessoriesgallerynonfree \
diff --git a/extras/Zip_accessoriesgallery.mk b/extras/Zip_accessoriesgallery.mk
deleted file mode 100644
index 87324f8..0000000
--- a/extras/Zip_accessoriesgallery.mk
+++ /dev/null
@@ -1,319 +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,accessoriesgallery,$(call gb_UnpackedTarball_get_dir,gallery-pack)/accessories))
-
-$(eval $(call gb_Zip_add_dependencies,accessoriesgallery,\
- $(call gb_UnpackedTarball_get_target,gallery-pack) \
-))
-
-$(eval $(call gb_Zip_add_files,accessoriesgallery,\
- sg1010.sdg \
- sg1010.sdv \
- sg1010.thm \
- sg1011.sdg \
- sg1011.sdv \
- sg1011.thm \
- sg101.sdg \
- sg101.sdv \
- sg101.thm \
- sg102.sdg \
- sg102.sdv \
- sg102.thm \
- sg103.sdg \
- sg103.sdv \
- sg103.thm \
- sg105.sdg \
- sg105.sdv \
- sg105.thm \
- sg1067.sdg \
- sg1067.sdv \
- sg1067.thm \
- sg106.sdg \
- sg106.sdv \
- sg106.thm \
- sg107.sdg \
- sg107.sdv \
- sg107.thm \
- sg108.sdg \
- sg108.sdv \
- sg108.thm \
- sg109.sdg \
- sg109.sdv \
- sg109.thm \
- sg110.sdg \
- sg110.sdv \
- sg110.thm \
- sg111.sdg \
- sg111.sdv \
- sg111.thm \
- sg1208.sdg \
- sg1208.sdv \
- sg1208.thm \
- sg121.sdg \
- sg121.sdv \
- sg121.thm \
- sg127.sdg \
- sg127.sdv \
- sg127.thm \
- sg133.sdg \
- sg133.sdv \
- sg133.thm \
- sg200.sdg \
- sg200.sdv \
- sg200.thm \
- sg201.sdg \
- sg201.sdv \
- sg201.thm \
- sg203.sdg \
- sg203.sdv \
- sg203.thm \
- sg204.sdg \
- sg204.sdv \
- sg204.thm \
- sg205.sdg \
- sg205.sdv \
- sg205.thm \
- sg206.sdg \
- sg206.sdv \
- sg206.thm \
- sg207.sdg \
- sg207.sdv \
- sg207.thm \
- sg2101.sdg \
- sg2101.sdv \
- sg2101.thm \
- sg210.sdg \
- sg210.sdv \
- sg210.thm \
- sg212.sdg \
- sg212.sdv \
- sg212.thm \
- sg2245.sdg \
- sg2245.sdv \
- sg2245.thm \
- sg2246.sdg \
- sg2246.sdv \
- sg2246.thm \
- sg2247.sdg \
- sg2247.sdv \
- sg2247.thm \
- sg2248.sdg \
- sg2248.sdv \
- sg2248.thm \
- sg2249.sdg \
- sg2249.sdv \
- sg2249.thm \
- sg2250.sdg \
- sg2250.sdv \
- sg2250.thm \
- sg2251.sdg \
- sg2251.sdv \
- sg2251.thm \
- sg2253.sdg \
- sg2253.sdv \
- sg2253.thm \
- sg2254.sdg \
- sg2254.sdv \
- sg2254.thm \
- sg2255.sdg \
- sg2255.sdv \
- sg2255.thm \
- sg2256.sdg \
- sg2256.sdv \
- sg2256.thm \
- sg2257.sdg \
- sg2257.sdv \
- sg2257.thm \
- sg2258.sdg \
- sg2258.sdv \
- sg2258.thm \
- sg2259.sdg \
- sg2259.sdv \
- sg2259.thm \
- sg2261.sdg \
- sg2261.sdv \
- sg2261.thm \
- sg2262.sdg \
- sg2262.sdv \
- sg2262.thm \
- sg2264.sdg \
- sg2264.sdv \
- sg2264.thm \
- sg2265.sdg \
- sg2265.sdv \
- sg2265.thm \
- sg2266.sdg \
- sg2266.sdv \
- sg2266.thm \
- sg2267.sdg \
- sg2267.sdv \
- sg2267.thm \
- sg2268.sdg \
- sg2268.sdv \
- sg2268.thm \
- sg2269.sdg \
- sg2269.sdv \
- sg2269.thm \
- sg2270.sdg \
- sg2270.sdv \
- sg2270.thm \
- sg2272.sdg \
- sg2272.sdv \
- sg2272.thm \
- sg2273.sdg \
- sg2273.sdv \
- sg2273.thm \
- sg2274.sdg \
- sg2274.sdv \
- sg2274.thm \
- sg2275.sdg \
- sg2275.sdv \
- sg2275.thm \
- sg2276.sdg \
- sg2276.sdv \
- sg2276.thm \
- sg2277.sdg \
- sg2277.sdv \
- sg2277.thm \
- sg2278.sdg \
- sg2278.sdv \
- sg2278.thm \
- sg2279.sdg \
- sg2279.sdv \
- sg2279.thm \
- sg2280.sdg \
- sg2280.sdv \
- sg2280.thm \
- sg2281.sdg \
- sg2281.sdv \
- sg2281.thm \
- sg2282.sdg \
- sg2282.sdv \
- sg2282.thm \
- sg2283.sdg \
- sg2283.sdv \
- sg2283.thm \
- sg2284.sdg \
- sg2284.sdv \
- sg2284.thm \
- sg2285.sdg \
- sg2285.sdv \
- sg2285.thm \
- sg2303.sdg \
- sg2303.sdv \
- sg2303.thm \
- sg2304.sdg \
- sg2304.sdv \
- sg2304.thm \
- sg2305.sdg \
- sg2305.sdv \
- sg2305.thm \
- sg2306.sdg \
- sg2306.sdv \
- sg2306.thm \
- sg2307.sdg \
- sg2307.sdv \
- sg2307.thm \
- sg2308.sdg \
- sg2308.sdv \
- sg2308.thm \
- sg2309.sdg \
- sg2309.sdv \
- sg2309.thm \
- sg2310.sdg \
- sg2310.sdv \
- sg2310.thm \
- sg2311.sdg \
- sg2311.sdv \
- sg2311.thm \
- sg2312.sdg \
- sg2312.sdv \
- sg2312.thm \
- sg231.sdg \
- sg231.sdv \
- sg231.thm \
- sg301.sdg \
- sg301.sdv \
- sg301.thm \
- sg302.sdg \
- sg302.sdv \
- sg302.thm \
- sg303.sdg \
- sg303.sdv \
- sg303.thm \
- sg304.sdg \
- sg304.sdv \
- sg304.thm \
- sg305.sdg \
- sg305.sdv \
- sg305.thm \
- sg307.sdg \
- sg307.sdv \
- sg307.thm \
- sg308.sdg \
- sg308.sdv \
- sg308.thm \
- sg309.sdg \
- sg309.sdv \
- sg309.thm \
- sg310.sdg \
- sg310.sdv \
- sg310.thm \
- sg311.sdg \
- sg311.sdv \
- sg311.thm \
- sg312.sdg \
- sg312.sdv \
- sg312.thm \
- sg313.sdg \
- sg313.sdv \
- sg313.thm \
- sg314.sdg \
- sg314.sdv \
- sg314.thm \
- sg315.sdg \
- sg315.sdv \
- sg315.thm \
- sg316.sdg \
- sg316.sdv \
- sg316.thm \
- sg317.sdg \
- sg317.sdv \
- sg317.thm \
- sg318.sdg \
- sg318.sdv \
- sg318.thm \
- sg319.sdg \
- sg319.sdv \
- sg319.thm \
- sg320.sdg \
- sg320.sdv \
- sg320.thm \
- sg402.sdg \
- sg402.sdv \
- sg402.thm \
- sg403.sdg \
- sg403.sdv \
- sg403.thm \
- sg404.sdg \
- sg404.sdv \
- sg404.thm \
- sg405.sdg \
- sg405.sdv \
- sg405.thm \
- sg412.sdg \
- sg412.sdv \
- sg412.thm \
- sg555.sdg \
- sg555.sdv \
- sg555.thm \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/scp2/source/accessories/file_gallery_accessories.scp b/scp2/source/accessories/file_gallery_accessories.scp
index 46706e1..11ce2ed 100644
--- a/scp2/source/accessories/file_gallery_accessories.scp
+++ b/scp2/source/accessories/file_gallery_accessories.scp
@@ -35,9 +35,10 @@
#ifdef WITH_EXTRA_GALLERY
File gid_File_Extra_Gallery_Accessories
- Dir = gid_Dir_Gallery;
- ARCHIVE_TXT_FILE_BODY;
- Name = "accessoriesgallery.zip";
+ Dir = FILELIST_DIR;
+ TXT_FILE_BODY;
+ Styles = (FILELIST);
+ Name = "extras_accessoriesgallery.filelist";
End
File gid_File_Extra_Gallery_Draws_People_Accessories
More information about the Libreoffice-commits
mailing list