From bd5d47cbae5bae350258b0185d0bac1625554a65 Mon Sep 17 00:00:00 2001 From: anders_k Date: Mon, 11 Feb 2019 16:04:47 +0000 Subject: [PATCH] ANSI targets are deprecated, force the important examples to use Unicode. git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@7080 212acab6-be3b-0410-9dea-997c60f758d6 --- Docs/src/history.but | 4 ++++ Examples/Modern UI/Basic.nsi | 1 + Examples/Modern UI/HeaderBitmap.nsi | 1 + Examples/Modern UI/StartMenu.nsi | 1 + Examples/Modern UI/WelcomeFinish.nsi | 1 + Examples/example1.nsi | 9 ++++++--- Examples/example2.nsi | 9 ++++++--- Examples/languages.nsi | 1 + 8 files changed, 21 insertions(+), 6 deletions(-) diff --git a/Docs/src/history.but b/Docs/src/history.but index 2ef29cd4..ae79ae22 100644 --- a/Docs/src/history.but +++ b/Docs/src/history.but @@ -4,6 +4,10 @@ Released on ? ?th, 201? +\S1{v3.05-rl} Release Notes + +ANSI targets are deprecated, consider moving to Unicode. + \S1{v3.05-cl} Changelog \S2{} Minor Changes diff --git a/Examples/Modern UI/Basic.nsi b/Examples/Modern UI/Basic.nsi index d0fc7a2d..eb76d2ba 100644 --- a/Examples/Modern UI/Basic.nsi +++ b/Examples/Modern UI/Basic.nsi @@ -13,6 +13,7 @@ ;Name and file Name "Modern UI Test" OutFile "Basic.exe" + Unicode True ;Default installation folder InstallDir "$LOCALAPPDATA\Modern UI Test" diff --git a/Examples/Modern UI/HeaderBitmap.nsi b/Examples/Modern UI/HeaderBitmap.nsi index c31cdee1..0aa9ea1c 100644 --- a/Examples/Modern UI/HeaderBitmap.nsi +++ b/Examples/Modern UI/HeaderBitmap.nsi @@ -13,6 +13,7 @@ ;Name and file Name "Modern UI Test" OutFile "HeaderBitmap.exe" + Unicode True ;Default installation folder InstallDir "$LOCALAPPDATA\Modern UI Test" diff --git a/Examples/Modern UI/StartMenu.nsi b/Examples/Modern UI/StartMenu.nsi index 441fd656..fad6df52 100644 --- a/Examples/Modern UI/StartMenu.nsi +++ b/Examples/Modern UI/StartMenu.nsi @@ -13,6 +13,7 @@ ;Name and file Name "Modern UI Test" OutFile "StartMenu.exe" + Unicode True ;Default installation folder InstallDir "$LOCALAPPDATA\Modern UI Test" diff --git a/Examples/Modern UI/WelcomeFinish.nsi b/Examples/Modern UI/WelcomeFinish.nsi index 2121ea11..7fa92e57 100644 --- a/Examples/Modern UI/WelcomeFinish.nsi +++ b/Examples/Modern UI/WelcomeFinish.nsi @@ -13,6 +13,7 @@ ;Name and file Name "Modern UI Test" OutFile "WelcomeFinish.exe" + Unicode True ;Default installation folder InstallDir "$LOCALAPPDATA\Modern UI Test" diff --git a/Examples/example1.nsi b/Examples/example1.nsi index fd549c07..81dc9979 100644 --- a/Examples/example1.nsi +++ b/Examples/example1.nsi @@ -13,12 +13,15 @@ Name "Example1" ; The file to write OutFile "example1.exe" -; The default installation directory -InstallDir $DESKTOP\Example1 - ; Request application privileges for Windows Vista RequestExecutionLevel user +; Build Unicode installer +Unicode True + +; The default installation directory +InstallDir $DESKTOP\Example1 + ;-------------------------------- ; Pages diff --git a/Examples/example2.nsi b/Examples/example2.nsi index 1e8cfded..74d44ed4 100644 --- a/Examples/example2.nsi +++ b/Examples/example2.nsi @@ -13,6 +13,12 @@ Name "Example2" ; The file to write OutFile "example2.exe" +; Request application privileges for Windows Vista +RequestExecutionLevel admin + +; Build Unicode installer +Unicode True + ; The default installation directory InstallDir $PROGRAMFILES\Example2 @@ -20,9 +26,6 @@ InstallDir $PROGRAMFILES\Example2 ; overwrite the old one automatically) InstallDirRegKey HKLM "Software\NSIS_Example2" "Install_Dir" -; Request application privileges for Windows Vista -RequestExecutionLevel admin - ;-------------------------------- ; Pages diff --git a/Examples/languages.nsi b/Examples/languages.nsi index 3a4d46ce..b9863d38 100644 --- a/Examples/languages.nsi +++ b/Examples/languages.nsi @@ -13,6 +13,7 @@ XPStyle on RequestExecutionLevel user +Unicode True ;-------------------------------- Page license