diff options
| author | ruki <[email protected]> | 2019-06-09 15:58:33 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-06-09 15:58:33 +0800 |
| commit | 3a1db57753528053ab1c457675257efe7250bc87 (patch) | |
| tree | f6a0a74de240153123268fd483e3cdd3d0ee0050 /scripts | |
| parent | e165a8e43abed4eb2eca64c3b5adefb57cd65600 (diff) | |
| parent | 8049d92b3e9aef35e4f124e5ae361bdd1f5c5435 (diff) | |
Merge pull request #444 from OpportunityLiu/test
Improve test library
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/get.ps1 | 18 | ||||
| -rw-r--r-- | scripts/installer.nsi | 52 |
2 files changed, 53 insertions, 17 deletions
diff --git a/scripts/get.ps1 b/scripts/get.ps1 index 8bce62861..d471affd5 100644 --- a/scripts/get.ps1 +++ b/scripts/get.ps1 @@ -5,7 +5,7 @@ param ( [string]$branch = "master", [string]$version = "v2.2.6", - [string]$installdir = $(Join-Path $(if($env:HOME) { $env:HOME } else { "C:\" }) 'xmake') + [string]$installdir = $(Join-Path $(if($HOME) { $HOME } else { "C:\" }) 'xmake') ) function myExit($code) { @@ -24,13 +24,15 @@ function writeLogoLine($msg) { Write-Host $msg -BackgroundColor White -ForegroundColor DarkBlue } -writeLogoLine ' _ ' -writeLogoLine ' __ ___ __ __ __ _| | ______ ' -writeLogoLine ' \ \/ / | \/ |/ _ | |/ / __ \ ' -writeLogoLine ' > < | \__/ | /_| | < ___/ ' -writeLogoLine ' /_/\_\_|_| |_|\__ \|_|\_\____| getter ' -writeLogoLine ' ' -writeLogoLine ' ' +if (-not $env:CI) { + writeLogoLine ' _ ' + writeLogoLine ' __ ___ __ __ __ _| | ______ ' + writeLogoLine ' \ \/ / | \/ |/ _ | |/ / __ \ ' + writeLogoLine ' > < | \__/ | /_| | < ___/ ' + writeLogoLine ' /_/\_\_|_| |_|\__ \|_|\_\____| getter ' + writeLogoLine ' ' + writeLogoLine ' ' +} if ($PSVersionTable.PSVersion.Major -lt 5) { writeErrorTip 'Sorry but PowerShell v5+ is required' diff --git a/scripts/installer.nsi b/scripts/installer.nsi index aac0a9ea8..a24d12ab5 100644 --- a/scripts/installer.nsi +++ b/scripts/installer.nsi @@ -11,20 +11,50 @@ !include "WordFunc.nsh"
!include "WinMessages.nsh"
+; xmake version Information
+!ifndef MAJOR
+ !define MAJOR 2
+!endif
+!ifndef MINOR
+ !define MINOR 2
+!endif
+!ifndef ALTER
+ !define ALTER 6
+!endif
+!ifndef BUILD
+ !define BUILD 201906070000
+!endif
+
+!define VERSION ${MAJOR}.${MINOR}.${ALTER}
+!define VERSION_FULL ${VERSION}+${BUILD}
+
+!ifdef x64
+ !define ARCH x64
+!else
+ !define ARCH x86
+!endif
+
;--------------------------------
; The name of the installer
-Name "xmake-v2.2.6"
+Name "XMake - v${VERSION}"
; The file to write
OutFile "xmake.exe"
; The default installation directory
-InstallDir $PROGRAMFILES\xmake
+!ifdef x64
+ InstallDir $PROGRAMFILES64\XMake
+!else
+ InstallDir $PROGRAMFILES\XMake
+!endif
; Request application privileges for Windows Vista
RequestExecutionLevel admin
+; Set DPI Aware
+ManifestDPIAware true
+
;--------------------------------
; Interface Settings
@@ -60,13 +90,17 @@ RequestExecutionLevel admin ;--------------------------------
; Version Information
-VIProductVersion "2.2.6.0526"
-VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "XMake"
-VIAddVersionKey /LANG=${LANG_ENGLISH} "Comments" "website: https://xmake.io"
-VIAddVersionKey /LANG=${LANG_ENGLISH} "CompanyName" "The TBOOX Open Source Group"
-VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "Copyright 2015-2019 tboox.org"
-VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "A cross-platform build utility based on Lua"
-VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "2.2.6"
+
+VIProductVersion ${VERSION}.0
+VIFileVersion ${VERSION}.0
+VIAddVersionKey /LANG=0 ProductName XMake
+VIAddVersionKey /LANG=0 Comments "A cross-platform build utility based on Lua$\nwebsite: https://xmake.io"
+VIAddVersionKey /LANG=0 CompanyName "The TBOOX Open Source Group"
+VIAddVersionKey /LANG=0 LegalCopyright "Copyright (C) 2015-2019 Ruki Wang, tboox.org, xmake.io$\nCopyright (C) 2005-2015 Mike Pall, luajit.org"
+VIAddVersionKey /LANG=0 FileDescription "XMake Installer - v${VERSION}"
+VIAddVersionKey /LANG=0 OriginalFilename "xmake-${ARCH}.exe"
+VIAddVersionKey /LANG=0 FileVersion ${VERSION_FULL}
+VIAddVersionKey /LANG=0 ProductVersion ${VERSION_FULL}
;--------------------------------
|