dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #10890
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 3008: More tweaks to Postgresql full installer.
------------------------------------------------------------
revno: 3008
committer: Jason P. Pickering <jason.p.pickering@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2011-03-11 15:16:44 +0100
message:
More tweaks to Postgresql full installer.
modified:
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/src/bitrock/DHIS2_pginstaller.xml'
--- installers/src/bitrock/DHIS2_pginstaller.xml 2011-03-11 10:44:54 +0000
+++ installers/src/bitrock/DHIS2_pginstaller.xml 2011-03-11 14:16:44 +0000
@@ -53,6 +53,60 @@
<vendor>DHIS2</vendor>
<componentList>
<component>
+ <name>jre</name>
+ <description>JRE</description>
+ <canBeEdited>0</canBeEdited>
+ <selected>1</selected>
+ <show>1</show>
+ <folderList>
+ <folder>
+ <description>JRE</description>
+ <destination>${installdir}\tmp\</destination>
+ <name>JRE</name>
+ <platforms>windows</platforms>
+ <distributionFileList>
+ <distributionFile>
+ <origin>../../resources/jre/jre-6u24-windows-i586-s.exe</origin>
+ </distributionFile>
+ </distributionFileList>
+ </folder>
+ </folderList>
+ <postInstallationActionList>
+ <runProgram>
+ <customErrorMessage>No valid JRE was detcted and one could not be installed. The installation of DHIS2 will be aborted.</customErrorMessage>
+ <explanation>Installing Java Runtime Enviornment</explanation>
+ <program>jre-6u24-windows-i586-s.exe</program>
+ <programArguments>/s /v /log ${installdir}\logs\javainstall.txt </programArguments>
+ <progressText>Installing Java Runtime Enviornment</progressText>
+ <useMSDOSPath>0</useMSDOSPath>
+ <workingDirectory>${installdir}\tmp\</workingDirectory>
+ <onErrorActionList>
+ <showQuestion>
+ <default>yes</default>
+ <text>Java was unable to be installed. Do you wish to proceed anyway?</text>
+ <variable>${proceed_without_java}</variable>
+ </showQuestion>
+ </onErrorActionList>
+ <ruleList>
+ <compareValues>
+ <logic>equals</logic>
+ <value1>${java_autodetected}</value1>
+ <value2>0</value2>
+ </compareValues>
+ </ruleList>
+ </runProgram>
+ <exit>
+ <ruleList>
+ <compareValues>
+ <logic>equals</logic>
+ <value1>${proceed_without_java}</value1>
+ <value2>0</value2>
+ </compareValues>
+ </ruleList>
+ </exit>
+ </postInstallationActionList>
+ </component>
+ <component>
<name>dhis2live</name>
<description>DHIS2 Live</description>
<canBeEdited>0</canBeEdited>
@@ -223,6 +277,12 @@
</distributionFileList>
</folder>
</folderList>
+ <initializationActionList>
+ <setInstallerVariable>
+ <name>${postgres_overwrite|</name>
+ <value>1</value>
+ </setInstallerVariable>
+ </initializationActionList>
<parameterList>
<booleanParameter>
<name>postgres_overwrite</name>
@@ -244,9 +304,10 @@
<postInstallationActionList>
<runProgram>
<explanation>Installing Postgresql</explanation>
- <program>postgresql*.exe</program>
- <programArguments>--superaccount postgres --servicepassword ${pg_password} --superpassword ${pg_password}</programArguments>
+ <program>postgresql-9.0.1-1-windows.exe</program>
+ <programArguments>--unattendedmodeui none --mode unattended --superaccount postgres --servicepassword ${pg_password} --superpassword ${pg_password}</programArguments>
<progressText>Installing Postgresql</progressText>
+ <useMSDOSPath>0</useMSDOSPath>
<workingDirectory>${installdir}\tmp\</workingDirectory>
<ruleList>
<compareValues>
@@ -259,42 +320,6 @@
</postInstallationActionList>
</component>
<component>
- <name>jre</name>
- <description>JRE</description>
- <canBeEdited>0</canBeEdited>
- <selected>1</selected>
- <show>1</show>
- <folderList>
- <folder>
- <description>JRE</description>
- <destination>${installdir}\tmp\</destination>
- <name>JRE</name>
- <platforms>windows</platforms>
- <distributionFileList>
- <distributionFile>
- <origin>../../resources/jre/jre-6u24-windows-i586-s.exe</origin>
- </distributionFile>
- </distributionFileList>
- </folder>
- </folderList>
- <postInstallationActionList>
- <runProgram>
- <explanation>Installing Java Runtime Enviornment</explanation>
- <program>jre-6u24-windows-i586-s.exe</program>
- <programArguments>/s /v</programArguments>
- <progressText>Installing Java Runtime Enviornment</progressText>
- <workingDirectory>${installdir}\tmp\</workingDirectory>
- <ruleList>
- <compareValues>
- <logic>equals</logic>
- <value1>${java_autodetected}</value1>
- <value2>0</value2>
- </compareValues>
- </ruleList>
- </runProgram>
- </postInstallationActionList>
- </component>
- <component>
<name>dhis2db</name>
<description>DHIS2 database</description>
<canBeEdited>1</canBeEdited>
@@ -331,8 +356,8 @@
</passwordParameter>
<stringParameter>
<name>dbname</name>
- <title>Please enter the name of the DHIS2 database.</title>
- <description></description>
+ <title>DHIS2 Database</title>
+ <description>Please provide the name of the database for DHIS2.</description>
<explanation></explanation>
<value></value>
<default>dhis2db</default>
@@ -367,11 +392,11 @@
</substitute>
<runProgram>
<abortOnError>0</abortOnError>
- <customErrorMessage>An error occured. Your database may not have been restored.</customErrorMessage>
<explanation>Restoring DHIS2 Database</explanation>
<program>restore_db.bat</program>
<programArguments></programArguments>
<progressText>Please be patient. Restoring DB.</progressText>
+ <showMessageOnError>0</showMessageOnError>
<workingDirectory>${installdir}\tmp\</workingDirectory>
</runProgram>
<deleteFile>
