dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2044
committer: Jason Pickering <jason@karolina-laptop>
branch nick: trunk
timestamp: Sat 2010-06-26 21:26:25 +0200
message:
  Adding installer configuration for an embdeed JRE installation. Modified installer readme.
modified:
  dhis-2/dhis-web/pom.xml
  dhis-live/pom.xml
  dhis2-live-installer/INSTALLER-README.txt
  dhis2-live-installer/build.sh
  dhis2-live-installer/pom.xml


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== 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 @@
     <module>dhis-web-excel-reporting</module>
     <module>dhis-web-caseentry</module>
     <module>dhis-web-portal</module>	
-  </modules>
+</modules>
   
   <build>
     <plugins>

=== 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 @@
 		<version>1.5.0.0</version>
 		<executions>
 		  <execution>
-		    <id>launch4j</id>
+		    <id>default</id>
 		    <phase>package</phase>
 		    <goals>
 		      <goal>launch4j</goal>
@@ -88,6 +88,42 @@
 		      </splash>
 		    </configuration>
 		  </execution>
+		<execution>
+                    <id>emedded</id>
+                    <phase>package</phase>
+                    <goals>
+                      <goal>launch4j</goal>
+                    </goals>
+                    <configuration>
+                      <dontWrapJar>true</dontWrapJar>
+                      <headerType>gui</headerType>
+                      <outfile>${project.build.directory}/dhis2-live-embedded.exe</outfile>
+                      <jar>dhis2-live.jar</jar>
+                      <errTitle>dhis2</errTitle>
+                      <priority>normal</priority>
+                      <downloadUrl>http://java.com/download</downloadUrl>
+                      <supportUrl>http://dhis2.org</supportUrl>
+                      <customProcName>false</customProcName>
+                      <stayAlive>false</stayAlive>
+                      <manifest></manifest>
+                      <icon>${basedir}/util/launch4j/favicon.ico</icon>
+                      <singleInstance>
+                        <mutexName>dhis-live.mutex</mutexName>
+                        <windowTitle></windowTitle>
+                      </singleInstance>
+              <jre>
+                        <path>jre6</path>
+                        <minVersion>1.6.0_14</minVersion>
+                      </jre>
+                      <splash>
+                        <file>${basedir}/util/launch4j/dhis2-splash.bmp</file>
+                        <waitForWindow>false</waitForWindow>
+                        <timeout>12</timeout>
+                        <timeoutErr>false</timeoutErr>
+                      </splash>
+                    </configuration>
+                  </execution>
+
 		</executions>
 	  </plugin>
     </plugins>

=== 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 @@
         <version>1.1</version>
         <executions>
           <execution>
-	     <id>DHIS2 Windows Lite</id>
+	     <id>DHIS2 Windows Live</id>
              <phase>package</phase>
                <configuration>
                 <executable>${env.BITROCK_HOME}/bin/builder</executable>
@@ -30,13 +30,13 @@
             </goals>
           </execution>
           <execution>
-             <id>DHIS2 Windows Demo</id>
+             <id>DHIS2 Windows Embedded JRE</id>
              <phase>package</phase>
                <configuration>
                 <executable>${env.BITROCK_HOME}/bin/builder</executable>
                 <arguments>
                 <argument>build</argument>
-                <argument>${basedir}/src/bitrock/DHIS2_demo_birt.xml</argument>
+                <argument>${basedir}/src/bitrock/DHIS2_live_embedded.xml</argument>
                 <argument>windows</argument>
                 </arguments>
                </configuration>