User: ihi Date: 2007-11-27 11:59:54+0000 Modified: dba/reportdesign/util/makefile.mk
Log: INTEGRATION: CWS dba24lms (1.8.22); FILE MERGED 2007/11/21 12:14:16 oj 1.8.22.2: build problem when WITH_LANG is not set 2007/11/09 09:45:18 oj 1.8.22.1: #i83469# insert strings File Changes: Directory: /dba/reportdesign/util/ ================================== File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/reportdesign/util/makefile.mk?r1=1.8&r2=1.9 Delta lines: +25 -4 -------------------- --- makefile.mk 2007-09-26 14:25:36+0000 1.8 +++ makefile.mk 2007-11-27 11:59:51+0000 1.9 @@ -47,7 +47,6 @@ .INCLUDE : settings.mk # ------------------------------------------------------------------ - # --- reportdesign core (rpt) ----------------------------------- LIB1TARGET=$(SLB)$/$(TARGET).lib @@ -213,6 +212,15 @@ XMLFILES := $(ZIP1DIR)$/description.xml \ $(ZIP1DIR)$/META-INF$/manifest.xml +XCU_FILES := $(ZIP1DIR)$/registry$/data$/org$/openoffice$/Office$/DataAccess.xcu \ + $(ZIP1DIR)$/merge$/org$/openoffice$/Office$/DataAccess.xcu + +.IF "$(WITH_LANG)"!="" +XCU_TMP := $(MISC)$/merge$/org$/openoffice$/Office$/DataAccess.xcu +.ELSE //"$(WITH_LANG)" != "" +XCU_TMP := $(MISC)$/registry$/data$/org$/openoffice$/Office$/DataAccess.xcu +.ENDIF //"$(WITH_LANG)" != "" + HTMLFILES := $(ZIP1DIR)$/THIRDPARTYREADMELICENSE.html \ $(ZIP1DIR)$/readme_en-US.html \ $(ZIP1DIR)$/readme_en-US.txt @@ -225,6 +233,7 @@ LICLINES:=$(foreach,i,$(TXTFILES) <license-text xlink:href="registration/$(i:f)" lang="$(subst,.txt, $(subst,license_, $(i:f)))" license-id="$(subst,.txt, $(subst,license_, $(i:f)))" />) .ENDIF # "$(GUI)"!="WNT" + REPRORTJARFILES := \ $(ZIP1DIR)$/jcommon-1.0.10.jar \ $(ZIP1DIR)$/sac.jar \ @@ -246,6 +255,9 @@ $(ZIP1TARGETN) : $(TXTFILES) $(XMLFILES) $(HTMLFILES) $(REPRORTJARFILES) .ENDIF # "$(ZIP1TARGETN)"!=" +$(MISC)$/update_report.flag : $(XCU_FILES) + $(TOUCH) $@ + $(ZIP1DIR)$/description.xml : pre.xml post.xml @@-$(MKDIRHIER) $(@:d) @@-$(RM) $(ZIP1DIR)$/description.xml @@ -265,6 +277,15 @@ @@-$(MKDIRHIER) $(@:d) $(COPY) $< $@ +$(ZIP1DIR)$/registry$/data$/org$/openoffice$/Office$/%.xcu : $(MISC)$/registry$/data$/org$/openoffice$/Office$/%.xcu + @@-$(MKDIRHIER) $(@:d) + $(COPY) $< $@ + +$(ZIP1DIR)$/merge$/org$/openoffice$/Office$/%.xcu : $(XCU_TMP) + @@-$(MKDIRHIER) $(@:d) + echo $(XCU_TMP) + $(COPY) $< $@ + $(ZIP1DIR)$/%.jar : $(SOLARBINDIR)$/%.jar @@-$(MKDIRHIER) $(@:d) $(COPY) $< $@ @@ -273,9 +294,9 @@ @@-$(MKDIRHIER) $(@:d) $(COPY) $< $@ -$(ZIP1DIR)$/META-INF$/%.xml : %.xml +$(ZIP1DIR)$/META-INF$/manifest.xml : manifest.xml $(MISC)$/update_report.flag @@-$(MKDIRHIER) $(@:d) - $(COPY) $< $@ + $(PERL) $(SOLARENV)$/bin$/makemani.pl $(PRJ)$/util$/manifest.xml $(ZIP1DIR) registry $(@:d:d) $(ZIP1DIR)$/readme_en-US.% : $(PRJ)$/license$/readme_en-US.% @@-$(MKDIRHIER) $(@:d) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
