Skip to content

Commit

Permalink
Merge pull request #22 from ARMmbed/release-0.4.4
Browse files Browse the repository at this point in the history
Update to version 0.4.4
  • Loading branch information
arekzaluski authored Feb 22, 2018
2 parents 9c9fb0b + 31ed1b8 commit 6da8ff2
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 11 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ $ powershell -ExecutionPolicy ByPass -File download-prerequisites.ps1

## Process

* Install the mbed CLI dependencies - Python, GCC, Mercurial, Git and the mbed Serial Driver - and then mbed CLI 1.2.2 from source.
* Install the mbed CLI dependencies - Python, GCC, Mercurial, Git and the mbed Serial Driver - and then mbed CLI 1.4.0 from source.
* Contains two installer types:
* Default: Installs all dependencies.
* Advanced: Allows to select dependencies.
Expand Down
4 changes: 2 additions & 2 deletions prerequisites/download-prerequisites.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,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://github.com/ARMmbed/mbed-cli/archive/1.2.2.zip"
$file = "$storageDir\mbed-cli-1.2.2.zip"
$url = "https://github.com/ARMmbed/mbed-cli/archive/1.4.0.zip"
$file = "$storageDir\mbed-cli-1.4.0.zip"
$webclient.DownloadFile($url,$file)
29 changes: 21 additions & 8 deletions source/cliInstall.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@ ${StrTrimNewLines}
;--------------------------------
;Config Section
!define PRODUCT_NAME "Mbed CLI for Windows"
!define PRODUCT_VERSION "0.4.3"
!define MBED_CLI_ZIP "mbed-cli-1.2.2.zip"
!define MBED_CLI_VERSION "mbed-cli-1.2.2"
!define PRODUCT_VERSION "0.4.4"
!define MBED_CLI_ZIP "mbed-cli-1.4.0.zip"
!define MBED_CLI_VERSION "mbed-cli-1.4.0"
!define PRODUCT_PUBLISHER "Arm Mbed"
!define PYTHON_INSTALLER "python-2.7.13.msi"
!define GCC_EXE "gcc-arm-none-eabi-6-2017-q2-update-win32.exe"
Expand Down Expand Up @@ -217,11 +217,24 @@ SectionEnd
;--------------------------------
;Init
Function .onInit
;Check Windows version. Windows 7 or above is required
${IfNot} ${AtLeastWin7}
MessageBox MB_OK "Windows 7 and above is required"
Quit
${EndIf}
;Check Windows version. Windows 7 or above is required
${IfNot} ${AtLeastWin7}
MessageBox MB_OK "Windows 7 and above is required"
Quit
${EndIf}
ReadRegStr $R0 SHCTX "${UNINST_KEY}" "UninstallString"
StrCmp $R0 "" done

MessageBox MB_YESNO|MB_ICONEXCLAMATION \
"${PRODUCT_NAME} has been detected on this system. It will be removed during this installation process. Would you like to continue?" \
IDYES uninst
Abort

;Run the uninstaller
uninst:
ClearErrors
Exec '$R0' ;Run uninstaller
done:
functionEnd

;--------------------------------
Expand Down

0 comments on commit 6da8ff2

Please sign in to comment.