dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3001
committer: Jason P. Pickering <jason.p.pickering@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2011-03-10 19:46:30 +0100
message:
  Minor change to Postgres installer to detect Java. Updated README to with a blurb on the NSIS installer.
modified:
  installers/INSTALLER-README.txt
  installers/src/bitrock/DHIS2_pginstaller.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 'installers/INSTALLER-README.txt'
--- installers/INSTALLER-README.txt	2011-03-10 14:37:48 +0000
+++ installers/INSTALLER-README.txt	2011-03-10 18:46:30 +0000
@@ -3,13 +3,18 @@
 to a desktop computer. The installer, along with the build script should build
 a complete DHIS2 system ready for deployment from source.
 
+There are several different installers, utilizing different framworks, and which are intented
+for different purposes and deployment architectures. 
+
+
 BitRock installer notes
 
- The most up to date is the BitRock installer. 
-The current install will build a Windows 
-executable which will offer an install of Postgresql, Java, and a template DHIS2 database. The source of the current installer
-can be found in the file named DHIS2_pginstaller.  A few alternative installer
-flavors are described at the end of this document.
+ 
+The current install will build a Windows executable which will offer an install of Postgresql, Java, 
+and a template DHIS2 database. The database can be easily replaced by a Postgresql dump and restored instead
+of the empty template databse. 
+The source of the current installer can be found in the file named DHIS2_pginstaller.
+  A few alternative installer flavors utilizing Bitrock are described at the end of this document.
 
 It is critical that you set all of the environment variables to the correct paths in your system. 
 Modify the environment variables in the build.sh (on Linux) or build.bat (on Windows) script to suit your needs. 
@@ -118,3 +123,10 @@
 
 Questions about these installer can be directed to Jason Pickering <jason.p.pickering@xxxxxxxxx>. 
 
+
+
+NSIS Installer
+
+This installer (located in the /src/nsis) folder is based on the NSIS installer framework (http://nsis.sourceforge.net/)
+. This installer will install MySQL, Tomcat, Java  (if needed) and Google Chrome and of course DHIS2, 
+as well as restoring the MySQL database from a file included in the installer itself. 
\ No newline at end of file

=== modified file 'installers/src/bitrock/DHIS2_pginstaller.xml'
--- installers/src/bitrock/DHIS2_pginstaller.xml	2011-03-10 14:37:48 +0000
+++ installers/src/bitrock/DHIS2_pginstaller.xml	2011-03-10 18:46:30 +0000
@@ -9,6 +9,19 @@
     <logoImage>../../resources/images/dhis2-logo.png</logoImage>
     <splashImage>../../resources/images/dhis2-logo.png</splashImage>
     <allowLanguageSelection>1</allowLanguageSelection>
+    <preInstallationActionList>
+        <autodetectJava>
+            <explanation>Detecting Java</explanation>
+            <promptUser>0</promptUser>
+            <ruleList>
+                <compareValues>
+                    <logic>equals</logic>
+                    <value1>${java_autodetected}</value1>
+                    <value2>1</value2>
+                </compareValues>
+            </ruleList>
+        </autodetectJava>
+    </preInstallationActionList>
     <readyToInstallActionList>
         <createDirectory>
             <path>${installdir}/database</path>
@@ -294,6 +307,14 @@
                     <programArguments>/s /v</programArguments>
                     <progressText>Installing Java Runtime Enviornment</progressText>
                     <workingDirectory>${installdir}\tmp\</workingDirectory>
+                    <ruleList>
+                        <compareValues>
+                            <logic>equals</logic>
+                            <negate>1</negate>
+                            <value1>${java_autodetected}</value1>
+                            <value2>1</value2>
+                        </compareValues>
+                    </ruleList>
                 </runProgram>
             </postInstallationActionList>
         </component>