Tag: cws_oog680_rpt23fix05 User: oj Date: 2007-08-27 05:33:36+0000 Modified: dba/reportdesign/util/makefile.mk dba/reportdesign/util/pre.xml
Log: #79598# remove wrong license text from makefiel.mk File Changes: Directory: /dba/reportdesign/util/ ================================== File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/reportdesign/util/makefile.mk?r1=1.3.4.1&r2=1.3.4.1.4.1 Delta lines: +20 -15 --------------------- --- makefile.mk 2007-08-17 07:27:34+0000 1.3.4.1 +++ makefile.mk 2007-08-27 05:33:34+0000 1.3.4.1.4.1 @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.3.4.1 $ +# $Revision: 1.3.4.1.4.1 $ # -# last change: $Author: obo $ $Date: 2007/08/17 07:27:34 $ +# last change: $Author: oj $ $Date: 2007/08/27 05:33:34 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -215,9 +215,15 @@ HTMLFILES := $(ZIP1DIR)$/THIRDPARTYREADMELICENSE.html \ $(ZIP1DIR)$/readme_en-US.html \ - $(ZIP1DIR)$/readme_en-US.txt \ - $(ZIP1DIR)$/license_en-US.html \ - $(ZIP1DIR)$/registration$/license_en-US.txt + $(ZIP1DIR)$/readme_en-US.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" REPRORTJARFILES := \ $(ZIP1DIR)$/jcommon-1.0.10.jar \ @@ -237,15 +243,22 @@ .INCLUDE : target.mk .IF "$(ZIP1TARGETN)"!="" -$(ZIP1TARGETN) : $(XMLFILES) $(HTMLFILES) $(REPRORTJARFILES) +$(ZIP1TARGETN) : $(TXTFILES) $(XMLFILES) $(HTMLFILES) $(REPRORTJARFILES) .ENDIF # "$(ZIP1TARGETN)"!=" $(ZIP1DIR)$/description.xml : pre.xml post.xml @@-$(MKDIRHIER) $(@:d) @@-$(RM) $(ZIP1DIR)$/description.xml $(TYPE) pre.xml > $@ + $(TYPE) $(mktmp $(LICLINES)) >> $@ $(TYPE) post.xml >> $@ +$(ZIP1DIR)$/registration$/license_%.txt : $(SOLARBINDIR)$/osl$/license_%.txt + @@-$(MKDIRHIER) $(@:d) + +$(ZIP1DIR)$/registration$/LICENSE_% : $(SOLARBINDIR)$/osl$/LICENSE_% + @@-$(MKDIRHIER) $(@:d) + $(ZIP1DIR)$/%.xml : %.xml @@-$(MKDIRHIER) $(@:d) $(COPY) $< $@ @@ -266,14 +279,6 @@ @@-$(MKDIRHIER) $(@:d) $(COPY) $< $@ -$(ZIP1DIR)$/registration$/license_en-US.txt : $(PRJ)$/license$/license_en-US.txt - @@-$(MKDIRHIER) $(@:d) - $(COPY) $< $@ - -$(ZIP1DIR)$/license_en-US.html : $(PRJ)$/license$/license_en-US.html - @@-$(MKDIRHIER) $(@:d) - $(COPY) $< $@ - $(ZIP1DIR)$/THIRDPARTYREADMELICENSE.html : $(PRJ)$/license$/THIRDPARTYREADMELICENSE.html @@-$(MKDIRHIER) $(@:d) $(COPY) $< $@ File [changed]: pre.xml Url: http://dba.openoffice.org/source/browse/dba/reportdesign/util/pre.xml?r1=1.2.4.1&r2=1.2.4.1.4.1 Delta lines: +0 -2 ------------------- --- pre.xml 2007-08-17 07:27:46+0000 1.2.4.1 +++ pre.xml 2007-08-27 05:33:34+0000 1.2.4.1.4.1 @@ -4,5 +4,3 @@ xmlns:xlink="http://www.w3.org/1999/xlink";> <registration> <simple-license accept-by="admin" default-license-id="en-US" > - <license-text xlink:href="registration/license_en-US.txt" lang="en-US" /> - --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
