Tag: cws_src680_rpt23fix02 User: oj Date: 2007-07-24 12:49:02+0000 Removed: dba/reportdesign/util/license_de.txt dba/reportdesign/util/license_en_US.txt dba/reportdesign/util/description.xml
Modified: dba/reportdesign/util/makefile.mk dba/reportdesign/util/manifest.xml Log: merge from rpt23fix01 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&r2=1.2.4.1 Delta lines: +39 -13 --------------------- --- makefile.mk 2007-07-09 11:56:41+0000 1.2 +++ makefile.mk 2007-07-24 12:48:59+0000 1.2.4.1 @@ -47,6 +47,7 @@ .INCLUDE : settings.mk # ------------------------------------------------------------------ + # --- reportdesign core (rpt) ----------------------------------- LIB1TARGET=$(SLB)$/$(TARGET).lib @@ -54,7 +55,8 @@ $(SLB)$/api.lib \ $(SLB)$/coreshared.lib \ $(SLB)$/core_resource.lib \ - $(SLB)$/core_sdr.lib + $(SLB)$/core_sdr.lib \ + $(SLB)$/core_misc.lib SHL1TARGET=$(TARGET)$(UPD)$(DLLPOSTFIX) @@ -200,17 +202,24 @@ # create Extension ----------------------------- -ZIP1TARGET=reportdesign +.IF "$(SOLAR_JAVA)"!=" + +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 := $(ZIP1DIR)$/registration$/license_de.txt \ - $(ZIP1DIR)$/registration$/license_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" HTMLFILES := $(ZIP1DIR)$/THIRDPARTYREADMELICENSE.html @@ -226,13 +235,21 @@ $(ZIP1DIR)$/librepository-0.1.1.jar \ $(ZIP1DIR)$/libfonts-0.2.6.jar \ $(ZIP1DIR)$/jcommon-serializer-0.1.0.jar \ - $(ZIP1DIR)$/reportdesign.jar + $(ZIP1DIR)$/sun-report-builder.jar -.INCLUDE : target.mk # --- Targets ---------------------------------- -.IF "$(ZIP1TARGETN)"!="" +.INCLUDE : target.mk + +.IF "$(ZIP1TARGETN)"!=" $(ZIP1TARGETN) : $(TXTFILES) $(XMLFILES) $(HTMLFILES) $(REPRORTJARFILES) -.ENDIF # "$(ZIP1TARGETN)"!="" +.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)$/%.xml : %.xml @@-$(MKDIRHIER) $(@:d) @@ -250,10 +267,19 @@ @@-$(MKDIRHIER) $(@:d) $(COPY) $< $@ -$(ZIP1DIR)$/registration$/%.txt : %.txt +$(ZIP1DIR)$/registration$/license_%.txt : $(SOLARBINDIR)$/osl$/license_%.txt + @@-$(MKDIRHIER) $(@:d) + $(COPY) $< $@ + +$(ZIP1DIR)$/registration$/LICENSE_% : $(SOLARBINDIR)$/osl$/LICENSE_% @@-$(MKDIRHIER) $(@:d) $(COPY) $< $@ $(ZIP1DIR)$/THIRDPARTYREADMELICENSE.html : THIRDPARTYREADMELICENSE.html @@-$(MKDIRHIER) $(@:d) $(COPY) $< $@ + +.ELSE # "$(SOLAR_JAVA)"!=" +.INCLUDE : target.mk +.ENDIF # "$(SOLAR_JAVA)"!=" +# File [changed]: manifest.xml Url: http://dba.openoffice.org/source/browse/dba/reportdesign/util/manifest.xml?r1=1.2&r2=1.2.4.1 Delta lines: +1 -1 ------------------- --- manifest.xml 2007-07-09 11:56:41+0000 1.2 +++ manifest.xml 2007-07-24 12:48:59+0000 1.2.4.1 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE manifest:manifest PUBLIC "-//OpenOffice.org//DTD Manifest 1.0//EN" "Manifest.dtd"> <manifest:manifest xmlns:manifest="http://openoffice.org/2001/manifest";> - <manifest:file-entry manifest:media-type="application/vnd.sun.star.uno-component;type=Java" manifest:full-path="reportdesign.jar"/> + <manifest:file-entry manifest:media-type="application/vnd.sun.star.uno-component;type=Java" manifest:full-path="sun-report-builder.jar"/> </manifest:manifest> File [removed]: license_de.txt File [removed]: license_en_US.txt File [removed]: description.xml --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
