=== modified file 'dhis-2/dhis-web/pom.xml'
--- dhis-2/dhis-web/pom.xml 2010-04-08 16:55:35 +0000
+++ dhis-2/dhis-web/pom.xml 2010-06-26 19:26:25 +0000
@@ -24,7 +24,7 @@
dhis-web-excel-reporting
dhis-web-caseentry
dhis-web-portal
-
+
=== modified file 'dhis-live/pom.xml'
--- dhis-live/pom.xml 2010-02-18 06:12:57 +0000
+++ dhis-live/pom.xml 2010-06-26 19:26:25 +0000
@@ -55,7 +55,7 @@
1.5.0.0
- launch4j
+ default
package
launch4j
@@ -88,6 +88,42 @@
+
+ emedded
+ package
+
+ launch4j
+
+
+ true
+ gui
+ ${project.build.directory}/dhis2-live-embedded.exe
+ dhis2-live.jar
+ dhis2
+ normal
+ http://java.com/download
+ http://dhis2.org
+ false
+ false
+
+ ${basedir}/util/launch4j/favicon.ico
+
+ dhis-live.mutex
+
+
+
+ jre6
+ 1.6.0_14
+
+
+ ${basedir}/util/launch4j/dhis2-splash.bmp
+ false
+ 12
+ false
+
+
+
+
=== modified file 'dhis2-live-installer/INSTALLER-README.txt'
--- dhis2-live-installer/INSTALLER-README.txt 2010-04-21 07:46:29 +0000
+++ dhis2-live-installer/INSTALLER-README.txt 2010-06-26 19:26:25 +0000
@@ -57,6 +57,16 @@
./build.sh docs Build only the documentation.
./build.sh installer Build only the installer.
./build.sh dhis2 Build only DHIS2.
+./build.sh live Build only the DHIS2 Live wrapper.
+
+There are a number of different installers that will be generated for different purposes.
+
+1)DHIS2 Windows Live
+This version of the installer is appropriate for Microsoft Windows with a preexisting JRE.
+2) DHIS2 Windows Embedded JRE
+This version of the installer will include a prepacked JRE (Java Runtime Edition) with the installer.
+This version therefore will not require a user to have Java preinstalled on their machine, but will
+incease the size of the installer by about 30 MB. Place a copy of the JRE in the /resources/jre/jre6 folder.
You will now enter into a rather lengthy
=== modified file 'dhis2-live-installer/build.sh'
--- dhis2-live-installer/build.sh 2010-06-10 09:07:05 +0000
+++ dhis2-live-installer/build.sh 2010-06-26 19:26:25 +0000
@@ -39,6 +39,10 @@
cd $DHIS2_DOCS
mvn package ;;
+live)
+echo "Builidng DHIS2 Live Package"
+cd $DHIS2_SRC/dhis-live/
+mvn clean package -Dtest=skip -DfailIfNoTests=false;;
installer)
echo "Building installer"
=== modified file 'dhis2-live-installer/pom.xml'
--- dhis2-live-installer/pom.xml 2010-04-12 10:13:41 +0000
+++ dhis2-live-installer/pom.xml 2010-06-26 19:26:25 +0000
@@ -15,7 +15,7 @@
1.1
- DHIS2 Windows Lite
+ DHIS2 Windows Live
package
${env.BITROCK_HOME}/bin/builder
@@ -30,13 +30,13 @@
- DHIS2 Windows Demo
+ DHIS2 Windows Embedded JRE
package
${env.BITROCK_HOME}/bin/builder
build
- ${basedir}/src/bitrock/DHIS2_demo_birt.xml
+ ${basedir}/src/bitrock/DHIS2_live_embedded.xml
windows