Skip to content

Commit

Permalink
Updating MySql and Java download URLs as follow up to, Fix installer …
Browse files Browse the repository at this point in the history
…target in build.xml - TRUNK-1687

git-svn-id: http://svn.openmrs.org/openmrs/trunk@18189 5bac5841-c719-aa4e-b3fe-cce5062f897a
  • Loading branch information
wluyima committed Feb 11, 2011
1 parent 8dd0cdc commit f6c3a8a
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
# #
####################################################

jdk.filename=jdk-6u20-ea-bin-b02-windows-i586-01_apr_2010.exe
mysql.filename=mysql-essential-5.1.53-win32.msi
jdk.filename=jdk-6u25-ea-bin-b01-windows-i586-27_jan_2011.exe
mysql.filename=mysql-essential-5.1.55-win32.msi
tomcat.filename=apache-tomcat-6.0.26.exe
build.dir=${basedir}/build
metadata.dir=${basedir}/metadata
webapp.target=${basedir}/webapp/target
installer-dependencies.dir=${build.dir}/installer
jdk.download.url=http://download.java.net/jdk6/6u21/promoted/b02/binaries/${jdk.filename}
jdk.download.url=http://download.java.net/jdk6/6u25/promoted/b01/binaries/${jdk.filename}
mysql.download.url=http://mirror.cogentco.com/pub/mysql/MySQL-5.1/${mysql.filename}
tomcat.download.url=http://archive.apache.org/dist/tomcat/tomcat-6/v6.0.26/bin/${tomcat.filename}
openmrs.download.url=http://downloads.sourceforge.net/project/openmrsdev/prereleases/OpenMRS_1.8.0_Beta/openmrs.war
Expand Down
4 changes: 2 additions & 2 deletions metadata/installer/installer_setup.nsh
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@ FunctionEnd
;Downloads and installs Java 6
Function InstallJava
${If} $JavaExists == false
StrCpy $JavaSetup "$TEMP\jdk-6u20-ea-bin-b02-windows-i586-01_apr_2010.exe"
StrCpy $JavaSetup "$TEMP\jdk-6u25-ea-bin-b01-windows-i586-27_jan_2011.exe"
!ifdef JAVA_6_DOWNLOAD_URL
Call DownloadJava
Call VerifyJavaDownloadStatus
Expand Down Expand Up @@ -394,7 +394,7 @@ FunctionEnd
;Downloads and installs Mysql 5.1
Function InstallMySql
${If} $MysqlExists == false
StrCpy $MysqlSetup "$TEMP\mysql-essential-5.1.53-win32.msi"
StrCpy $MysqlSetup "$TEMP\mysql-essential-5.1.55-win32.msi"
!ifdef MYSQL_DOWNLOAD_URL
Call DownloadMysql
Call VerifyMysqlDownloadStatus
Expand Down
4 changes: 2 additions & 2 deletions metadata/installer/openmrs_offline.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

Function ExtractJavaSetupToTemp
SetOutPath "$TEMP" ; Set output path to the installation directory
File "jdk-6u20-ea-bin-b02-windows-i586-01_apr_2010.exe" ; Put file there
File "jdk-6u25-ea-bin-b01-windows-i586-27_jan_2011.exe" ; Put file there
FunctionEnd

Function ExtractTomcatSetupToTemp
Expand All @@ -14,5 +14,5 @@ FunctionEnd

Function ExtractMysqlSetupToTemp
SetOutPath "$TEMP" ; Set output path to the installation directory
File "mysql-essential-5.1.53-win32.msi" ; Put file there
File "mysql-essential-5.1.55-win32.msi" ; Put file there
FunctionEnd

0 comments on commit f6c3a8a

Please sign in to comment.