diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-08-02 13:42:41 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-08-02 13:42:41 +0000 |
| commit | 5691672a92d852108e657d814e7d7f03f71d9a77 (patch) | |
| tree | f25e32b5c87f101656a80f7c0a9d3d66e9b95e66 /reportdesign/util | |
| parent | 5dc2954ab27ce7a12e24d0183f35e6a5cfbb8825 (diff) | |
INTEGRATION: CWS rpt23fix01 (1.2.2); FILE MERGED
2007/07/19 11:06:19 oj 1.2.2.7: #i79598# makefile description changes
2007/07/19 09:26:21 oj 1.2.2.6: #i79598# create description file
2007/07/19 06:30:04 oj 1.2.2.5: #i79598# use vanilla license
2007/07/16 13:44:03 fs 1.2.2.4: #i77800# +core_misc
2007/07/16 05:49:01 oj 1.2.2.3: #i79557# changes for no java
2007/07/13 09:21:57 lla 1.2.2.2: #i78437#
2007/07/12 10:26:35 lla 1.2.2.1: #i78437# new name for reportdesign
Diffstat (limited to 'reportdesign/util')
| -rw-r--r-- | reportdesign/util/makefile.mk | 50 |
1 files changed, 38 insertions, 12 deletions
diff --git a/reportdesign/util/makefile.mk b/reportdesign/util/makefile.mk index 797d736c61ff..8bfc2f78f1a0 100644 --- a/reportdesign/util/makefile.mk +++ b/reportdesign/util/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.2 $ +# $Revision: 1.3 $ # -# last change: $Author: rt $ $Date: 2007-07-09 11:56:41 $ +# last change: $Author: hr $ $Date: 2007-08-02 14:42:41 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -47,6 +47,7 @@ no_common_build_zip=true .INCLUDE : settings.mk # ------------------------------------------------------------------ + # --- reportdesign core (rpt) ----------------------------------- LIB1TARGET=$(SLB)$/$(TARGET).lib @@ -54,7 +55,8 @@ LIB1FILES=\ $(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 @@ DEF3NAME=$(SHL3TARGET) # 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 @@ REPRORTJARFILES := \ $(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 @@ $(ZIP1DIR)$/META-INF$/%.xml : %.xml @@-$(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)"!=" +# |