From ff546934b35e38a3b90465f1fff21cd6427cfadb Mon Sep 17 00:00:00 2001
From: serguei-actuate <skrivtsov@actuate.com>
Date: Wed, 6 Jul 2016 14:38:16 -0700
Subject: [PATCH] Use static genReport scripts instead of generating them
 dynamically

Now that all required classes are available in single
actuate-birt-api.jar, there is no need in using a script for generating
genReport.sh and genReport.bat files.

Signed-off-by: Serguei Krivtsov <skrivtsov@actuate.com>
---
 .../birt-packages/birt-runtime-osgi/build.xml |  29 +--
 .../extras/genReport.bat                      |  95 +++++++++
 .../extras/genReport.sh                       |  62 ++++++
 .../extras/genReportGenerator.sh              | 200 ------------------
 4 files changed, 159 insertions(+), 227 deletions(-)
 create mode 100644 build/org.eclipse.birt.releng.birtbuilder/extras/genReport.bat
 create mode 100644 build/org.eclipse.birt.releng.birtbuilder/extras/genReport.sh
 delete mode 100755 build/org.eclipse.birt.releng.birtbuilder/extras/genReportGenerator.sh

diff --git a/build/birt-packages/birt-runtime-osgi/build.xml b/build/birt-packages/birt-runtime-osgi/build.xml
index 59b6b2e19b3..8e781b16821 100644
--- a/build/birt-packages/birt-runtime-osgi/build.xml
+++ b/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"/>
diff --git a/build/org.eclipse.birt.releng.birtbuilder/extras/genReport.bat b/build/org.eclipse.birt.releng.birtbuilder/extras/genReport.bat
new file mode 100644
index 00000000000..12d494ec2c9
--- /dev/null
+++ b/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
diff --git a/build/org.eclipse.birt.releng.birtbuilder/extras/genReport.sh b/build/org.eclipse.birt.releng.birtbuilder/extras/genReport.sh
new file mode 100644
index 00000000000..0e8cffdc2bc
--- /dev/null
+++ b/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
diff --git a/build/org.eclipse.birt.releng.birtbuilder/extras/genReportGenerator.sh b/build/org.eclipse.birt.releng.birtbuilder/extras/genReportGenerator.sh
deleted file mode 100755
index 46cde726747..00000000000
--- a/build/org.eclipse.birt.releng.birtbuilder/extras/genReportGenerator.sh
+++ /dev/null
@@ -1,200 +0,0 @@
-#!/bin/sh
-
-######################################################
-# Input argument: 
-#      $1: ReportEngine/lib
-#      $2: Target folder to put the genReport.sh/.bat
-######################################################
-
-ls $1 > lib.path
-wc -l lib.path > lib.path.count
-count=`awk '{print $1}' lib.path.count`
-rm -f lib.path.count
-
-########################################
-#Generate $2/genReport.sh
-########################################
-
-echo "#"!/bin/sh > $2/genReport.sh
-echo "" >> $2/genReport.sh
-
-echo "################ USAGE OF REPORTRUNNER #########################" >> $2/genReport.sh
-echo "# org.eclipse.birt.report.engine.impl.ReportRunner Usage:" >> $2/genReport.sh
-echo "# --mode/-m [ run | render | runrender] the default is runrender" >> $2/genReport.sh
-echo "# for runrender mode:" >> $2/genReport.sh
-echo "# we should add it in the end <design file>" >> $2/genReport.sh
-echo "#    --format/-f [ HTML | PDF ]" >> $2/genReport.sh
-echo "#    --output/-o <target file>" >> $2/genReport.sh
-echo "#    --htmlType/-t < HTML | ReportletNoCSS >" >> $2/genReport.sh
-echo "#    --locale/-l<locale>" >> $2/genReport.sh
-echo "#    --parameter/-p <\"parameterName=parameterValue\">" >> $2/genReport.sh
-echo "#    --file/-F <parameter file>" >> $2/genReport.sh
-echo "#    --encoding/-e <target encoding>" >> $2/genReport.sh
-echo "#" >> $2/genReport.sh
-echo "# Locale: default is English" >> $2/genReport.sh
-echo "# parameters in command line will overide parameters in parameter file" >> $2/genReport.sh
-echo "# parameter name cannot include characters such as \' \'\, \'=\'\, \':\'" >> $2/genReport.sh
-echo "#" >> $2/genReport.sh
-echo "# For RUN mode:" >> $2/genReport.sh
-echo "# we should add it in the end <design file>" >> $2/genReport.sh
-echo "#    --output/-o <target file>" >> $2/genReport.sh
-echo "#    --locale/-l<locale>" >> $2/genReport.sh
-echo "#    --parameter/-p <parameterName=parameterValue>" >> $2/genReport.sh
-echo "#    --file/-F <parameter file>" >> $2/genReport.sh
-echo "#" >> $2/genReport.sh
-echo "# Locale: default is English" >> $2/genReport.sh
-echo "# parameters in command line will overide parameters in parameter file" >> $2/genReport.sh
-echo "# parameter name cannot include characters such as \' \'\, \'=\'\, \':\'" >> $2/genReport.sh
-echo "#" >> $2/genReport.sh
-echo "# For RENDER mode:" >> $2/genReport.sh
-echo "# we should add it in the end <design file>" >> $2/genReport.sh
-echo "#    --output/-o <target file>" >> $2/genReport.sh
-echo "#    --page/-p <pageNumber>" >> $2/genReport.sh
-echo "#    --locale/-l<locale>" >> $2/genReport.sh
-echo "#" >> $2/genReport.sh
-echo "# Locale: default is English" >> $2/genReport.sh
-echo "################ END OF USAGE #########################">> $2/genReport.sh
-echo "" >> $2/genReport.sh
-
-echo "#" echo set common variables >> $2/genReport.sh
-echo export BIRT_HOME=\$PWD/platform >> $2/genReport.sh
-echo export BIRT_API=\$PWD/lib/actuate-birt-api.jar >> $2/genReport.sh
-echo export WORK_DIR=\$PWD >> $2/genReport.sh
-echo "" >> $2/genReport.sh
-
-echo echo BIRT_HOME=\$BIRT_HOME >> $2/genReport.sh
-echo echo BIRT_API=\$BIRT_API >> $2/genReport.sh
-echo echo WORK_DIR=\$WORK_DIR >> $2/genReport.sh
-echo "" >> $2/genReport.sh
-
-echo if [ \"\$BIRT_HOME\" = \"\" ] >> $2/genReport.sh
-echo "" >> $2/genReport.sh
-
-echo then >> $2/genReport.sh
-echo echo \"BIRT_HOME must be set before ReportRunner can run\"\; >> $2/genReport.sh
-echo else >> $2/genReport.sh
-echo "" >> $2/genReport.sh
-
-echo java_io_tmpdir=\$WORK_DIR/tmpdir >> $2/genReport.sh
-echo org_eclipse_datatools_workspacepath=\$java_io_tmpdir/workspace_dtp >> $2/genReport.sh
-echo mkdir -p \$org_eclipse_datatools_workspacepath >> $2/genReport.sh
-echo "" >> $2/genReport.sh
-
-echo JAVACMD=\'java\'\; >> $2/genReport.sh
-echo  \$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+\"\$@\"} >> $2/genReport.sh
-echo "" >> $2/genReport.sh
-
-echo fi >> $2/genReport.sh
-
-chmod +x $2/genReport.sh
-
-
-########################################
-#Generate $2/genReport.bat
-########################################
-
-echo ECHO off > $2/genReport.bat
-echo "" >> $2/genReport.bat
-
-echo "REM ################## USAGE OF REPORT ENGINE ################" >> $2/genReport.bat
-echo "REM org.eclipse.birt.report.engine.impl.ReportRunner Usage:" >> $2/genReport.bat
-echo "REM --mode/-m [ run | render | runrender] the default is runrender" >> $2/genReport.bat
-echo "REM for runrender mode:" >> $2/genReport.bat
-echo "REM we should add it in the end <design file>" >> $2/genReport.bat
-echo "REM    --format/-f [ HTML | PDF ]" >> $2/genReport.bat
-echo "REM    --output/-o <target file>" >> $2/genReport.bat
-echo "REM    --htmlType/-t < HTML | ReportletNoCSS >" >> $2/genReport.bat
-echo "REM    --locale/-l <locale>" >> $2/genReport.bat
-echo "REM    --parameter/-p <\"parameterName=parameterValue\">" >> $2/genReport.bat
-echo "REM    --file/-F <parameter file>" >> $2/genReport.bat
-echo "REM    --encoding/-e <target encoding>" >> $2/genReport.bat
-echo "REM" >> $2/genReport.bat
-echo "REM Locale: default is English" >> $2/genReport.bat
-echo "REM parameters in command line will overide parameters in parameter file" >> $2/genReport.bat
-echo "REM parameter name cannot include characters such as \' \'\, \'=\'\, \':\'" >> $2/genReport.bat
-echo "REM"  >> $2/genReport.bat
-echo "REM For RUN mode:" >> $2/genReport.bat
-echo "REM we should add it in the end <design file>" >> $2/genReport.bat
-echo "REM    --output/-o <target file>" >> $2/genReport.bat
-echo "REM    --locale/-l <locale>" >> $2/genReport.bat
-echo "REM    --parameter/-p <parameterName=parameterValue>" >> $2/genReport.bat
-echo "REM    --file/-F <parameter file>" >> $2/genReport.bat
-echo "REM" >> $2/genReport.bat
-echo "REM Locale: default is English" >> $2/genReport.bat
-echo "REM parameters in command line will overide parameters in parameter file" >> $2/genReport.bat
-echo "REM parameter name cannot include characters such as \' \'\, \'=\'\, \':\'" >> $2/genReport.bat
-echo "REM" >> $2/genReport.bat
-echo "REM For RENDER mode:" >> $2/genReport.bat
-echo "REM we should add it in the end <design file>" >> $2/genReport.bat
-echo "REM    --output/-o <target file>" >> $2/genReport.bat
-echo "REM    --page/-p <pageNumber>" >> $2/genReport.bat
-echo "REM    --locale/-l <locale>" >> $2/genReport.bat
-echo "REM" >> $2/genReport.bat
-echo "REM Locale: default is English" >> $2/genReport.bat
-echo "REM ################## USAGE OF REPORT ENGINE END ################" >> $2/genReport.bat
-echo "" >> $2/genReport.bat
-
-echo REM set common variables >> $2/genReport.bat
-echo SET BIRT_HOME=%~dp0\\platform >> $2/genReport.bat
-echo SET BIRT_API=%~dp0\\lib\\actuate-birt-api.jar >> $2/genReport.bat
-echo SET WORK_DIR=%~dp0 >> $2/genReport.bat
-echo "" >> $2/genReport.bat
-
-echo ECHO BIRT_HOME=%BIRT_HOME% >> $2/genReport.bat
-echo ECHO BIRT_API=%BIRT_API% >> $2/genReport.bat
-echo ECHO WORK_DIR=%WORK_DIR% >> $2/genReport.bat
-echo "" >> $2/genReport.bat
-
-echo IF not \"%BIRT_HOME%\" == \"\" GOTO runBirt >> $2/genReport.bat
-echo ECHO \"BIRT_HOME must be set before ReportRunner can run\" >> $2/genReport.bat
-echo GOTO end >> $2/genReport.bat
-echo "" >> $2/genReport.bat
-
-echo :runBirt >> $2/genReport.bat 
-echo "" >> $2/genReport.bat
-
-echo SET java.io.tmpdir=%WORK_DIR%\\tmpdir >> $2/genReport.bat
-echo SET org.eclipse.datatools_workspacepath=%java.io.tmpdir%\\workspace_dtp >> $2/genReport.bat
-echo "" >> $2/genReport.bat
-
-echo IF not exist %java.io.tmpdir% mkdir %java.io.tmpdir% >> $2/genReport.bat
-echo IF not exist %org.eclipse.datatools_workspacepath% mkdir %org.eclipse.datatools_workspacepath% >> $2/genReport.bat
-echo "" >> $2/genReport.bat
-
-echo REM set command >> $2/genReport.bat
-echo SET JAVACMD=java >> $2/genReport.bat
-echo set p1=%1 >> $2/genReport.bat
-echo set p2=%2 >> $2/genReport.bat
-echo set p3=%3 >> $2/genReport.bat
-echo set p4=%4 >> $2/genReport.bat
-echo set p5=%5 >> $2/genReport.bat
-echo set p6=%6 >> $2/genReport.bat
-echo set p7=%7 >> $2/genReport.bat
-echo set p8=%8 >> $2/genReport.bat
-echo set p9=%9 >> $2/genReport.bat
-echo shift >> $2/genReport.bat
-echo set p10=%9 >> $2/genReport.bat
-echo shift >> $2/genReport.bat
-echo set p11=%9 >> $2/genReport.bat
-echo shift >> $2/genReport.bat
-echo set p12=%9 >> $2/genReport.bat
-echo shift >> $2/genReport.bat
-echo set p13=%9 >> $2/genReport.bat
-echo shift >> $2/genReport.bat
-echo set p14=%9 >> $2/genReport.bat
-echo shift >> $2/genReport.bat
-echo set p15=%9 >> $2/genReport.bat
-echo shift >> $2/genReport.bat
-echo set p16=%9 >> $2/genReport.bat
-echo shift >> $2/genReport.bat
-echo set p17=%9 >> $2/genReport.bat
-echo shift >> $2/genReport.bat
-echo set p18=%9 >> $2/genReport.bat
-echo shift >> $2/genReport.bat
-echo set p19=%9 >> $2/genReport.bat
-echo ""  >> $2/genReport.bat
-
-echo %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% >> $2/genReport.bat
-echo "" >> $2/genReport.bat
-
-echo :end >> $2/genReport.bat