dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

MakeNSIS can now generate Unicode or Ansi installers based on a script attribute. SCons generates both Ansi and Unicode stubs and plugins.

Browse source 
The official plugins are now stored in architecture specific subdirectories under NSIS\Plugins. !AddPluginDir also gained a new (optional) architecture flag because MakeNSIS now stores separate plugin information for each target architecture. Storing plugins in the root of the Plugins directory is no longer supported.

MinGW does not implement the unicode CRT startup functions so the entry point functions and linker parameters had to be changed. The unicode tools use the ansi entry point and a small helper function that calls into the real code: _tmain has full argc+argv emulation while wWinMain does not pass the command line parameters. The stubs do not use any CRT functions and have no CRT or unicode helper code, they call our entry point directly.



git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6269 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2012-10-13 01:47:50 +00:00
parent 8f330bbbdf
commit 7cc150c464
73 changed files with 936 additions and 713 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Docs/src/compiler.but
View file

@ -27,9 +27,9 @@ Adds another include directory to the include directories list. This list is sea
\S1{addplugindir} !addplugindir
\c directory
\c [/x86-ansi | /x86-unicode] directory
Causes the NSIS compiler to scan the given directory for plug-in DLLs.
Causes the NSIS compiler to scan the given directory for plug-in DLLs. If you don't specify the plug-in architecture it is assumed to match the current target architecture. If the architecture does not match the installer will probably crash!
\c !addplugindir myplugin
\c MyPlugin::SomeFunction

17
Docs/src/compilerflags.but
View file

@ -87,22 +87,11 @@ This command sets the overwrite flag which is used by the \R{file}{File} command
\c File program.cfg # config file we don't want to overwrite
\c SetOverwrite on
\S2{atargetminimalos} TargetMinimalOS
\S2{aunicodetarget} Unicode
\c X.Y
\c true|\\<b\\>false\\</b\\>
This command sets the minimal OS version of the target Windows system required in order to run the installer. This will NOT make the installer test for OS compatibility, but it will indicate which Windows APIs will be available for use by the installer program. The installer will not be able to execute on older systems.
In particular, if you indicate a minimal OS of 5.0 or more, MakeNSIS will generate a \R{intro-unicode}{Unicode installer} (as Windows 2000 and more recent are Unicode fully-compatible OSes).
\c TargetMinimalOS 4.0 ; target Windows 9x/NT4 or more recent (Default)
\c TargetMinimalOS 5.0 ; target Windows 2000 or more recent / make a Unicode installer
\c TargetMinimalOS 5.1 ; target Windows XP or more recent / make a Unicode installer
\c TargetMinimalOS 6.0 ; target Windows Vista or more recent / make a Unicode installer
\c TargetMinimalOS 6.1 ; target Windows Seven or more recent / make a Unicode installer
Check the various \W{http://msdn.microsoft.com/en-us/library/ms724833.aspx}{version numbers of Windows}.
Generate a \R{intro-unicode}{Unicode installer}. It can only be used outside of sections and functions and before any data is compressed.
\S1{versioninfo} Version Information

4
Docs/src/intro.but
View file

@ -152,8 +152,8 @@ The NSIS script format and the format used for interface dialogs are easy, docum
\H{intro-unicode} Unicode installers
Starting with MakeNSIS v?.??, you can choose to create Unicode installers by using \R{atargetminimalos}{TargetMinimalOS} with a value greater than or equal to 5.0.
These installers will work only under Windows 2000 or more recent (depending on the value you chose), but they will allow you to display your installer in any Unicode language supported by the OS.
Starting with MakeNSIS v3.0 you can choose to create Unicode installers by setting the \R{aunicodetarget}{Unicode} attribute.
These installers will not work on Windows 95/98/ME but they will allow you to display your installer in any Unicode language supported by the OS.
When building a Unicode installer, NSIS variables can hold Unicode characters (0000-FFFF). There should be no need to modify your existing scripts.
If you want to read/write Unicode files, specific instructions have been added to read/write UTF-16LE strings from/to disk.

2
Docs/src/usage.but
View file

@ -7,7 +7,7 @@ The NSIS development kit installer sets up your computer so that you can compile
If you want to use MakeNSIS on the command line, the syntax of the makensis command is:
\c makensis [option | script.nsi | - [...]]
\c makensis [ option | script.nsi | - ] [...]
\S1{usagereference} Options