summaryrefslogtreecommitdiff
path: root/sysui/desktop/suse
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2004-11-26 20:39:01 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2004-11-26 20:39:01 +0000
commit5ba1a62244d8d521a1495ff6b8e31281810a10cb (patch)
treec34697f104e6bc914fd7e632a5c52a958b571cf1 /sysui/desktop/suse
parentce7caf68b0efdd8495940512b38e36eb9887b473 (diff)
INTEGRATION: CWS sysint1 (1.6.12); FILE MERGED
2004/11/17 11:00:03 obr 1.6.12.2: #i36832#,#i37080# new document names and extensions 2004/11/15 12:54:40 obr 1.6.12.1: #i36832# new document/application icons for GNOME and KDE
Diffstat (limited to 'sysui/desktop/suse')
-rw-r--r--sysui/desktop/suse/makefile.mk56
1 files changed, 41 insertions, 15 deletions
diff --git a/sysui/desktop/suse/makefile.mk b/sysui/desktop/suse/makefile.mk
index a7e5880ce469..3961b6035f58 100644
--- a/sysui/desktop/suse/makefile.mk
+++ b/sysui/desktop/suse/makefile.mk
@@ -72,6 +72,8 @@ TARGET=suse
# --- Files --------------------------------------------------------
+ICONPREFIX = $(UNIXFILENAME:s/.//)
+
LAUNCHERLIST = writer calc draw impress math base printeradmin
LAUNCHERDEPN = ../menus/{$(LAUNCHERLIST)}.desktop
LAUNCHERDIR = $(shell cd $(MISC)$/$(TARGET); pwd)
@@ -101,9 +103,24 @@ MIMELIST = \
oasis-presentation-template \
oasis-formula \
oasis-master-document \
- oasis-database
+ oasis-database \
+ oasis-web-template \
+
+HCMIMEICONLIST = \
+ oasis-text \
+ oasis-text-template \
+ oasis-spreadsheet \
+ oasis-spreadsheet-template \
+ oasis-drawing \
+ oasis-drawing-template \
+ oasis-presentation \
+ oasis-presentation-template \
+ oasis-formula \
+ oasis-master-document \
+ oasis-database \
+ oasis-web-template
-MIMEICONLIST = \
+MIMEICONLIST = $(HCMIMEICONLIST) \
text \
text-template \
spreadsheet \
@@ -114,7 +131,7 @@ MIMEICONLIST = \
presentation-template \
formula \
master-document \
- database
+ database
GNOMEMIMEDEPN = ../mimetypes/{$(MIMELIST)}.keys
KDEMIMEDEPN = ../mimetypes/{$(MIMELIST)}.desktop
@@ -123,14 +140,18 @@ KDEMIMEFLAGFILE = \
$(MISC)/$(TARGET)/opt/kde3/share/mimelnk/application.flag
GNOMEICONLIST = \
- {16x16 32x32 48x48}/apps/$(UNIXFILENAME)-{$(LAUNCHERLIST)}.png \
- {16x16 32x32 48x48}/mimetypes/$(UNIXFILENAME)-{$(MIMEICONLIST)}.png
+ {16x16 32x32 48x48}/apps/$(ICONPREFIX)-{$(LAUNCHERLIST)}.png \
+ {16x16 32x32 48x48}/mimetypes/$(ICONPREFIX)-{$(MIMEICONLIST)}.png
+
+HCICONLIST = \
+ HighContrast/{16x16 32x32 48x48}/apps/$(ICONPREFIX)-{$(LAUNCHERLIST)}.png \
+ HighContrast/{16x16 32x32 48x48}/mimetypes/$(ICONPREFIX)-{$(HCMIMEICONLIST)}.png
KDEICONLIST = \
- hicolor/{16x16 32x32 48x48}/apps/$(UNIXFILENAME)-{$(LAUNCHERLIST)}.png \
- hicolor/{16x16 32x32 48x48}/mimetypes/$(UNIXFILENAME)-{$(MIMEICONLIST)}.png \
- locolor/{16x16 32x32}/apps/$(UNIXFILENAME)-{$(LAUNCHERLIST)}.png \
- locolor/{16x16 32x32}/mimetypes/$(UNIXFILENAME)-{$(MIMEICONLIST)}.png
+ hicolor/{16x16 32x32 48x48}/apps/$(ICONPREFIX)-{$(LAUNCHERLIST)}.png \
+ hicolor/{16x16 32x32 48x48}/mimetypes/$(ICONPREFIX)-{$(MIMEICONLIST)}.png \
+ locolor/{16x16 32x32}/apps/$(ICONPREFIX)-{$(LAUNCHERLIST)}.png \
+ locolor/{16x16 32x32}/mimetypes/$(ICONPREFIX)-{$(MIMEICONLIST)}.png
.IF "$(RPM)"!=""
@@ -143,6 +164,7 @@ RPMDEPN = \
$(MISC)/$(TARGET)/opt/gnome2/share/mime-info/$(UNIXFILENAME).mime \
$(MISC)/$(TARGET)/opt/kde3/share/mimelnk/application.flag \
$(MISC)/$(TARGET)/opt/gnome2/share/icons/gnome/{$(GNOMEICONLIST)} \
+ $(MISC)/$(TARGET)/opt/gnome2/share/icons/{$(HCICONLIST)} \
$(MISC)/$(TARGET)/opt/kde3/share/icons/{$(KDEICONLIST)}
RPMDIR = $(shell cd $(BIN); pwd)
@@ -168,7 +190,7 @@ $(LAUNCHERFLAGFILES) : $(LAUNCHERDEPN) ../productversion.mk ../share/brand.pl ..
@$(MKDIRHIER) $(@:db)
@echo Creating desktop entries ..
@echo ---------------------------------
- @$(PERL) ../share/brand.pl -p "$(LONGPRODUCTNAME)" -u $(UNIXFILENAME) --prefix "$(UNIXFILENAME)-" --iconprefix "$(UNIXFILENAME)-" $(LAUNCHERDEPN) $(@:db)
+ @$(PERL) ../share/brand.pl -p "$(LONGPRODUCTNAME)" -u $(UNIXFILENAME) --prefix "$(UNIXFILENAME)-" --iconprefix "$(ICONPREFIX)-" $(LAUNCHERDEPN) $(@:db)
@$(PERL) ../share/translate.pl -p "$(LONGPRODUCTNAME)" -d $(@:db) --prefix "$(UNIXFILENAME)-" --ext "desktop" --key "Name" $(ULFDIR)/launcher_name.ulf
@$(PERL) ../share/translate.pl -p "$(LONGPRODUCTNAME)" -d $(@:db) --prefix "$(UNIXFILENAME)-" --ext "desktop" --key "Comment" $(ULFDIR)/launcher_comment.ulf
.IF "$(WITH_LIBSN)"=="YES"
@@ -182,11 +204,15 @@ $(LAUNCHERFLAGFILES) : $(LAUNCHERDEPN) ../productversion.mk ../share/brand.pl ..
# This target is responsible for copying the GNOME icons to their package specific target
# e.g. $(LAUNCHERDIR)/opt/gnome2/share/icons/gnome/16x16/apps/openoffice-writer.png
#
-$(MISC)/$(TARGET)/opt/gnome2/share/icons/gnome/{$(GNOMEICONLIST)} : ../icons/hicolor/$$(@:d:d:d:d:f)/$$(@:d:d:f)/$$(@:f:s/$(UNIXFILENAME)-//)
+$(MISC)/$(TARGET)/opt/gnome2/share/icons/gnome/{$(GNOMEICONLIST)} : ../icons/hicolor/$$(@:d:d:d:d:f)/$$(@:d:d:f)/$$(@:f:s/$(ICONPREFIX)-//)
+ @$(MKDIRHIER) $(@:d)
+ @$(COPY) $< $@
+
+$(MISC)/$(TARGET)/opt/gnome2/share/icons/{$(HCICONLIST)} : ../icons/$$(@:d:d:d:d:d:d:f)/$$(@:d:d:d:d:f)/$$(@:d:d:f)/$$(@:f:s/$(ICONPREFIX)-//)
@$(MKDIRHIER) $(@:d)
@$(COPY) $< $@
-$(MISC)/$(TARGET)/opt/kde3/share/icons/{$(KDEICONLIST)} : ../icons/$$(@:d:d:d:d:d:d:f)/$$(@:d:d:d:d:f)/$$(@:d:d:f)/$$(@:f:s/$(UNIXFILENAME)-//)
+$(MISC)/$(TARGET)/opt/kde3/share/icons/{$(KDEICONLIST)} : ../icons/$$(@:d:d:d:d:d:d:f)/$$(@:d:d:d:d:f)/$$(@:d:d:f)/$$(@:f:s/$(ICONPREFIX)-//)
@$(MKDIRHIER) $(@:d)
@$(COPY) $< $@
@@ -196,7 +222,7 @@ $(MISC)/$(TARGET)/opt/gnome2/share/mime-info/$(UNIXFILENAME).keys : $(GNOMEMIMED
@$(MKDIRHIER) $(@:d)
@echo Creating GNOME .keys file ..
@echo ---------------------------------
- @$(PERL) ../share/brand.pl -p $(PRODUCTNAME) -u $(UNIXFILENAME) --iconprefix "$(UNIXFILENAME)-" $(GNOMEMIMEDEPN) $(MISC)/$(TARGET)
+ @$(PERL) ../share/brand.pl -p $(PRODUCTNAME) -u $(UNIXFILENAME) --iconprefix "$(ICONPREFIX)-" $(GNOMEMIMEDEPN) $(MISC)/$(TARGET)
@$(PERL) ../share/translate.pl -p $(PRODUCTNAME) -d $(MISC)/$(TARGET) --ext "keys" --key "description" $(ULFDIR)/documents.ulf
@cat $(MISC)/$(TARGET)/{$(MIMELIST)}.keys > $@
@@ -210,7 +236,7 @@ $(KDEMIMEFLAGFILE) : $(KDEMIMEDEPN) ../productversion.mk ../share/brand.pl ../sh
@$(MKDIRHIER) $(@:db)
@echo Creating KDE mimelnk entries ..
@echo ---------------------------------
- @$(PERL) ../share/brand.pl -p "$(PRODUCTNAME)" -u $(UNIXFILENAME) --prefix "$(UNIXFILENAME)-" --iconprefix "$(UNIXFILENAME)-" $(KDEMIMEDEPN) $(@:db)
+ @$(PERL) ../share/brand.pl -p "$(PRODUCTNAME)" -u $(UNIXFILENAME) --prefix "$(UNIXFILENAME)-" --iconprefix "$(ICONPREFIX)-" $(KDEMIMEDEPN) $(@:db)
@$(PERL) ../share/translate.pl -p "$(PRODUCTNAME)" -d $(@:db) --prefix "$(UNIXFILENAME)-" --ext "desktop" --key "Comment" $(ULFDIR)/documents.ulf
@touch $@
@@ -223,7 +249,7 @@ $(MISC)/$(TARGET)/opt/gnome2/share/application-registry/$(UNIXFILENAME).applicat
# --- packaging ---------------------------------------------------
$(RPMFLAGFILE) : $(RPMDEPN)
- @cat $(@:b)-menus.spec | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME)/" -e "s/Version: .*/Version: $(PKGVERSION)/" -e "s/Release: .*/Release: $(PKGREV)/" > $(@:db)-menus.spec
+ @cat $(@:b)-menus.spec | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME)/" -e "s/%ICONPREFIX/$(ICONPREFIX)/" -e "s/Version: .*/Version: $(PKGVERSION)/" -e "s/Release: .*/Release: $(PKGREV)/" > $(@:db)-menus.spec
@echo "%define _rpmdir $(RPMDIR)" >> $(@:db)-menus.spec
@$(RPM) -bb $(@:db)-menus.spec --buildroot $(LAUNCHERDIR) --target noarch
@touch $@