diff options
| author | Oliver Bolte <obo@openoffice.org> | 2009-06-09 07:12:06 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2009-06-09 07:12:06 +0000 |
| commit | b93c60c3735fa0c998f22d67477c566958a6ae13 (patch) | |
| tree | 3638e64dc78f0ce021cc4ba539975d1a6e88cb70 | |
| parent | 38941660cbaf179b5e447bbf8d8e2a4b487ede4d (diff) | |
CWS-TOOLING: integrate CWS ooo31osol
2009-05-14 15:49:09 +0200 ihi r271896 : #i101913# added missing solaris entries
2009-05-14 12:36:19 +0200 ihi r271885 : #i101913# ARCH -> all
2009-05-13 11:14:52 +0200 jl r271846 : #i101457# Do not search for Java every time OOo starts
2009-05-13 08:49:28 +0200 jl r271838 : #tr6585548# Redone last change. On Solaris we do not scan the directories anymore and instead just ckeck /usr/jdk/latest
2009-05-12 17:10:03 +0200 jl r271828 : #i64357# We scan on Unix only for a java in different folders if we haven't found one by looking into JAVA_HOME or PATH
2009-05-12 13:17:04 +0200 releng r271819 : #i101457# avoiding usage of faspac with switch DONTCOMPRESS
2009-05-12 13:08:28 +0200 is r271816 : #i101457# avoiding usage of faspac with switch DONTCOMPRESS
| -rw-r--r-- | sysui/desktop/solaris/makefile.mk | 4 | ||||
| -rw-r--r-- | sysui/desktop/solaris/pkginfo | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/sysui/desktop/solaris/makefile.mk b/sysui/desktop/solaris/makefile.mk index 9a2c606f62..32dc11be96 100644 --- a/sysui/desktop/solaris/makefile.mk +++ b/sysui/desktop/solaris/makefile.mk @@ -49,7 +49,7 @@ TARGET=solaris PKGFILES = $(BIN)$/pkg$/{$(PRODUCTLIST)}-desktop-integration.tar.gz PKGDATESTRING = $(shell @date -u +%Y.%m.%d) -PKGARCH=sparc,i386 +PKGARCH=all FASPAC=`test -f $(SOLARBINDIR)/faspac-so.sh && echo "/sbin/sh" || echo "echo"` @@ -125,7 +125,9 @@ $(PKGFILES) : $(MISC)$/{$(PRODUCTLIST)}$/prototype @-$(RM) $(BIN)$/$(@:f) @$(MKDIRHIER) $(@:d) pkgmk -l 1073741824 -r . -f $(MISC)$/$(@:b:b:s/-/ /:1)$/prototype -o -d $(PKGDIR) ARCH=$(PKGARCH) VERSION=$(PKGVERSION.$(@:b:s/-/ /:1)),REV=$(PKGREV).$(PKGDATESTRING) +.IF "$(DONTCOMPRESS)"=="" $(FASPAC) $(SOLARBINDIR)/faspac-so.sh -a -d $(PKGDIR) $(@:b:b:s/-/ /:1:s/.//)$(PRODUCTVERSIONSHORT)-desktop-int +.ENDIF # "$(DONTCOMPRESS)"=="" @tar -cf - -C $(PKGDIR) $(@:b:b:s/-/ /:1:s/.//)$(PRODUCTVERSIONSHORT)-desktop-int | gzip > $@ @rm -rf $(PKGDIR)/$(@:b:b:s/-/ /:1:s/.//)$(PRODUCTVERSIONSHORT)-desktop-int diff --git a/sysui/desktop/solaris/pkginfo b/sysui/desktop/solaris/pkginfo index 8fbf60ec81..4f7f42df83 100644 --- a/sysui/desktop/solaris/pkginfo +++ b/sysui/desktop/solaris/pkginfo @@ -11,3 +11,6 @@ SUNW_PKGVERS=1.0 CLASSES=none build OFFICE_PATH= LEGACY_GNOME="false" +DESC=Desktop integration for %PRODUCTNAME +SUNW_PRODNAME=%PRODUCTNAME +SUNW_PRODVERS=3 |