Merge pull request #330 from serguei-actuate/master

Use static genReport scripts instead of generating them dynamically

build/birt-packages/birt-runtime-osgi/build.xml

@@ -29,33 +29,8 @@
     </copy>
     <copy file="./config.ini" todir="${ENGINE_DIR}/configuration"/>
     <copy file="${ROOT_DIR}/viewer/org.eclipse.birt.report.viewer/birt/test.rptdesign" tofile="${ENGINE_DIR}/samples/hello_world.rptdesign"/>
-    <property name="GEN_REPORT_GENERATOR" location="${ROOT_DIR}/build/org.eclipse.birt.releng.birtbuilder/extras/genReportGenerator.sh"/>
-    <!-- Remove \r characters from the shell script file since sh command does not like them -->
-    <exec executable="cmd" osfamily="windows">
-      <arg value="/c"/>
-      <arg value="sed"/>
-      <arg value="-i"/>
-	  <arg value="s/\r$//"/>
-	  <arg value="${GEN_REPORT_GENERATOR}"/>
-    </exec>
-    <exec executable="sed" osfamily="unix">
-      <arg value="-i"/>
-      <arg value="s/\r$//"/>
-      <arg value="${GEN_REPORT_GENERATOR}"/>
-    </exec>
-	<!-- Generate genReport.sh and genReport.bat -->
-    <exec executable="cmd" osfamily="windows">
-      <arg value="/c"/>
-      <arg value="sh"/>
-      <arg value="${GEN_REPORT_GENERATOR}"/>
-      <arg value="${ENGINE_DIR}/lib"/>
-      <arg value="${ENGINE_DIR}"/>
-    </exec>
-    <exec executable="sh" osfamily="unix">
-      <arg value="${GEN_REPORT_GENERATOR}"/>
-      <arg value="${ENGINE_DIR}/lib/"/>
-      <arg value="${ENGINE_DIR}"/>
-    </exec>
+    <copy file="${ROOT_DIR}/build/org.eclipse.birt.releng.birtbuilder/extras/genReport.sh" todir="${ENGINE_DIR}"/>
+    <copy file="${ROOT_DIR}/build/org.eclipse.birt.releng.birtbuilder/extras/genReport.bat" todir="${ENGINE_DIR}"/>
   </target>
   <target name="build-webviewer">
     <property name="VIEWER_PLUGIN" location="${ROOT_DIR}/viewer/org.eclipse.birt.report.viewer"/>

build/org.eclipse.birt.releng.birtbuilder/extras/genReport.bat

@@ -0,0 +1,95 @@
+ECHO off
+
+REM ################## USAGE OF REPORT ENGINE ################
+REM org.eclipse.birt.report.engine.impl.ReportRunner Usage:
+REM --mode/-m [ run | render | runrender] the default is runrender
+REM for runrender mode:
+REM we should add it in the end <design file>
+REM    --format/-f [ HTML | PDF ]
+REM    --output/-o <target file>
+REM    --htmlType/-t < HTML | ReportletNoCSS >
+REM    --locale/-l <locale>
+REM    --parameter/-p <"parameterName=parameterValue">
+REM    --file/-F <parameter file>
+REM    --encoding/-e <target encoding>
+REM
+REM Locale: default is English
+REM parameters in command line will overide parameters in parameter file
+REM parameter name cannot include characters such as \' \'\, \'=\'\, \':\'
+REM
+REM For RUN mode:
+REM we should add it in the end <design file>
+REM    --output/-o <target file>
+REM    --locale/-l <locale>
+REM    --parameter/-p <parameterName=parameterValue>
+REM    --file/-F <parameter file>
+REM
+REM Locale: default is English
+REM parameters in command line will overide parameters in parameter file
+REM parameter name cannot include characters such as \' \'\, \'=\'\, \':\'
+REM
+REM For RENDER mode:
+REM we should add it in the end <design file>
+REM    --output/-o <target file>
+REM    --page/-p <pageNumber>
+REM    --locale/-l <locale>
+REM
+REM Locale: default is English
+REM ################## USAGE OF REPORT ENGINE END ################
+
+REM set common variables
+SET BIRT_HOME=%~dp0\platform
+SET BIRT_API=%~dp0\lib\actuate-birt-api.jar
+SET WORK_DIR=%~dp0
+
+ECHO BIRT_HOME=%BIRT_HOME%
+ECHO BIRT_API=%BIRT_API%
+ECHO WORK_DIR=%WORK_DIR%
+
+IF not "%BIRT_HOME%" == "" GOTO runBirt
+ECHO "BIRT_HOME must be set before ReportRunner can run"
+GOTO end
+
+:runBirt
+
+SET java.io.tmpdir=%WORK_DIR%\tmpdir
+SET org.eclipse.datatools_workspacepath=%java.io.tmpdir%\workspace_dtp
+
+IF not exist %java.io.tmpdir% mkdir %java.io.tmpdir%
+IF not exist %org.eclipse.datatools_workspacepath% mkdir %org.eclipse.datatools_workspacepath%
+
+REM set command
+SET JAVACMD=java
+set p1=%1
+set p2=%2
+set p3=%3
+set p4=%4
+set p5=%5
+set p6=%6
+set p7=%7
+set p8=%8
+set p9=%9
+shift
+set p10=%9
+shift
+set p11=%9
+shift
+set p12=%9
+shift
+set p13=%9
+shift
+set p14=%9
+shift
+set p15=%9
+shift
+set p16=%9
+shift
+set p17=%9
+shift
+set p18=%9
+shift
+set p19=%9
+
+%JAVACMD% -cp "%BIRT_API%" -DBIRT_HOME="%BIRT_HOME%" org.eclipse.birt.report.engine.api.ReportRunner %p1% %p2% %p3% %p4% %p5% %p6% %p7% %p8% %p9% %p10% %p11% %p12% %p13% %p14% %p15% %p16% %p17% %p18% %p19%
+
+:end

