Tag: cws_src680_pentaho1 User: oj Date: 2007-12-19 06:14:19+0000 Modified: dba/reportdesign/java/com/sun/star/report/pentaho/makefile.mk dba/reportdesign/java/com/sun/star/report/util/makefile.mk dba/reportdesign/util/makefile.mk
Log: RESYNC: (1.3-1.5); FILE MERGED File Changes: Directory: /dba/reportdesign/java/com/sun/star/report/pentaho/ ============================================================== File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/reportdesign/java/com/sun/star/report/pentaho/makefile.mk?r1=1.3.32.1&r2=1.3.32.2 Delta lines: +13 -7 -------------------- --- makefile.mk 2007-10-22 12:00:30+0000 1.3.32.1 +++ makefile.mk 2007-12-19 06:14:01+0000 1.3.32.2 @@ -43,18 +43,24 @@ .INCLUDE: settings.mk #----- compile .java files ----------------------------------------- -JARFILES = ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar flute-1.3-jfree-20061107.jar jcommon-1.0.10.jar jcommon-serializer-0.2.0.jar libfonts-0.3.3.jar libformula-0.1.14.jar liblayout-0.2.8.jar libloader-0.3.6.jar librepository-0.1.4.jar libxml-0.9.9.jar pentaho-reporting-flow-engine-0.9.2.jar sac.jar -JAVAFILES := $(shell $(FIND) . -name "*.java") +JARFILES = ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar +.IF "$(SYSTEM_JFREEREPORT)" == "YES" +XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(JCOMMON_JAR)$(PATH_SEPERATOR)$(LIBXML_JAR)$(PATH_SEPERATOR)$(JFREEREPORT_JAR)$(PATH_SEPERATOR)$(LIBLOADER_JAR)$(PATH_SEPERATOR)$(SAC_JAR)$(PATH_SEPERATOR)$(LIBLAYOUT_JAR)$(PATH_SEPERATOR)$(JCOMMON_SERIALIZER_JAR)$(PATH_SEPERATOR)$(LIBFONTS_JAR)$(PATH_SEPERATOR)$(LIBFORMULA_JAR)$(PATH_SEPERATOR)librepository-0.1.4.jar +.ELSE +JARFILES += flute-1.3-jfree-20061107.jar jcommon-1.0.10.jar jcommon-serializer-0.2.0.jar libfonts-0.3.3.jar libformula-0.1.14.jar liblayout-0.2.8.jar libloader-0.3.6.jar librepository-0.1.4.jar libxml-0.9.9.jar pentaho-reporting-flow-engine-0.9.2.jar sac.jar +.ENDIF + +JAVAFILES := $(shell @$(FIND) . -name "*.java") # JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:s/.java/.class/)) #----- copy .properties and .css files ----------------------------------------- # external find gives / for 4nt too... -# PROPERTYFILES := $(subst,/,$/ $(subst,./,$(CLASSDIR)$/$(PACKAGE)$/ $(shell $(FIND) . -name "*.properties"))) +# PROPERTYFILES := $(subst,/,$/ $(subst,./,$(CLASSDIR)$/$(PACKAGE)$/ $(shell @$(FIND) . -name "*.properties"))) PROPERTYFILES := $(CLASSDIR)$/$(PACKAGE)$/configuration.properties \ $(CLASSDIR)$/$(PACKAGE)$/module.properties \ $(CLASSDIR)$/$(PACKAGE)$/parser$/selectors.properties -# CSSFILES := $(subst,./,$(CLASSDIR)$/$(PACKAGE)$/ $(shell $(FIND) . -name "*.css")) +# CSSFILES := $(subst,./,$(CLASSDIR)$/$(PACKAGE)$/ $(shell @$(FIND) . -name "*.css")) CSSFILES := $(CLASSDIR)$/$(PACKAGE)$/oasis-datastyle.css\ $(CLASSDIR)$/$(PACKAGE)$/oasis-draw.css\ $(CLASSDIR)$/$(PACKAGE)$/oasis-form.css\ Directory: /dba/reportdesign/java/com/sun/star/report/util/ =========================================================== File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/reportdesign/java/com/sun/star/report/util/makefile.mk?r1=1.4.32.1&r2=1.4.32.2 Delta lines: +8 -3 ------------------- --- makefile.mk 2007-10-22 12:00:30+0000 1.4.32.1 +++ makefile.mk 2007-12-19 06:14:04+0000 1.4.32.2 @@ -42,7 +42,12 @@ .INCLUDE: settings.mk #----- compile .java files ----------------------------------------- +.IF "$(SYSTEM_JFREEREPORT)" == "YES" +CLASSPATH!:=$(CLASSPATH)$(PATH_SEPERATOR)$(JCOMMON_JAR)$(PATH_SEPERATOR)$(LIBXML_JAR)$(PATH_SEPERATOR)$(JFREEREPORT_JAR) +.ELSE JARFILES = jcommon-1.0.10.jar libxml-0.9.9.jar pentaho-reporting-flow-engine-0.9.2.jar +.ENDIF + JAVAFILES = DefaultJobProperties.java DefaultParameterMap.java DefaultReportJobDefinition.java FileRepository.java ManifestWriter.java # --- Targets ------------------------------------------------------ .INCLUDE : target.mk Directory: /dba/reportdesign/util/ ================================== File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/reportdesign/util/makefile.mk?r1=1.8.10.1&r2=1.8.10.2 Delta lines: +34 -8 -------------------- --- makefile.mk 2007-10-22 12:00:30+0000 1.8.10.1 +++ makefile.mk 2007-12-19 06:14:08+0000 1.8.10.2 @@ -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 @@ -243,9 +251,12 @@ .INCLUDE : target.mk .IF "$(ZIP1TARGETN)"!="" -$(ZIP1TARGETN) : $(TXTFILES) $(XMLFILES) $(HTMLFILES) $(REPRORTJARFILES) +$(ZIP1TARGETN) : $(TXTFILES) $(XMLFILES) $(HTMLFILES) $(REPORTJARFILES) .ENDIF # "$(ZIP1TARGETN)"!=" +$(MISC)$/update_report.flag : $(XCU_FILES) + $(TOUCH) $@ + $(ZIP1DIR)$/description.xml : pre.xml post.xml @@-$(MKDIRHIER) $(@:d) @@-$(RM) $(ZIP1DIR)$/description.xml @@ -265,17 +276,32 @@ @@-$(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) $< $@ + +.IF "$(SYSTEM_JFREEREPORT)" == "YES" +$(ZIP1DIR)$/%.jar : $(JFREEREPORT_JAR:d:d)$/%.jar + @@-$(MKDIRHIER) $(@:d) + $(COPY) $< $@ +.ELSE $(ZIP1DIR)$/%.jar : $(SOLARBINDIR)$/%.jar @@-$(MKDIRHIER) $(@:d) $(COPY) $< $@ +.ENDIF $(ZIP1DIR)$/%.jar : $(CLASSDIR)$/%.jar @@-$(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]
