Tag: cws_src680_oj14 User: oj Date: 2007-05-10 12:14:27+0000 Modified: dba/reportdesign/java/com/sun/star/report/makefile.mk dba/reportdesign/java/com/sun/star/report/pentaho/Manifest.mf dba/reportdesign/java/com/sun/star/report/pentaho/PentahoReportEngine.java dba/reportdesign/java/com/sun/star/report/pentaho/makefile.mk dba/reportdesign/java/com/sun/star/report/util/makefile.mk dba/reportdesign/prj/build.lst dba/reportdesign/source/ui/dlg/dbgsv.log dba/reportdesign/util/makefile.mk
Log: some changes add build env File Changes: Directory: /dba/reportdesign/java/com/sun/star/report/ ====================================================== File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/reportdesign/java/com/sun/star/report/makefile.mk?r1=1.1.2.1&r2=1.1.2.2 Delta lines: +22 -14 --------------------- --- makefile.mk 2007-05-09 12:05:42+0000 1.1.2.1 +++ makefile.mk 2007-05-10 12:14:23+0000 1.1.2.2 @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.1.2.1 $ +# $Revision: 1.1.2.2 $ # -# last change: $Author: oj $ $Date: 2007/05/09 12:05:42 $ +# last change: $Author: oj $ $Date: 2007/05/10 12:14:23 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -40,21 +40,29 @@ # --- Settings ----------------------------------------------------- .INCLUDE: settings.mk - - #----- compile .java files ----------------------------------------- -JARFILES = ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar star.jar star-pentaho.jar jcommon-1.0.8.jar -JAVAFILES = $(shell $(FIND) .$/*.java) - -JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) +JARFILES = jcommon-1.0.8.jar +JAVAFILES := DataRow.java\ + DataSource.java\ + DataSourceException.java\ + DataSourceFactory.java\ + InputRepository.java\ + JobDefinitionException.java\ + JobProgressIndicator.java\ + JobProperties.java\ + OutputRepository.java\ + ParameterMap.java\ + ReportAddIn.java\ + ReportEngine.java\ + ReportEngineMetaData.java\ + ReportEngineParameterNames.java\ + ReportExecutionException.java\ + ReportExpression.java\ + ReportExpressionMetaData.java\ + ReportFunction.java\ + ReportJob.java\ + ReportJobDefinition.java # --- Targets ------------------------------------------------------ - -.IF "$(depend)" == "" -ALL : ALLTAR -.ELSE -ALL: ALLDEP -.ENDIF - .INCLUDE : target.mk Directory: /dba/reportdesign/java/com/sun/star/report/pentaho/ ============================================================== File [changed]: Manifest.mf Url: http://dba.openoffice.org/source/browse/dba/reportdesign/java/com/sun/star/report/pentaho/Manifest.mf?r1=1.1.2.1&r2=1.1.2.2 Delta lines: +5 -4 ------------------- --- Manifest.mf 2007-05-09 11:47:47+0000 1.1.2.1 +++ Manifest.mf 2007-05-10 12:14:23+0000 1.1.2.2 @@ -1,6 +1,7 @@ RegistrationClassName: com.sun.star.report.pentaho.SOReportJobFactory -Class-Path: jcommon-1.0.8.jar sac.jar star.jar - libformat.jar libxml.jar flute.jar jfreereport.jar libfonts.jar - liblayout.jar libloader.jar star-pentaho.jar - jcommon-serializer.jar libformula.jar librepository.jar +Class-Path: jcommon-1.0.8.jar sac.jar + libxml-0.9.3.jar flute-1.3-jfree-20061107.jar jfreereport.jar + liblayout-0.2.6.jar libloader-0.3.3.jar libfonts-0.2.4.jar + jcommon-serializer-0.1.0.jar libformula-0.1.7.jar + librepository-0.1.0.jar UNO-Type-Path: File [changed]: PentahoReportEngine.java Url: http://dba.openoffice.org/source/browse/dba/reportdesign/java/com/sun/star/report/pentaho/PentahoReportEngine.java?r1=1.1.2.1&r2=1.1.2.2 Delta lines: +3 -46 -------------------- --- PentahoReportEngine.java 2007-05-09 12:11:51+0000 1.1.2.1 +++ PentahoReportEngine.java 2007-05-10 12:14:23+0000 1.1.2.2 @@ -4,9 +4,9 @@ * * $RCSfile: PentahoReportEngine.java,v $ * - * $Revision: 1.1.2.1 $ + * $Revision: 1.1.2.2 $ * - * last change: $Author: oj $ $Date: 2007/05/09 12:11:51 $ + * last change: $Author: oj $ $Date: 2007/05/10 12:14:23 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -48,7 +48,6 @@ import com.sun.star.report.ReportJobDefinition; import com.sun.star.report.ReportEngineParameterNames; import com.sun.star.report.ReportExecutionException; -import com.sun.star.report.test.TestDataSourceFactory; import com.sun.star.report.util.DefaultReportJobDefinition; import com.sun.star.report.util.FileRepository; import org.jfree.report.JFreeReportBoot; @@ -86,46 +85,4 @@ { return new PentahoReportJob(definition); } - - public static void main (final String[] args) - throws JobDefinitionException, ReportExecutionException, IOException - { - - String exportType = PentahoReportEngineMetaData.OPENDOCUMENT_TEXT; - - File sourceDir = new File ("./fileformat/odb/reports/Obj64"); - File targetDir = new File ("./output"); - if (args.length >= 1) - { - exportType = args[0]; - } - if (args.length >= 2) - { - sourceDir = new File (args[1]); - } - if (args.length >= 3) - { - targetDir = new File (args[2]); - } - - for (int i = 0; i < 1; i++) - { - - final PentahoReportEngine engine = new PentahoReportEngine(); - final ReportJobDefinition definition = engine.createJobDefinition(); - final JobProperties procParms = definition.getProcessingParameters(); - - final FileRepository sourceRepo = new FileRepository(sourceDir); - final FileRepository targetRepo = new FileRepository(targetDir); - procParms.setProperty(ReportEngineParameterNames.INPUT_REPOSITORY, sourceRepo); - procParms.setProperty(ReportEngineParameterNames.OUTPUT_REPOSITORY, targetRepo); - procParms.setProperty(ReportEngineParameterNames.INPUT_NAME, "content.xml"); - procParms.setProperty(ReportEngineParameterNames.OUTPUT_NAME, "content.xml"); - procParms.setProperty(ReportEngineParameterNames.CONTENT_TYPE, exportType); - procParms.setProperty(ReportEngineParameterNames.INPUT_DATASOURCE_FACTORY, new TestDataSourceFactory()); - final ReportJob job = engine.createJob(definition); - job.execute(); - } - - } } File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/reportdesign/java/com/sun/star/report/pentaho/makefile.mk?r1=1.1.2.1&r2=1.1.2.2 Delta lines: +63 -18 --------------------- --- makefile.mk 2007-05-09 11:48:40+0000 1.1.2.1 +++ makefile.mk 2007-05-10 12:14:23+0000 1.1.2.2 @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.1.2.1 $ +# $Revision: 1.1.2.2 $ # -# last change: $Author: oj $ $Date: 2007/05/09 11:48:40 $ +# last change: $Author: oj $ $Date: 2007/05/10 12:14:23 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -37,33 +37,78 @@ PRJNAME = reportdesign TARGET = $(PRJNAME) PACKAGE = com$/sun$/star$/report$/pentaho - +# we have circular dependencies +nodep=true # --- Settings ----------------------------------------------------- .INCLUDE: settings.mk - #----- compile .java files ----------------------------------------- -JARFILES = ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar star.jar star-pentaho.jar jcommon-1.0.8.jar -JAVAFILES = $(shell $(FIND) .$/*.java) +JARFILES = ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar jcommon-1.0.8.jar libxml-0.9.3.jar jfreereport.jar libloader-0.3.3.jar sac.jar liblayout-0.2.6.jar jcommon-serializer-0.1.0.jar libfonts-0.2.4.jar libformula-0.1.7.jar +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 := $(CLASSDIR)$/$(PACKAGE)$/configuration.properties \ + $(CLASSDIR)$/$(PACKAGE)$/module.properties \ + $(CLASSDIR)$/$(PACKAGE)$/parser$/selectors.properties + +# CSSFILES := $(subst,./,$(CLASSDIR)$/$(PACKAGE)$/ $(shell $(FIND) . -name "*.css")) +CSSFILES := $(CLASSDIR)$/$(PACKAGE)$/oasis-datastyle.css\ + $(CLASSDIR)$/$(PACKAGE)$/oasis-draw.css\ + $(CLASSDIR)$/$(PACKAGE)$/oasis-form.css\ + $(CLASSDIR)$/$(PACKAGE)$/oasis-style.css\ + $(CLASSDIR)$/$(PACKAGE)$/oasis-table.css\ + $(CLASSDIR)$/$(PACKAGE)$/oasis-text.css\ + $(CLASSDIR)$/$(PACKAGE)$/smil.css\ + $(CLASSDIR)$/$(PACKAGE)$/star-office.css\ + $(CLASSDIR)$/$(PACKAGE)$/star-report.css\ + $(CLASSDIR)$/$(PACKAGE)$/star-rpt.css\ + $(CLASSDIR)$/$(PACKAGE)$/svg.css\ + $(CLASSDIR)$/$(PACKAGE)$/xsl-fo.css -JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) +XSDFILES := $(CLASSDIR)$/$(PACKAGE)$/parser$/rpt-schema-v1.0-os.xsd \ + $(CLASSDIR)$/$(PACKAGE)$/styles$/stylemapper.xsd -#----- make a jar from compiled files ------------------------------ +XMLFILES := $(CLASSDIR)$/$(PACKAGE)$/styles$/stylemapper.xml -MAXLINELENGTH = 100000 +TXTFILES := $(CLASSDIR)$/$(PACKAGE)$/parser$/style-mapping.txt -JARCLASSDIRS = com$/sun$/star$/report + +#----- make a jar from compiled files ------------------------------ + +JARCLASSDIRS = . JARTARGET = $(TARGET).jar JARCOMPRESS = TRUE CUSTOMMANIFESTFILE = Manifest.mf + # --- Targets ------------------------------------------------------ +.INCLUDE : target.mk -.IF "$(depend)" == "" -ALL : ALLTAR -.ELSE -ALL: ALLDEP -.ENDIF +.IF "$(JARTARGETN)"!="" +$(JARTARGETN) : $(PROPERTYFILES) $(CSSFILES) $(XSDFILES) $(TXTFILES) $(XMLFILES) +.ENDIF # "$(JARTARGETN)"!="" + +$(CLASSDIR)$/$(PACKAGE)$/%.properties : %.properties + @@-$(MKDIRHIER) $(@:d) + $(COPY) $< $@ + +$(CLASSDIR)$/$(PACKAGE)$/%.css : %.css + @@-$(MKDIRHIER) $(@:d) + $(COPY) $< $@ + +$(CLASSDIR)$/$(PACKAGE)$/%.xsd : %.xsd + @@-$(MKDIRHIER) $(@:d) + $(COPY) $< $@ + +$(CLASSDIR)$/$(PACKAGE)$/%.xml : %.xml + @@-$(MKDIRHIER) $(@:d) + $(COPY) $< $@ + +$(CLASSDIR)$/$(PACKAGE)$/%.txt : %.txt + @@-$(MKDIRHIER) $(@:d) + $(COPY) $< $@ -.INCLUDE : target.mk 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.1.2.1&r2=1.1.2.2 Delta lines: +3 -15 -------------------- --- makefile.mk 2007-05-09 12:06:34+0000 1.1.2.1 +++ makefile.mk 2007-05-10 12:14:23+0000 1.1.2.2 @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.1.2.1 $ +# $Revision: 1.1.2.2 $ # -# last change: $Author: oj $ $Date: 2007/05/09 12:06:34 $ +# last change: $Author: oj $ $Date: 2007/05/10 12:14:23 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -40,21 +40,9 @@ # --- Settings ----------------------------------------------------- .INCLUDE: settings.mk - - #----- compile .java files ----------------------------------------- -JARFILES = ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar star.jar star-pentaho.jar jcommon-1.0.8.jar -JAVAFILES = $(shell $(FIND) .$/*.java) - -JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) - +JARFILES = jcommon-1.0.8.jar +JAVAFILES = DefaultJobProperties.java DefaultParameterMap.java DefaultReportJobDefinition.java FileRepository.java # --- Targets ------------------------------------------------------ - -.IF "$(depend)" == "" -ALL : ALLTAR -.ELSE -ALL: ALLDEP -.ENDIF - .INCLUDE : target.mk Directory: /dba/reportdesign/prj/ ================================= File [changed]: build.lst Url: http://dba.openoffice.org/source/browse/dba/reportdesign/prj/build.lst?r1=1.1.2.1&r2=1.1.2.2 Delta lines: +5 -2 ------------------- --- build.lst 2007-05-09 14:05:04+0000 1.1.2.1 +++ build.lst 2007-05-10 12:14:24+0000 1.1.2.2 @@ -1,7 +1,10 @@ ba reportdesign : boost comphelper dbaccess NULL ba reportdesign usr1 - all ba_mkout NULL ba reportdesign\inc nmake - all ba_inc NULL -ba reportdesign\java\com\sun\star\report\pentaho nmake - all ba_jreport ba_inc NULL +ba reportdesign\java nmake - all ba_java NULL +ba reportdesign\java\com\sun\star\report nmake - all ba_jreport ba_java NULL +ba reportdesign\java\com\sun\star\report\util nmake - all ba_jreport_util ba_jreport NULL +ba reportdesign\java\com\sun\star\report\pentaho nmake - all ba_jreport_pe ba_jreport_util NULL ba reportdesign\source\core\api nmake - all ba_api ba_inc NULL ba reportdesign\source\core\resource nmake - all ba_res ba_inc NULL ba reportdesign\source\core\sdr nmake - all ba_sdr ba_inc NULL @@ -11,5 +14,5 @@ ba reportdesign\source\ui\report nmake - all ba_uireport ba_inc NULL ba reportdesign\source\ui\inspection nmake - all ba_uiinspection ba_inc NULL ba reportdesign\source\filter\xml nmake - all ba_filter_xml ba_inc NULL -ba reportdesign\util nmake - all ba_util ba_inc ba_jreport ba_api ba_res ba_shared ba_uimisc ba_uidlg ba_uireport ba_uiinspection ba_sdr ba_filter_xml NULL +ba reportdesign\util nmake - all ba_util ba_inc ba_jreport_pe ba_api ba_res ba_shared ba_uimisc ba_uidlg ba_uireport ba_uiinspection ba_sdr ba_filter_xml NULL ba reportdesign\util\extension nmake - all ba_extension ba_util NULL Directory: /dba/reportdesign/source/ui/dlg/ =========================================== File [changed]: dbgsv.log Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/dlg/dbgsv.log?r1=1.1.2.1&r2=1.1.2.2 Delta lines: +1 -1 ------------------- --- dbgsv.log 2007-05-09 13:53:04+0000 1.1.2.1 +++ dbgsv.log 2007-05-10 12:14:24+0000 1.1.2.2 @@ -1,6 +1,6 @@ ****************************************************************************** dbgsv.log -Thu Apr 26 09:21:30 2007 +Thu May 10 08:42:34 2007 Error: String::String() : nLen is wrong Error: String::String() : nLen is wrong Directory: /dba/reportdesign/util/ ================================== File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/reportdesign/util/makefile.mk?r1=1.1.2.1&r2=1.1.2.2 Delta lines: +11 -14 --------------------- --- makefile.mk 2007-05-09 13:59:56+0000 1.1.2.1 +++ makefile.mk 2007-05-10 12:14:24+0000 1.1.2.2 @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.1.2.1 $ +# $Revision: 1.1.2.2 $ # -# last change: $Author: oj $ $Date: 2007/05/09 13:59:56 $ +# last change: $Author: oj $ $Date: 2007/05/10 12:14:24 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -219,18 +219,15 @@ COPY_JAR_FILES = \ $(SOLARBINDIR)$/jcommon-1.0.8.jar \ $(SOLARBINDIR)$/sac.jar \ - $(SOLARBINDIR)$/star.jar \ - $(SOLARBINDIR)$/libformat.jar \ - $(SOLARBINDIR)$/libxml.jar \ - $(SOLARBINDIR)$/flute.jar \ + $(SOLARBINDIR)$/libxml-0.9.3.jar \ + $(SOLARBINDIR)$/flute-1.3-jfree-20061107.jar \ $(SOLARBINDIR)$/jfreereport.jar \ - $(SOLARBINDIR)$/liblayout.jar \ - $(SOLARBINDIR)$/libloader.jar \ - $(SOLARBINDIR)$/star-pentaho.jar \ - $(SOLARBINDIR)$/libformula.jar \ - $(SOLARBINDIR)$/librepository.jar \ - $(SOLARBINDIR)$/libfonts.jar \ - $(SOLARBINDIR)$/jcommon-serializer.jar \ + $(SOLARBINDIR)$/liblayout-0.2.6.jar \ + $(SOLARBINDIR)$/libloader-0.3.3.jar \ + $(SOLARBINDIR)$/libformula-0.1.7.jar \ + $(SOLARBINDIR)$/librepository-0.1.0.jar \ + $(SOLARBINDIR)$/libfonts-0.2.4.jar \ + $(SOLARBINDIR)$/jcommon-serializer-0.1.0.jar \ $(CLASSDIR)$/reportdesign.jar @@ -243,7 +240,7 @@ # so wird es spaeter aussehen (#i73990#) fixed in m206 # LLA: you need to build twice as long as we are not above m206 # -# ZIP1DEPS=COPYFILES_2 +$(ZIP1DEPS) = $(MISC)$/COPY_TO_ZIP # # $(ZIP1TARGETN) : $(MISC)$/COPYFILES_2 # $(ZIP1TARGETN) : $(MISC)$/COPY_TO_ZIP --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
