Skip to content

On 64-bit Windows install 64-bit Python 2.7.14 #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Mar 29, 2019
Merged

On 64-bit Windows install 64-bit Python 2.7.14 #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a7a5da4
On Windows 10 install 64-bit Python 2.7.14
j3hill Mar 29, 2019
ef7b17b
On Windows 10 install 64-bit Python 2.7.14
j3hill Mar 29, 2019
fbe391e
Update PowerShell "download-prerequisites.ps1" script to enable TLS, …
j3hill Mar 29, 2019
1e11665
Check for 64-bit Windows, and install the correct version of Python
j3hill Mar 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions prerequisites/download-prerequisites.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
[Net.ServicePointManager]::SecurityProtocol = "tls12, tls11, tls"
$storageDir = $pwd
$webclient = New-Object System.Net.WebClient
#Download gcc-arm-none-eabi
Expand Down Expand Up @@ -25,6 +26,6 @@ $url = "https://developer.mbed.org/media/downloads/drivers/mbedWinSerial_16466.e
$file = "$storageDir\mbedWinSerial_16466.exe"
$webclient.DownloadFile($url,$file)
#Download mbed-cli
$url = "https://www.github.com/ARMmbed/mbed-cli/archive/1.9.0.zip"
$file = "$storageDir\mbed-cli-1.9.0.zip"
$url = "https://www.github.com/ARMmbed/mbed-cli/archive/1.10.0.zip"
$file = "$storageDir\mbed-cli-1.10.0.zip"
$webclient.DownloadFile($url,$file)
17 changes: 13 additions & 4 deletions source/install.nsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ ${StrTrimNewLines}
!insertmacro VersionCompare
!include "Sections.nsh"
!include WinVer.nsh
!include x64.nsh
!include "EnvVarUpdate.nsh"
!include PathUpdate.nsh

Expand All @@ -49,11 +50,12 @@ ${StrTrimNewLines}
;Config Section
!define PRODUCT_NAME "Mbed CLI for Windows"
!define PRODUCT_VERSION "0.4.10"
!define MBED_CLI_ZIP "mbed-cli-1.9.0.zip"
!define MBED_CLI_VERSION "mbed-cli-1.9.0"
!define MBED_CLI_ZIP "mbed-cli-1.10.0.zip"
!define MBED_CLI_VERSION "mbed-cli-1.10.0"
!define MBED_CLI_ENV "MBED_CLI_TOOLS"
!define PRODUCT_PUBLISHER "Arm Mbed"
!define PYTHON_INSTALLER "python-2.7.14.msi"
!define PYTHON_INSTALLER_64 "python-2.7.14.amd64.msi"
!define GCC_EXE "gcc-arm-none-eabi-6-2017-q2-update-win32.exe"
!define GIT_INSTALLER "Git-2.17.1.2-32-bit.exe"
!define MERCURIAL_INSTALLER "Mercurial-4.1.1.exe"
Expand Down Expand Up @@ -137,11 +139,18 @@ Section "python" SecPython
${endif}
${EndIf}
pythonInstall:
; Install options for python taken from https://www.python.org/download/releases/2.5/msi/
; configure python to add itsself to the path.
; check for 64-bit Windows
${If} ${RunningX64}
File "..\prerequisites\${PYTHON_INSTALLER_64}"
nsExec::ExecToStack '"msiexec" /i "$INSTDIR\${PYTHON_INSTALLER_64}" ALLUSERS=1 ADDLOCAL=ALL /qn'
Delete $INSTDIR\${PYTHON_INSTALLER_64}
${Else}
File "..\prerequisites\${PYTHON_INSTALLER}"
; Install options for python taken from https://www.python.org/download/releases/2.5/msi/
; This gets python to add itsself to the path.
nsExec::ExecToStack '"msiexec" /i "$INSTDIR\${PYTHON_INSTALLER}" ALLUSERS=1 ADDLOCAL=ALL /qn'
Delete $INSTDIR\${PYTHON_INSTALLER}
${EndIf}
pythonExit:
SectionEnd

Expand Down