=== added file 'installers/resources/files/README.html' --- installers/resources/files/README.html 1970-01-01 00:00:00 +0000 +++ installers/resources/files/README.html 2011-03-14 14:10:54 +0000 @@ -0,0 +1,79 @@ + + + + + + +

Installing DHIS 2

+ +

Important note:

+In the resources folder, make sure the following files are present +before you start the installation:

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
FileDescriptionSource
dhis2db.zipA zip file that contains a plain text dump of your database.A plain text dump of your database.
dhis2_user_manual_en.pdfThe DHIS 2 user manualClick to download:
+ + http://dhis2.org/doc/snapshot/en/pdf/dhis2_user_manual_en.pdf
dhis.warThe DHIS 2 war fileDownload the latest release from:
+ + http://dhis2.org/downloads
ChromeStandaloneSetup.exeGoogle Chrome web browserDownload the latest release from:
+ + http://www.google.com/chrome/eula.html?standalone=1
jre-<something>.exeJava Runtime EnvironmentDownload Windows 7/XP/Vista/2000/2003/2008 Offline from: + + http://www.java.com/en/download/manual.jsp
postgresql-<something>.exePostgreSQL database systemDownload the newest Win x86-32 installer from:
+ + http://www.enterprisedb.com/products-services-training/pgdownload#windows
+ + + === modified file 'installers/resources/postgres/restore_db_psql.bat' --- installers/resources/postgres/restore_db_psql.bat 2011-03-09 20:21:25 +0000 +++ installers/resources/postgres/restore_db_psql.bat 2011-03-14 14:10:54 +0000 @@ -1,4 +1,4 @@ SET PGPASSWORD=PG_PASSWORD "c:\Program Files\PostgreSQL\9.0\bin\psql.exe" -c "CREATE USER dhis CREATEDB LOGIN PASSWORD 'dhis';" -U postgres -w postgres "c:\Program Files\Postgresql\9.0\bin\createdb.exe" -U postgres -w -O dhis dhis2db -"c:\Program Files\Postgresql\9.0\bin\psql.exe" -U postgres -w -d dhis2db -f dhis2db.dump \ No newline at end of file +"c:\Program Files\Postgresql\9.0\bin\psql.exe" -U postgres -w -d dhis2db -f "DATABASE_FILE" \ No newline at end of file === modified file 'installers/src/bitrock/DHIS2_pginstaller_generic.xml' --- installers/src/bitrock/DHIS2_pginstaller_generic.xml 2011-03-09 21:57:58 +0000 +++ installers/src/bitrock/DHIS2_pginstaller_generic.xml 2011-03-14 14:10:54 +0000 @@ -3,7 +3,7 @@ DHIS2 2.1 ${product_shortname}-${product_version}-${platform_name}-live-generic-en.${platform_exec_suffix} - ../../resources/files/Readme.txt + ../../resources/files/Readme_generic.txt ../../resources/files/Licence.txt ../../resources/images/dhis2-logo-blue-rotated.png ../../resources/images/dhis2-logo-blue.png @@ -170,6 +170,50 @@ ${installer_directory}\resources\dhis.war + + + coreWarningIsShown + true + + + 1 + ${installer_directory}\resources\dhis.war + + + + + Cannot find dhis.war in the resources folder. Place it there and press OK. If it is still not found, the installation process will be aborted. + dhis.war is missing + + + 1 + ${installer_directory}\resources\dhis.war + + + + + Could not find dhis.war in the resources folder. + Could not find dhis.war in the resources folder. + + + 1 + ${installer_directory}\resources\dhis.war + + + + + Thank you! dhis.war was located. The installation process will continue. + Thank you! + + + ${installer_directory}\resources\dhis.war + + + ${coreWarningIsShown} + + + + Java @@ -186,6 +230,50 @@ ${installer_directory}\resources + + + jreWarningIsShown + true + + + 1 + ${installer_directory}\resources\jre*.exe + + + + + Cannot find jre*.exe in the resources folder. Place it there and press OK. If it is still not found, the installation process will be aborted. + JRE is missing + + + 1 + ${installer_directory}\resources\jre*.exe + + + + + Could not find jre*.exe in the resources folder. + Could not find jre*.exe in the resources folder. + + + 1 + ${installer_directory}\resources\jre*.exe + + + + + Thank you! The JRE file was located. The installation process will continue. + Thank you! + + + ${installer_directory}\resources\jre*.exe + + + ${jreWarningIsShown} + + + + postgres @@ -226,6 +314,50 @@ ${installer_directory}\resources + + + postgresWarningIsShown + true + + + 1 + ${installer_directory}\resources\postgresql*.exe + + + + + Cannot find postgresql*.exe in the resources folder. Place it there and press OK. If it is still not found, the installation process will be aborted. + postgresql*.exe is missing + + + 1 + ${installer_directory}\resources\postgresql*.exe + + + + + Could not find postgresql*.exe in the resources folder. + Could not find postgresql*.exe in the resources folder. + + + 1 + ${installer_directory}\resources\postgresql*.exe + + + + + Thank you! The PostgreSQL setup file was located. The installation process will continue. + Thank you! + + + ${installer_directory}\resources\postgresql*.exe + + + ${postgresWarningIsShown} + + + + dhis2db @@ -247,10 +379,18 @@ + + ${installdir}\tmp\dhis2db + - ${installdir}\tmp\ + ${installdir}\tmp\dhis2db\ ${installer_directory}\resources\dhis2db.zip + + ${installdir}\tmp\dhis2db + *dhis* + databaseFile + ${installdir}\tmp\restore_db_psql.bat regexp @@ -259,6 +399,10 @@ PG_PASSWORD ${pg_password} + + DATABASE_FILE + ${databaseFile} + @@ -275,6 +419,50 @@ ${installdir}\tmp\restore_db_psql.bat + + + dhis2dbWarningIsShown + true + + + 1 + ${installer_directory}\resources\dhis2db.zip + + + + + Cannot find dhis2db.zip in the resources folder. Place it there and press OK. If it is still not found, the installation process will be aborted. + dhis2db.zip is missing + + + 1 + ${installer_directory}\resources\dhis2db.zip + + + + + Could not find dhis2db.zip in the resources folder. + Could not find dhis2db.zip in the resources folder. + + + 1 + ${installer_directory}\resources\dhis2db.zip + + + + + Thank you! dhis2db.zip was located. The installation process will continue. + Thank you! + + + ${installer_directory}\resources\dhis2db.zip + + + ${dhis2dbWarningIsShown} + + + + dhis2docs @@ -292,6 +480,50 @@ Adding DHIS 2 documentation + + + docsWarningIsShown + true + + + 1 + ${installer_directory}\resources\dhis2_user_manual_en.pdf + + + + + Cannot find dhis2_user_manual_en.pdf in the resources folder. Place it there and press OK. If it is still not found, the installation process will be aborted. + dhis2_user_manual_en.pdf is missing + + + 1 + ${installer_directory}\resources\dhis2_user_manual_en.pdf + + + + + Could not find dhis2_user_manual_en.pdf in the resources folder. + Could not find dhis2_user_manual_en.pdf in the resources folder. + + + 1 + ${installer_directory}\resources\dhis2_user_manual_en.pdf + + + + + Thank you! dhis2_user_manual_en.pdf was located. The installation process will continue. + Thank you! + + + ${installer_directory}\resources\dhis2_user_manual_en.pdf + + + ${docsWarningIsShown} + + + + Chrome @@ -308,6 +540,50 @@ ${installer_directory}\resources + + + chromeWarningIsShown + true + + + 1 + ${installer_directory}\resources\ChromeStandaloneSetup.exe + + + + + Cannot find ChromeStandaloneSetup.exe in the resources folder. Place it there and press OK. If it is still not found, the installation process will be aborted. + ChromeStandaloneSetup.exe is missing + + + 1 + ${installer_directory}\resources\ChromeStandaloneSetup.exe + + + + + Could not find ChromeStandaloneSetup.exe in the resources folder. + Could not find ChromeStandaloneSetup.exe in the resources folder. + + + 1 + ${installer_directory}\resources\ChromeStandaloneSetup.exe + + + + + Thank you! ChromeStandaloneSetup.exe was located. The installation process will continue. + Thank you! + + + ${installer_directory}\resources\ChromeStandaloneSetup.exe + + + ${chromeWarningIsShown} + + + +