summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--extras/Gallery_sound.mk2
-rw-r--r--extras/Gallery_transportation.mk2
-rw-r--r--extras/Gallery_txtshapes.mk2
-rw-r--r--extras/Module_extras.mk1
-rw-r--r--extras/Package_gallsounds.mk52
-rw-r--r--extras/Package_gallsystem.mk6
-rwxr-xr-xextras/source/gallery/gallery_system/sg18.sdgbin70613 -> 0 bytes
-rwxr-xr-xextras/source/gallery/gallery_system/sg18.sdvbin2048 -> 0 bytes
-rwxr-xr-xextras/source/gallery/gallery_system/sg18.thmbin1038 -> 0 bytes
-rwxr-xr-xextras/source/gallery/gallery_system/sg19.sdgbin196261 -> 0 bytes
-rwxr-xr-xextras/source/gallery/gallery_system/sg19.sdvbin2048 -> 0 bytes
-rwxr-xr-xextras/source/gallery/gallery_system/sg19.thmbin2155 -> 0 bytes
-rwxr-xr-xscp2/inc/macros.inc6
-rw-r--r--solenv/gbuild/Gallery.mk15
-rw-r--r--solenv/gbuild/Package.mk1
15 files changed, 22 insertions, 65 deletions
diff --git a/extras/Gallery_sound.mk b/extras/Gallery_sound.mk
index 358da05a774c..b48a2f05d392 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 8b84c9637171..605782f4ab77 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 85645a504955..df8bc3a32c53 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 3551ce02606f..a92c3072de88 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 61a093f9f4e0..000000000000
--- 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 441dbfd585bb..eaf925410c59 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 fb0bf91c5651..000000000000
--- a/extras/source/gallery/gallery_system/sg18.sdg
+++ /dev/null
Binary files differ
diff --git a/extras/source/gallery/gallery_system/sg18.sdv b/extras/source/gallery/gallery_system/sg18.sdv
deleted file mode 100755
index 444959152744..000000000000
--- a/extras/source/gallery/gallery_system/sg18.sdv
+++ /dev/null
Binary files differ
diff --git a/extras/source/gallery/gallery_system/sg18.thm b/extras/source/gallery/gallery_system/sg18.thm
deleted file mode 100755
index 4683a2fb5ede..000000000000
--- a/extras/source/gallery/gallery_system/sg18.thm
+++ /dev/null
Binary files differ
diff --git a/extras/source/gallery/gallery_system/sg19.sdg b/extras/source/gallery/gallery_system/sg19.sdg
deleted file mode 100755
index c140012d26be..000000000000
--- a/extras/source/gallery/gallery_system/sg19.sdg
+++ /dev/null
Binary files differ
diff --git a/extras/source/gallery/gallery_system/sg19.sdv b/extras/source/gallery/gallery_system/sg19.sdv
deleted file mode 100755
index 444959152744..000000000000
--- a/extras/source/gallery/gallery_system/sg19.sdv
+++ /dev/null
Binary files differ
diff --git a/extras/source/gallery/gallery_system/sg19.thm b/extras/source/gallery/gallery_system/sg19.thm
deleted file mode 100755
index 6aa8926119a3..000000000000
--- a/extras/source/gallery/gallery_system/sg19.thm
+++ /dev/null
Binary files differ
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index 3b0bcce86448..066354e760dd 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 7b282382b109..19b79b3bf2ea 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_internal,$(call gb_Gallery_get_files_packagename,$(1)),$(SRCDIR)/$(2))
+$(call gb_Package_set_outdir,$(call gb_Gallery_get_files_packagename,$(1)),$(INSTDIR))
+
endef
@@ -129,6 +136,7 @@ $(call gb_Gallery_get_workdir,$(1))/$(1).sdg \
$(call gb_Gallery_get_workdir,$(1))/$(1).sdv \
$(call gb_Gallery_get_workdir,$(1))/$(1).thm : $(call gb_Gallery_get_target,$(1))
$(call gb_Gallery__get_final_target,$(1)) : $(call gb_Package_get_target,$(2))
+
$(call gb_Gallery_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(2))
$(call gb_Gallery_get_target,$(1)) :| $(dir $(call gb_Gallery_get_target,$(1))).dir \
$(call gb_Gallery_get_workdir,$(1))/.dir
@@ -169,8 +177,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 +189,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 dc5b44121b3a..d743ac8a81d3 100644
--- a/solenv/gbuild/Package.mk
+++ b/solenv/gbuild/Package.mk
@@ -127,6 +127,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)
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-25 20:32:11 +0000