aboutsummaryrefslogtreecommitdiff
path: root/project
diff options
context:
space:
mode:
authorh.udo <hudokkow@gmail.com>2018-06-08 12:38:00 +0100
committerh.udo <hudokkow@gmail.com>2018-06-12 13:06:20 +0100
commit43f20a4a0beff9101aba211cdce96d01d95dd0df (patch)
treed122dd4ce4aaaa8e49d05e61dd1ee5367a159dc1 /project
parent00f7220f7ef7ef1c06b9c3aae1137182f4ccc797 (diff)
[project] nuke whitespace
Diffstat (limited to 'project')
-rw-r--r--project/BuildDependencies/scripts/get_formed.cmd4
-rw-r--r--project/Win32BuildSetup/genNsisInstaller.nsi28
2 files changed, 16 insertions, 16 deletions
diff --git a/project/BuildDependencies/scripts/get_formed.cmd b/project/BuildDependencies/scripts/get_formed.cmd
index 91142455cc..f0603f4e77 100644
--- a/project/BuildDependencies/scripts/get_formed.cmd
+++ b/project/BuildDependencies/scripts/get_formed.cmd
@@ -64,10 +64,10 @@ IF EXIST %1 (
) ELSE (
CALL :setSubStageName Downloading %1...
SET DOWNLOAD_URL=%KODI_MIRROR%/build-deps/win32/%1
- %WGET% -S --quiet --tries=5 --retry-connrefused --waitretry=2 --show-progress "!DOWNLOAD_URL!" 2>&1 | findstr /L /I "Location:"
+ %WGET% -S --quiet --tries=5 --retry-connrefused --waitretry=2 --show-progress "!DOWNLOAD_URL!" 2>&1 | findstr /L /I "Location:"
REM Apparently there's a quirk in cmd so this means if error level => 1
IF ERRORLEVEL 1 (
- ECHO %1^|Download of !DOWNLOAD_URL! failed >> %FORMED_FAILED_LIST%
+ ECHO %1^|Download of !DOWNLOAD_URL! failed >> %FORMED_FAILED_LIST%
ECHO %1^|Download of !DOWNLOAD_URL! failed
EXIT /B 7
)
diff --git a/project/Win32BuildSetup/genNsisInstaller.nsi b/project/Win32BuildSetup/genNsisInstaller.nsi
index ef200bb817..a315c760d3 100644
--- a/project/Win32BuildSetup/genNsisInstaller.nsi
+++ b/project/Win32BuildSetup/genNsisInstaller.nsi
@@ -10,7 +10,7 @@
!include "LogicLib.nsh"
!include "WinVer.nsh"
!include "x64.nsh"
-
+
;--------------------------------
;General
@@ -32,7 +32,7 @@
RequestExecutionLevel admin
InstProgressFlags smooth
-
+
; Installer file properties
VIProductVersion ${VERSION_NUMBER}
VIAddVersionKey "ProductName" "${APP_NAME}"
@@ -52,7 +52,7 @@
Var PageProfileState
Var VSRedistSetupError
Var /GLOBAL CleanDestDir
-
+
;--------------------------------
;Interface Settings
@@ -68,7 +68,7 @@
!define MUI_FINISHPAGE_LINK_LOCATION "${WEBSITE}"
!define MUI_FINISHPAGE_RUN "$INSTDIR\${APP_NAME}.exe"
!define MUI_FINISHPAGE_RUN_NOTCHECKED
- !define MUI_ABORTWARNING
+ !define MUI_ABORTWARNING
;--------------------------------
;Pages
@@ -77,12 +77,12 @@
!insertmacro MUI_PAGE_COMPONENTS
!define MUI_PAGE_CUSTOMFUNCTION_LEAVE CallbackDirLeave
!insertmacro MUI_PAGE_DIRECTORY
-
+
;Start Menu Folder Page Configuration
- !define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKCU"
- !define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\${APP_NAME}"
+ !define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKCU"
+ !define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\${APP_NAME}"
!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder"
- !insertmacro MUI_PAGE_STARTMENU Application $StartMenuFolder
+ !insertmacro MUI_PAGE_STARTMENU Application $StartMenuFolder
!insertmacro MUI_PAGE_INSTFILES
!insertmacro MUI_PAGE_FINISH
@@ -193,11 +193,11 @@ Section "${APP_NAME}" SecAPP
;Create uninstaller
WriteUninstaller "$INSTDIR\Uninstall.exe"
-
+
!insertmacro MUI_STARTMENU_WRITE_BEGIN Application
;Create shortcuts
SetOutPath "$INSTDIR"
-
+
CreateDirectory "$SMPROGRAMS\$StartMenuFolder"
CreateShortCut "$SMPROGRAMS\$StartMenuFolder\${APP_NAME}.lnk" "$INSTDIR\${APP_NAME}.exe" \
"" "$INSTDIR\${APP_NAME}.exe" 0 SW_SHOWNORMAL \
@@ -205,9 +205,9 @@ Section "${APP_NAME}" SecAPP
CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Uninstall ${APP_NAME}.lnk" "$INSTDIR\Uninstall.exe" \
"" "$INSTDIR\Uninstall.exe" 0 SW_SHOWNORMAL \
"" "Uninstall ${APP_NAME}."
-
+
WriteINIStr "$SMPROGRAMS\$StartMenuFolder\Visit ${APP_NAME} Online.url" "InternetShortcut" "URL" "${WEBSITE}"
- !insertmacro MUI_STARTMENU_WRITE_END
+ !insertmacro MUI_STARTMENU_WRITE_END
;add entry to add/remove programs
WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}" \
@@ -301,7 +301,7 @@ Section "Uninstall"
RMDir /r "$INSTDIR\system"
RMDir /r "$INSTDIR\userdata"
Delete "$INSTDIR\*.*"
-
+
;Un-install User Data if option is checked, otherwise skip
${If} $UnPageProfileCheckbox_State == ${BST_CHECKED}
SetShellVarContext current
@@ -315,7 +315,7 @@ Section "Uninstall"
Delete "$SMPROGRAMS\$StartMenuFolder\${APP_NAME}.lnk"
Delete "$SMPROGRAMS\$StartMenuFolder\Uninstall ${APP_NAME}.lnk"
Delete "$SMPROGRAMS\$StartMenuFolder\Visit ${APP_NAME} Online.url"
- RMDir "$SMPROGRAMS\$StartMenuFolder"
+ RMDir "$SMPROGRAMS\$StartMenuFolder"
DeleteRegKey HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}"
DeleteRegKey /ifempty HKCU "Software\${APP_NAME}"