Skip to content

Revert 64bit changes #38

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

Closed
wants to merge 2 commits into from
Closed

Revert 64bit changes #38

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0da711b
Revert "Merge pull request #36 from j3hill/pyth64"
bridadan Apr 15, 2019
544b5cc
Add back changes for Mbed CLI 1.10.0
bridadan Apr 15, 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
13 changes: 2 additions & 11 deletions source/install.nsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ ${StrTrimNewLines}
!insertmacro VersionCompare
!include "Sections.nsh"
!include WinVer.nsh
!include x64.nsh
!include "EnvVarUpdate.nsh"
!include PathUpdate.nsh

Expand All @@ -55,7 +54,6 @@ ${StrTrimNewLines}
!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 @@ -139,18 +137,11 @@ 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