dev/null |binary extras/Gallery_sound.mk | 2 extras/Gallery_transportation.mk | 29 +++++++++++++ extras/Gallery_txtshapes.mk | 53 +++++++++++++++++++++++++ extras/Module_extras.mk | 5 -- extras/Package_gallsounds.mk | 52 ------------------------ extras/Package_gallsystem.mk | 6 -- extras/Package_galltransport.mk | 31 -------------- extras/Package_galltxtshapes.mk | 55 -------------------------- extras/source/gallery/share/gallery_names.ulf | 6 ++ extras/source/gallery/sounds/sound.str | 2 scp2/inc/macros.inc | 20 ++++++++- scp2/source/ooo/file_extra_ooo.scp | 23 +--------- solenv/bin/desktop-translate.pl | 14 +++++- solenv/gbuild/Gallery.mk | 14 +++++- solenv/gbuild/Package.mk | 1 solenv/gbuild/extensions/pre_BuildTools.mk | 4 - 17 files changed, 138 insertions(+), 179 deletions(-)
New commits: commit ab4c9d855b7e2ed515e75b916d93ef4fb4a3d3f8 Author: Michael Meeks <[email protected]> Date: Mon May 13 21:20:00 2013 +0100 remove pre-compiled textshapes and transportation galleries. Further gnumake fixups, package the files in the Gallery rules. Change-Id: Icda2de9cfcd2ff573db2e9ab27e2670dcfa5f0a8 diff --git a/extras/Gallery_sound.mk b/extras/Gallery_sound.mk index 358da05..b48a2f0 100644 --- a/extras/Gallery_sound.mk +++ b/extras/Gallery_sound.mk @@ -10,7 +10,7 @@ $(eval $(call gb_Gallery_Gallery,sound,extras/source/gallery/sounds)) -$(eval $(call gb_Gallery_add_files,sound,\ +$(eval $(call gb_Gallery_add_files,sound,share/gallery/sounds,\ extras/source/gallery/sounds/apert2.wav \ extras/source/gallery/sounds/apert.wav \ extras/source/gallery/sounds/applause.wav \ diff --git a/extras/Gallery_transportation.mk b/extras/Gallery_transportation.mk index 8b84c96..605782f 100644 --- a/extras/Gallery_transportation.mk +++ b/extras/Gallery_transportation.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Gallery_Gallery,transportation,extras/source/gallery/transportation)) -$(eval $(call gb_Gallery_add_files,transportation,\ +$(eval $(call gb_Gallery_add_files,transportation,share/gallery/transportation,\ extras/source/gallery/transportation/Airplane-Blue.png \ extras/source/gallery/transportation/Bicycle-Blue.png \ extras/source/gallery/transportation/Boat.png \ diff --git a/extras/Gallery_txtshapes.mk b/extras/Gallery_txtshapes.mk index 85645a5..df8bc3a 100644 --- a/extras/Gallery_txtshapes.mk +++ b/extras/Gallery_txtshapes.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Gallery_Gallery,txtshapes,extras/source/gallery/txtshapes)) -$(eval $(call gb_Gallery_add_files,txtshapes,\ +$(eval $(call gb_Gallery_add_files,txtshapes,share/gallery/txtshapes,\ extras/source/gallery/txtshapes/Circle01-DarkBlue.png \ extras/source/gallery/txtshapes/Circle02-LightBlue.png \ extras/source/gallery/txtshapes/Circle03-Green.png \ diff --git a/extras/Module_extras.mk b/extras/Module_extras.mk index 3551ce0..a92c307 100644 --- a/extras/Module_extras.mk +++ b/extras/Module_extras.mk @@ -32,7 +32,6 @@ $(eval $(call gb_Module_add_targets,extras,\ Package_gallmytheme \ Package_gallpeople \ Package_gallroot \ - Package_gallsounds \ Package_gallsymbols \ Package_gallsystem \ Package_gallwwwback \ diff --git a/extras/Package_gallsounds.mk b/extras/Package_gallsounds.mk deleted file mode 100644 index 61a093f..0000000 --- a/extras/Package_gallsounds.mk +++ /dev/null @@ -1,52 +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_Package_Package,extras_gallsounds,$(SRCDIR)/extras/source/gallery/sounds)) - -$(eval $(call gb_Package_set_outdir,extras_gallsounds,$(INSTDIR))) - -$(eval $(call gb_Package_add_files,extras_gallsounds,share/gallery/sounds,\ - apert2.wav \ - apert.wav \ - applause.wav \ - beam2.wav \ - beam.wav \ - cow.wav \ - curve.wav \ - drama.wav \ - explos.wav \ - falling.wav \ - glasses.wav \ - gong.wav \ - horse.wav \ - kling.wav \ - kongas.wav \ - laser.wav \ - left.wav \ - nature1.wav \ - nature2.wav \ - ok.wav \ - pluck.wav \ - roll.wav \ - romans.wav \ - soft.wav \ - space2.wav \ - space3.wav \ - space.wav \ - sparcle.wav \ - strom.wav \ - theetone.wav \ - top.wav \ - train.wav \ - untie.wav \ - ups.wav \ - wallewal.wav \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/extras/Package_gallsystem.mk b/extras/Package_gallsystem.mk index 441dbfd..eaf9254 100644 --- a/extras/Package_gallsystem.mk +++ b/extras/Package_gallsystem.mk @@ -45,12 +45,6 @@ $(eval $(call gb_Package_add_files,extras_gallsystem,share/gallery,\ sg17.sdg \ sg17.sdv \ sg17.thm \ - sg18.sdg \ - sg18.sdv \ - sg18.thm \ - sg19.sdg \ - sg19.sdv \ - sg19.thm \ sg24.sdg \ sg24.sdv \ sg24.thm \ diff --git a/extras/source/gallery/gallery_system/sg18.sdg b/extras/source/gallery/gallery_system/sg18.sdg deleted file mode 100755 index fb0bf91..0000000 Binary files a/extras/source/gallery/gallery_system/sg18.sdg and /dev/null differ diff --git a/extras/source/gallery/gallery_system/sg18.sdv b/extras/source/gallery/gallery_system/sg18.sdv deleted file mode 100755 index 4449591..0000000 Binary files a/extras/source/gallery/gallery_system/sg18.sdv and /dev/null differ diff --git a/extras/source/gallery/gallery_system/sg18.thm b/extras/source/gallery/gallery_system/sg18.thm deleted file mode 100755 index 4683a2f..0000000 Binary files a/extras/source/gallery/gallery_system/sg18.thm and /dev/null differ diff --git a/extras/source/gallery/gallery_system/sg19.sdg b/extras/source/gallery/gallery_system/sg19.sdg deleted file mode 100755 index c140012..0000000 Binary files a/extras/source/gallery/gallery_system/sg19.sdg and /dev/null differ diff --git a/extras/source/gallery/gallery_system/sg19.sdv b/extras/source/gallery/gallery_system/sg19.sdv deleted file mode 100755 index 4449591..0000000 Binary files a/extras/source/gallery/gallery_system/sg19.sdv and /dev/null differ diff --git a/extras/source/gallery/gallery_system/sg19.thm b/extras/source/gallery/gallery_system/sg19.thm deleted file mode 100755 index 6aa8926..0000000 Binary files a/extras/source/gallery/gallery_system/sg19.thm and /dev/null differ diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index 3b0bcce..066354e 100755 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -430,6 +430,12 @@ File gid_File_Extra_Gall##id \ TXT_FILE_BODY; \ Styles = (FILELIST, WORKSTATION, DONT_OVERWRITE); \ Name = STRING(CONCAT3(Gallery/,id,.filelist)); \ +End \ +File gid_File_Extra_GallFiles##id \ + Dir = FILELIST_DIR; \ + TXT_FILE_BODY; \ + Styles = (FILELIST, WORKSTATION, DONT_OVERWRITE); \ + Name = STRING(CONCAT3(Gallery/Files/,id,.filelist)); \ End diff --git a/solenv/gbuild/Gallery.mk b/solenv/gbuild/Gallery.mk index 7b28238..0aee083 100644 --- a/solenv/gbuild/Gallery.mk +++ b/solenv/gbuild/Gallery.mk @@ -95,7 +95,10 @@ $(call gb_Gallery_get_clean_target,%) : $(call gb_Gallery_get_workdir,$*) \ ) +# the theme package gb_Gallery_get_packagename = Gallery/$(1) +# the files package +gb_Gallery_get_files_packagename = Gallery/Files/$(1) # Create a gallery. # @@ -106,6 +109,10 @@ gb_Gallery_get_packagename = Gallery/$(1) define gb_Gallery_Gallery $(call gb_Gallery__Gallery_impl,$(1),$(call gb_Gallery_get_packagename,$(1)),$(2),$(3)) +# setup the files package - we install all of these too +$(call gb_Package_Package,$(call gb_Gallery_get_files_packagename,$(1)),$(SRCDIR)/$(2)) +$(call gb_Package_set_outdir,$(call gb_Gallery_get_files_packagename,$(1)),$(INSTDIR)) + endef @@ -169,8 +176,9 @@ endef # # gb_Gallery_add_file gallery file define gb_Gallery_add_file -$(call gb_Gallery_get_target,$(1)) : $(SRCDIR)/$(2) -$(call gb_Gallery_get_target,$(1)) : GALLERY_FILES += $(call gb_Helper_make_url,$(SRCDIR)/$(2)) +$(call gb_Gallery_get_target,$(1)) : $(SRCDIR)/$(3) +$(call gb_Gallery_get_target,$(1)) : GALLERY_FILES += $(call gb_Helper_make_url,$(SRCDIR)/$(3)) +$(call gb_Package_add_file,$(call gb_Gallery_get_files_packagename,$(1)),$(2)/$(notdir $(3)),$(notdir $(3))) endef @@ -180,7 +188,7 @@ endef # # gb_Gallery_add_files gallery file(s) define gb_Gallery_add_files -$(foreach fname,$(2),$(call gb_Gallery_add_file,$(1),$(fname))) +$(foreach fname,$(3),$(call gb_Gallery_add_file,$(1),$(2),$(fname))) endef diff --git a/solenv/gbuild/Package.mk b/solenv/gbuild/Package.mk index a5ecf37..f2b1c34 100644 --- a/solenv/gbuild/Package.mk +++ b/solenv/gbuild/Package.mk @@ -126,6 +126,7 @@ gb_Package_OUTDIR_$(1) := $(2) endef define gb_Package_add_file +$(info gb_Package_add_file,$(1), $(2), $(3), $(4)) $(call gb_Package__check,$(1)) $(if $(strip $(3)),,$(call gb_Output_error,gb_Package_add_file requires 3 arguments)) $(call gb_Package_get_target,$(1)) : $$(gb_Package_OUTDIR_$(1))/$(2) commit bfa0fd2fa5bbee238242583ab02ded9960d8cef2 Author: Michael Meeks <[email protected]> Date: Mon May 13 18:05:06 2013 +0100 migrate transportation gallery. Change-Id: Idec88df28724bcf4b3145bb169fa0fe08a8e282a diff --git a/extras/Gallery_transportation.mk b/extras/Gallery_transportation.mk new file mode 100644 index 0000000..8b84c96 --- /dev/null +++ b/extras/Gallery_transportation.mk @@ -0,0 +1,29 @@ +# -*- 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_Gallery_Gallery,transportation,extras/source/gallery/transportation)) + +$(eval $(call gb_Gallery_add_files,transportation,\ + extras/source/gallery/transportation/Airplane-Blue.png \ + extras/source/gallery/transportation/Bicycle-Blue.png \ + extras/source/gallery/transportation/Boat.png \ + extras/source/gallery/transportation/Bus.png \ + extras/source/gallery/transportation/Canoe-Blue.png \ + extras/source/gallery/transportation/Car-Red.png \ + extras/source/gallery/transportation/Helicopter-Blue.png \ + extras/source/gallery/transportation/Motorcycle-Red.png \ + extras/source/gallery/transportation/Pedestrian-Blue.png \ + extras/source/gallery/transportation/PersonalTransporter-Green.png \ + extras/source/gallery/transportation/Sailboat-Red.png \ + extras/source/gallery/transportation/Scooter-Orange.png \ + extras/source/gallery/transportation/Train-Red.png \ + extras/source/gallery/transportation/Truck-Blue.png \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/extras/Module_extras.mk b/extras/Module_extras.mk index f830186..3551ce0 100644 --- a/extras/Module_extras.mk +++ b/extras/Module_extras.mk @@ -35,7 +35,6 @@ $(eval $(call gb_Module_add_targets,extras,\ Package_gallsounds \ Package_gallsymbols \ Package_gallsystem \ - Package_galltransport \ Package_gallwwwback \ Package_gallwwwgraf \ Package_glade \ @@ -57,6 +56,7 @@ ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) $(eval $(call gb_Module_add_targets,extras,\ Gallery_sound \ Gallery_txtshapes \ + Gallery_transportation \ )) endif diff --git a/extras/Package_galltransport.mk b/extras/Package_galltransport.mk deleted file mode 100644 index 9ada8b2..0000000 --- a/extras/Package_galltransport.mk +++ /dev/null @@ -1,31 +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_Package_Package,extras_galltransport,$(SRCDIR)/extras/source/gallery/transportation)) - -$(eval $(call gb_Package_set_outdir,extras_galltransport,$(INSTDIR))) - -$(eval $(call gb_Package_add_files,extras_galltransport,share/gallery/transport,\ - Airplane-Blue.png \ - Bicycle-Blue.png \ - Boat.png \ - Bus.png \ - Canoe-Blue.png \ - Car-Red.png \ - Helicopter-Blue.png \ - Motorcycle-Red.png \ - Pedestrian-Blue.png \ - PersonalTransporter-Green.png \ - Sailboat-Red.png \ - Scooter-Orange.png \ - Train-Red.png \ - Truck-Blue.png \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/extras/source/gallery/share/gallery_names.ulf b/extras/source/gallery/share/gallery_names.ulf index 35e3c49..2c95acb 100644 --- a/extras/source/gallery/share/gallery_names.ulf +++ b/extras/source/gallery/share/gallery_names.ulf @@ -12,4 +12,7 @@ en-US = "Sounds" [txtshapes] en-US = "Text Shapes" +[transportation] +en-US = "Transportation" + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extras/source/gallery/sounds/sound.str b/extras/source/gallery/sounds/sound.str index fab10d3..bae770e 100644 --- a/extras/source/gallery/sounds/sound.str +++ b/extras/source/gallery/sounds/sound.str @@ -1,2 +1,2 @@ # Translated by desktop-translate and ulfex -name = "Sounds" +name = "see extras/source/gallery/share/gallery_names.ulf" diff --git a/scp2/source/ooo/file_extra_ooo.scp b/scp2/source/ooo/file_extra_ooo.scp index feb17f9..5b143f7 100644 --- a/scp2/source/ooo/file_extra_ooo.scp +++ b/scp2/source/ooo/file_extra_ooo.scp @@ -217,13 +217,7 @@ File gid_File_Extra_Gallsymbols Name = "extras_gallsymbols.filelist"; End -File gid_File_Extra_Galltransport - Dir = FILELIST_DIR; - TXT_FILE_BODY; - Styles = (FILELIST); - Name = "extras_galltransport.filelist"; -End - +GALLERY_FILELIST(transportation) GALLERY_FILELIST(txtshapes) GALLERY_FILELIST(sound) commit 023ef676de02f771894b3dcfd46feac95f8a294d Author: Michael Meeks <[email protected]> Date: Mon May 13 17:56:35 2013 +0100 gallery: get windows gengal command-name right. Change-Id: I488c57cfa58510e50b9b6819d55b23283aaddf49 diff --git a/solenv/gbuild/extensions/pre_BuildTools.mk b/solenv/gbuild/extensions/pre_BuildTools.mk index 51d8641..39dd1f5 100644 --- a/solenv/gbuild/extensions/pre_BuildTools.mk +++ b/solenv/gbuild/extensions/pre_BuildTools.mk @@ -10,8 +10,8 @@ ifeq (,$(filter WNT,$(OS))) gb_GENGAL = gengal.bin -else - gb_GENGAL = gengal.exe +else # windows appends the .exe + gb_GENGAL = gengal endif # Tools we need to build for cross-compiling commit 8ea55978c37bdd2b9b7983a6b4b3bfd44b72c7f7 Author: Michael Meeks <[email protected]> Date: Mon May 13 17:52:18 2013 +0100 gallery: convert text-shapes to new build logic. Change-Id: Ia45a2eed7104b376b92290e1a40219e8988d927b diff --git a/extras/Gallery_txtshapes.mk b/extras/Gallery_txtshapes.mk new file mode 100644 index 0000000..85645a5 --- /dev/null +++ b/extras/Gallery_txtshapes.mk @@ -0,0 +1,53 @@ +# -*- 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_Gallery_Gallery,txtshapes,extras/source/gallery/txtshapes)) + +$(eval $(call gb_Gallery_add_files,txtshapes,\ + extras/source/gallery/txtshapes/Circle01-DarkBlue.png \ + extras/source/gallery/txtshapes/Circle02-LightBlue.png \ + extras/source/gallery/txtshapes/Circle03-Green.png \ + extras/source/gallery/txtshapes/Circle04-DarkRed.png \ + extras/source/gallery/txtshapes/Circle05-Orange.png \ + extras/source/gallery/txtshapes/Hexagon01-DarkBlue.png \ + extras/source/gallery/txtshapes/Hexagon02-Blue.png \ + extras/source/gallery/txtshapes/Hexagon03-Green.png \ + extras/source/gallery/txtshapes/Hexagon04-DarkRed.png \ + extras/source/gallery/txtshapes/Hexagon05-Orange.png \ + extras/source/gallery/txtshapes/Leaf01-DarkBlue.png \ + extras/source/gallery/txtshapes/Leaf02-LightBlue.png \ + extras/source/gallery/txtshapes/Leaf03-Green.png \ + extras/source/gallery/txtshapes/Leaf04-DarkRed.png \ + extras/source/gallery/txtshapes/Leaf05-Orange.png \ + extras/source/gallery/txtshapes/Paster01-DarkBlue.png \ + extras/source/gallery/txtshapes/Paster02-LightBlue.png \ + extras/source/gallery/txtshapes/Paster03-Green.png \ + extras/source/gallery/txtshapes/Paster04-Red.png \ + extras/source/gallery/txtshapes/Paster05-Orange.png \ + extras/source/gallery/txtshapes/Rectangle01-DarkBlue.png \ + extras/source/gallery/txtshapes/Rectangle02-LightBlue.png \ + extras/source/gallery/txtshapes/Rectangle03-Green.png \ + extras/source/gallery/txtshapes/Rectangle04-DarkRed.png \ + extras/source/gallery/txtshapes/Rectangle05-Orange.png \ + extras/source/gallery/txtshapes/Rectangle06-Striped-Blue.png \ + extras/source/gallery/txtshapes/Rectangle07-Striped-Green.png \ + extras/source/gallery/txtshapes/Rectangle08-Striped-Red.png \ + extras/source/gallery/txtshapes/Rectangle09-Striped-Orange.png \ + extras/source/gallery/txtshapes/Square01-DarkBlue.png \ + extras/source/gallery/txtshapes/Square02-LightBlue.png \ + extras/source/gallery/txtshapes/Square03-Green.png \ + extras/source/gallery/txtshapes/Square04-DarkRed.png \ + extras/source/gallery/txtshapes/Square05-Orange.png \ + extras/source/gallery/txtshapes/Square06-Striped-Blue.png \ + extras/source/gallery/txtshapes/Square07-Striped-Green.png \ + extras/source/gallery/txtshapes/Square08-Striped-Red.png \ + extras/source/gallery/txtshapes/Square09-Striped-Orange.png \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/extras/Module_extras.mk b/extras/Module_extras.mk index 82fc5ea..f830186 100644 --- a/extras/Module_extras.mk +++ b/extras/Module_extras.mk @@ -36,7 +36,6 @@ $(eval $(call gb_Module_add_targets,extras,\ Package_gallsymbols \ Package_gallsystem \ Package_galltransport \ - Package_galltxtshapes \ Package_gallwwwback \ Package_gallwwwgraf \ Package_glade \ @@ -57,6 +56,7 @@ $(eval $(call gb_Module_add_targets,extras,\ ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) $(eval $(call gb_Module_add_targets,extras,\ Gallery_sound \ + Gallery_txtshapes \ )) endif diff --git a/extras/Package_galltxtshapes.mk b/extras/Package_galltxtshapes.mk deleted file mode 100644 index 7040c7c..0000000 --- a/extras/Package_galltxtshapes.mk +++ /dev/null @@ -1,55 +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_Package_Package,extras_galltxtshapes,$(SRCDIR)/extras/source/gallery/txtshapes)) - -$(eval $(call gb_Package_set_outdir,extras_galltxtshapes,$(INSTDIR))) - -$(eval $(call gb_Package_add_files,extras_galltxtshapes,share/gallery/textshapes,\ - Circle01-DarkBlue.png \ - Circle02-LightBlue.png \ - Circle03-Green.png \ - Circle04-DarkRed.png \ - Circle05-Orange.png \ - Hexagon01-DarkBlue.png \ - Hexagon02-Blue.png \ - Hexagon03-Green.png \ - Hexagon04-DarkRed.png \ - Hexagon05-Orange.png \ - Leaf01-DarkBlue.png \ - Leaf02-LightBlue.png \ - Leaf03-Green.png \ - Leaf04-DarkRed.png \ - Leaf05-Orange.png \ - Paster01-DarkBlue.png \ - Paster02-LightBlue.png \ - Paster03-Green.png \ - Paster04-Red.png \ - Paster05-Orange.png \ - Rectangle01-DarkBlue.png \ - Rectangle02-LightBlue.png \ - Rectangle03-Green.png \ - Rectangle04-DarkRed.png \ - Rectangle05-Orange.png \ - Rectangle06-Striped-Blue.png \ - Rectangle07-Striped-Green.png \ - Rectangle08-Striped-Red.png \ - Rectangle09-Striped-Orange.png \ - Square01-DarkBlue.png \ - Square02-LightBlue.png \ - Square03-Green.png \ - Square04-DarkRed.png \ - Square05-Orange.png \ - Square06-Striped-Blue.png \ - Square07-Striped-Green.png \ - Square08-Striped-Red.png \ - Square09-Striped-Orange.png \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/extras/source/gallery/share/gallery_names.ulf b/extras/source/gallery/share/gallery_names.ulf index 47f75b5..35e3c49 100644 --- a/extras/source/gallery/share/gallery_names.ulf +++ b/extras/source/gallery/share/gallery_names.ulf @@ -9,4 +9,7 @@ [sound] en-US = "Sounds" +[txtshapes] +en-US = "Text Shapes" + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index 405da24..3b0bcce 100755 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -285,7 +285,7 @@ End Value = STRING(CONCAT2(LibreOffice.,name)); \ Styles = (); \ End - + #define REGISTRY_ENTRY_KINDMAP(name, modid, key) \ RegistryItem CONCAT2(gid_Regitem_Software_Manufacturer_Productname_Productversion_Explorer_KindMap_,name) \ ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; \ @@ -422,5 +422,15 @@ End Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); \ End -#endif // MACROS_INC +#define GALLERY_NAME(id) \ + +#define GALLERY_FILELIST(id) \ +File gid_File_Extra_Gall##id \ + Dir = FILELIST_DIR; \ + TXT_FILE_BODY; \ + Styles = (FILELIST, WORKSTATION, DONT_OVERWRITE); \ + Name = STRING(CONCAT3(Gallery/,id,.filelist)); \ +End + +#endif // MACROS_INC diff --git a/scp2/source/ooo/file_extra_ooo.scp b/scp2/source/ooo/file_extra_ooo.scp index 1ec4e9f..feb17f9 100644 --- a/scp2/source/ooo/file_extra_ooo.scp +++ b/scp2/source/ooo/file_extra_ooo.scp @@ -224,19 +224,8 @@ File gid_File_Extra_Galltransport Name = "extras_galltransport.filelist"; End -File gid_File_Extra_Galltxtshapes - Dir = FILELIST_DIR; - TXT_FILE_BODY; - Styles = (FILELIST); - Name = "extras_galltxtshapes.filelist"; -End - -File gid_File_Extra_Gallsound - Dir = FILELIST_DIR; - USER_FILE_BODY; - Styles = (FILELIST, WORKSTATION, DONT_OVERWRITE); - Name = "Gallery/sound.filelist"; -End +GALLERY_FILELIST(txtshapes) +GALLERY_FILELIST(sound) File gid_File_Extra_Gallmytheme Dir = FILELIST_DIR; diff --git a/solenv/bin/desktop-translate.pl b/solenv/bin/desktop-translate.pl index 21d80ab..2b7b882 100644 --- a/solenv/bin/desktop-translate.pl +++ b/solenv/bin/desktop-translate.pl @@ -116,15 +116,19 @@ while (<SOURCE>) { close(SOURCE); +my $processed = 0; # process templates foreach $template (keys %templates) { my $outfile = $templates{$template}->{'outfile'}; # open the template file - ignore sections for which no # templates exist - unless(open(TEMPLATE, $outfile)) { - print STDERR "Warning: No template found for item '$template' : '$outfile' : '$_': $!\n"; - exit -1; + if (open(TEMPLATE, $outfile)) { + $processed++; + } elsif ($ext eq 'str') { # string files processed one by one + next; + } else { + die "Warning: No template found for item '$template' : '$outfile' : '$_': $!\n"; } # open output file @@ -161,3 +165,7 @@ foreach $template (keys %templates) { system "mv -f $outfile.tmp $outfile\n"; } } + +if ($ext eq 'str' && $processed == 0) { + die "Warning: No matching templates processed"; +} _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
