Browse Source

Merge branch 'master' of https://github.com/TechEmpower/FrameworkBenchmarks

Alex Schneider 11 years ago
parent
commit
772d85aae1
1 changed files with 4 additions and 4 deletions
  1. 4 4
      toolset/setup/windows/installer.ps1

+ 4 - 4
toolset/setup/windows/installer.ps1

@@ -10,9 +10,9 @@ $python_version           = "27"
 $wincache_installer_file  = "wincache-1.3.4-5.4-nts-vc9-x86.exe"
 $wincache_installer_file  = "wincache-1.3.4-5.4-nts-vc9-x86.exe"
 $wincache_installer_path  = "wincache-1.3.4/$wincache_installer_file"
 $wincache_installer_path  = "wincache-1.3.4/$wincache_installer_file"
 $go_installer_file        = "go1.2.windows-amd64.msi"
 $go_installer_file        = "go1.2.windows-amd64.msi"
-$jre_installer_file       = "jre-7u51-windows-x64.exe"
-$jdk_installer_file       = "jdk-7u51-windows-x64.exe"
-$jdk_master_hash          = "d1367410be659f1b47e554e7bd011ea0" 
+$jre_installer_file       = "jdk-7u65-windows-x64.exe"
+$jdk_installer_file       = "jdk-7u65-windows-x64.exe"
+$jdk_master_hash          = "f0270817998c7408b24a2dd9ac420346" 
 # http://www.oracle.com/technetwork/java/javase/downloads/java-se-binaries-checksum-1956892.html
 # http://www.oracle.com/technetwork/java/javase/downloads/java-se-binaries-checksum-1956892.html
 $resin_version            = "resin-4.0.36"
 $resin_version            = "resin-4.0.36"
 $resin_installer_file     = "$resin_version.zip"
 $resin_installer_file     = "$resin_version.zip"
@@ -337,4 +337,4 @@ $cygwin_install_dir = "C:\Cygwin"
 Start-Process $cygwin_installer_local "-q -n -l $cygwin_installer_dir -s http://mirrors.kernel.org/sourceware/cygwin/ -R $cygwin_install_dir -P openssh" -WorkingDirectory "$cygwin_installer_dir" -Wait -RedirectStandardOutput $cygwin_installer_dir\install.log
 Start-Process $cygwin_installer_local "-q -n -l $cygwin_installer_dir -s http://mirrors.kernel.org/sourceware/cygwin/ -R $cygwin_install_dir -P openssh" -WorkingDirectory "$cygwin_installer_dir" -Wait -RedirectStandardOutput $cygwin_installer_dir\install.log
 $env:Path += ";$cygwin_install_dir;$cygwin_install_dir\bin"; [Environment]::SetEnvironmentVariable("Path", $env:Path, [System.EnvironmentVariableTarget]::Machine)
 $env:Path += ";$cygwin_install_dir;$cygwin_install_dir\bin"; [Environment]::SetEnvironmentVariable("Path", $env:Path, [System.EnvironmentVariableTarget]::Machine)
 
 
-cd $basedir
+cd $basedir