diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2013-05-08 17:10:02 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2013-05-15 09:37:39 +0100 |
| commit | 22ca7c45b91d6f32de9f9b48c72d5b9d2374234d (patch) | |
| tree | 7749e667b9aeb118ef0be94b4582c46d4009f5e6 /solenv | |
| parent | bb6b011fbbafb93d47620d5b4d05a721343147f5 (diff) | |
galleries: implement first self-built sound gallery
Change-Id: Ibbf8f1f8b1590af461dfa5885adb1027580f8f15
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/Gallery.mk | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/solenv/gbuild/Gallery.mk b/solenv/gbuild/Gallery.mk index eae9b680926b..28a8f00a3591 100644 --- a/solenv/gbuild/Gallery.mk +++ b/solenv/gbuild/Gallery.mk @@ -59,6 +59,7 @@ $(call gb_Helper_abbreviate_dirs,\ SAL_USE_VCLPLUGIN=svp \ $(call gb_Executable_get_command,gengal.bin) \ $(call gb_Gallery__make_env_args) \ + --build-tree \ --destdir $(GALLERY_BASEDIR) \ --name "$(GALLERY_NAME)" \ --path $(call gb_Gallery_get_workdir,$(2))) \ @@ -98,11 +99,14 @@ $(WORKDIR)/Gallery/%.sdv : $(WORKDIR)/Gallery/%.thm : touch $@ +$(WORKDIR)/Gallery/%.sdg : + touch $@ + gb_Gallery_get_packagename = Gallery/$(1) # Create a gallery. # -# basedir will be stripped from paths of the files when they are +# basedir less one directory will be stripped from paths of the files when they are # inserted into the gallery. # # gb_Gallery_Gallery gallery basedir name @@ -115,10 +119,12 @@ endef define gb_Gallery__Gallery_impl $(call gb_Package_Package_internal,$(2),$(call gb_Gallery_get_workdir,$(1))) $(call gb_Package_set_outdir,$(2),$(INSTDIR)) +$(call gb_Package_add_file,$(2),$(gb_Gallery_INSTDIR)/$(1).sdg,sg1.sdg) $(call gb_Package_add_file,$(2),$(gb_Gallery_INSTDIR)/$(1).sdv,sg1.sdv) $(call gb_Package_add_file,$(2),$(gb_Gallery_INSTDIR)/$(1).thm,sg1.thm) -$(call gb_Gallery_get_target,$(1)) : GALLERY_BASEDIR := $(SRCDIR)/$(3) +# strip URL, without / to help the internal gallery system +$(call gb_Gallery_get_target,$(1)) : GALLERY_BASEDIR := $(patsubst %/,%,$(call gb_Helper_make_url,$(dir $(SRCDIR)/$(3)))) $(call gb_Gallery_get_target,$(1)) : GALLERY_FILES := $(call gb_Gallery_get_target,$(1)) : GALLERY_NAME := $(4) |