build/org.eclipse.birt.releng.birtbuilder/extras/genReport.sh

@@ -0,0 +1,62 @@
+#!/bin/sh
+
+################ USAGE OF REPORTRUNNER #########################
+# org.eclipse.birt.report.engine.impl.ReportRunner Usage:
+# --mode/-m [ run | render | runrender] the default is runrender
+# for runrender mode:
+# we should add it in the end <design file>
+#    --format/-f [ HTML | PDF ]
+#    --output/-o <target file>
+#    --htmlType/-t < HTML | ReportletNoCSS >
+#    --locale/-l<locale>
+#    --parameter/-p <"parameterName=parameterValue">
+#    --file/-F <parameter file>
+#    --encoding/-e <target encoding>
+#
+# Locale: default is English
+# parameters in command line will overide parameters in parameter file
+# parameter name cannot include characters such as \' \'\, \'=\'\, \':\'
+#
+# For RUN mode:
+# we should add it in the end <design file>
+#    --output/-o <target file>
+#    --locale/-l<locale>
+#    --parameter/-p <parameterName=parameterValue>
+#    --file/-F <parameter file>
+#
+# Locale: default is English
+# parameters in command line will overide parameters in parameter file
+# parameter name cannot include characters such as \' \'\, \'=\'\, \':\'
+#
+# For RENDER mode:
+# we should add it in the end <design file>
+#    --output/-o <target file>
+#    --page/-p <pageNumber>
+#    --locale/-l<locale>
+#
+# Locale: default is English
+################ END OF USAGE #########################
+
+# echo set common variables
+export BIRT_HOME=$PWD/platform
+export BIRT_API=$PWD/lib/actuate-birt-api.jar
+export WORK_DIR=$PWD
+
+echo BIRT_HOME=$BIRT_HOME
+echo BIRT_API=$BIRT_API
+echo WORK_DIR=$WORK_DIR
+
+if [ "$BIRT_HOME" = "" ]
+
+then
+echo "BIRT_HOME must be set before ReportRunner can run";
+else
+
+java_io_tmpdir=$WORK_DIR/tmpdir
+org_eclipse_datatools_workspacepath=$java_io_tmpdir/workspace_dtp
+mkdir -p $org_eclipse_datatools_workspacepath
+
+JAVACMD='java';
+$JAVACMD -Djava.awt.headless=true -cp "$BIRT_API" -DBIRT_HOME="$BIRT_HOME" -Dorg.eclipse.datatools_workspacepath="$org_eclipse_datatools_workspacepath" org.eclipse.birt.report.engine.api.ReportRunner ${1+"$@"}
+
+fi