Tag: cws_src680_rpt23fix01 User: oj Date: 2007-07-19 11:06:22+0000 Modified: dba/reportdesign/util/makefile.mk
Log: #i79598# makefile description changes File Changes: Directory: /dba/reportdesign/util/ ================================== File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/reportdesign/util/makefile.mk?r1=1.2.2.6&r2=1.2.2.7 Delta lines: +21 -23 --------------------- --- makefile.mk 2007-07-19 09:26:21+0000 1.2.2.6 +++ makefile.mk 2007-07-19 11:06:19+0000 1.2.2.7 @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.2.2.6 $ +# $Revision: 1.2.2.7 $ # -# last change: $Author: oj $ $Date: 2007/07/19 09:26:21 $ +# last change: $Author: oj $ $Date: 2007/07/19 11:06:19 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -206,14 +206,20 @@ ZIP1TARGET=sun-report-builder ZIP1FLAGS=-r -ZIP1DIR=$(OUT)$/zip +ZIP1DIR=$(MISC)$/zip ZIP1LIST=* ZIP1EXT=.oxt XMLFILES := $(ZIP1DIR)$/description.xml \ $(ZIP1DIR)$/META-INF$/manifest.xml -TXTFILES := $(subst,$(SOLARBINDIR)$/osl,$(ZIP1DIR)$/registration $(shell $(FIND) $(SOLARBINDIR)$/osl -name "license_*.txt")) +.IF "$(GUI)"!="WNT" +TXTFILES:=$(foreach,i,$(WITH_LANG) $(ZIP1DIR)$/registration$/LICENSE_$i) +LICLINES:=$(foreach,i,$(TXTFILES) <license-text xlink:href="registration/$(i:f)" lang="$(subst,LICENSE_, $(i:f))" />) +.ELSE # "$(GUI)"!="WNT" +TXTFILES:=$(foreach,i,$(WITH_LANG) $(ZIP1DIR)$/registration$/license_$i.txt) +LICLINES:=$(foreach,i,$(TXTFILES) <license-text xlink:href="registration/$(i:f)" lang="$(subst,.txt, $(subst,license_, $(i:f)))" />) +.ENDIF # "$(GUI)"!="WNT" HTMLFILES := $(ZIP1DIR)$/THIRDPARTYREADMELICENSE.html @@ -238,23 +244,12 @@ $(ZIP1TARGETN) : $(TXTFILES) $(XMLFILES) $(HTMLFILES) $(REPRORTJARFILES) .ENDIF # "$(ZIP1TARGETN)"!=" -$(ZIP1DIR)$/description.xml : description.xml +$(ZIP1DIR)$/description.xml : pre.xml post.xml @@-$(MKDIRHIER) $(@:d) @@-$(RM) $(ZIP1DIR)$/description.xml - echo `<`?xml version="1.0" encoding="utf-8"?`>`` > $(ZIP1DIR)$/description.xml - echo `<`description xmlns="http://openoffice.org/extensions/description/2006"; xmlns:d="http://openoffice.org/extensions/description/2006"; >> $(ZIP1DIR)$/description.xml - echo xmlns:xlink="http://www.w3.org/1999/xlink"`>` >> $(ZIP1DIR)$/description.xml - echo `<`registration`>` >> $(ZIP1DIR)$/description.xml - echo `<`simple-license accept-by="admin" default-license-id="en-US"`>` >> $(ZIP1DIR)$/description.xml - $(foreach,i,$(TXTFILES) $(shell echo `<`license-text xlink:href="registration/$(i:f)" lang="$(subst,.txt, $(subst,license_, $(i:f)))" /`>` >> $(ZIP1DIR)$/description.xml) ) - echo `<`/simple-license`>` >> $(ZIP1DIR)$/description.xml - echo `<`/registration`>` >> $(ZIP1DIR)$/description.xml - echo `<`version value="1.0.0" /`>` >> $(ZIP1DIR)$/description.xml - echo `<`identifier value="com.sun.reportdesigner" /`>` >> $(ZIP1DIR)$/description.xml - echo `<`dependencies`>` >> $(ZIP1DIR)$/description.xml - echo `<`OpenOffice.org-minimal-version value="2.3" d:name="OpenOffice.org 2.3" /`>` >> $(ZIP1DIR)$/description.xml - echo `<`/dependencies`>` >> $(ZIP1DIR)$/description.xml - echo `<`/description`>` >> $(ZIP1DIR)$/description.xml + $(TYPE) pre.xml > $@ + $(TYPE) $(mktmp $(LICLINES)) >> $@ + $(TYPE) post.xml >> $@ $(ZIP1DIR)$/%.xml : %.xml @@-$(MKDIRHIER) $(@:d) @@ -276,12 +271,15 @@ @@-$(MKDIRHIER) $(@:d) $(COPY) $< $@ +$(ZIP1DIR)$/registration$/LICENSE_% : $(SOLARBINDIR)$/osl$/LICENSE_% + @@-$(MKDIRHIER) $(@:d) + $(COPY) $< $@ + $(ZIP1DIR)$/THIRDPARTYREADMELICENSE.html : THIRDPARTYREADMELICENSE.html @@-$(MKDIRHIER) $(@:d) $(COPY) $< $@ -.ELSE +.ELSE # "$(SOLAR_JAVA)"!=" .INCLUDE : target.mk -# endif JAVA -.ENDIF - +.ENDIF # "$(SOLAR_JAVA)"!=" +# --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
