Commit graph

5352 commits

Author SHA1 Message Date
anders_k
7cc150c464 MakeNSIS can now generate Unicode or Ansi installers based on a script attribute. SCons generates both Ansi and Unicode stubs and plugins.
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
2012-10-13 01:47:50 +00:00
anders_k
8f330bbbdf Create unicode makensis by default
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6267 212acab6-be3b-0410-9dea-997c60f758d6
2012-09-21 14:28:24 +00:00
anders_k
4b62ecbb31 Added ManifestDPIAware attribute
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6266 212acab6-be3b-0410-9dea-997c60f758d6
2012-09-20 18:42:21 +00:00
anders_k
da2fe44184 Add ManifestSupportedOS attribute
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6265 212acab6-be3b-0410-9dea-997c60f758d6
2012-09-20 10:18:40 +00:00
anders_k
b0c40ee3b5 Reduce define spew from included files
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6264 212acab6-be3b-0410-9dea-997c60f758d6
2012-09-17 12:37:03 +00:00
anders_k
2cf9ecc10e Must extract nsisconf.nsh to $InstDir
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6263 212acab6-be3b-0410-9dea-997c60f758d6
2012-09-16 14:45:43 +00:00
anders_k
172e5cdb08 Fix bug #3567313, wrong MUI control id in nsD docs
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6262 212acab6-be3b-0410-9dea-997c60f758d6
2012-09-14 12:11:30 +00:00
anders_k
f2e3e13a0e MinGW: Don't link to LIBGCC*.DLL and LIBSTDC++-*.DLL
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6261 212acab6-be3b-0410-9dea-997c60f758d6
2012-09-11 00:53:50 +00:00
anders_k
59be675382 System: Minor x64 fixes
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6260 212acab6-be3b-0410-9dea-997c60f758d6
2012-09-10 22:56:41 +00:00
anders_k
2d99d7ad3e Removed unused variables and fixed GCC warnings
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6259 212acab6-be3b-0410-9dea-997c60f758d6
2012-09-08 02:50:09 +00:00
anders_k
c6fdb4436d Fix GCC array bounds warning when accessing g_usrvars
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6258 212acab6-be3b-0410-9dea-997c60f758d6
2012-09-06 22:43:31 +00:00
golubdr
667a2c8cae Fix indentation.
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6256 212acab6-be3b-0410-9dea-997c60f758d6
2012-08-22 23:39:06 +00:00
golubdr
957653f389 Use appropriate zlib DLL depending on version.
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6255 212acab6-be3b-0410-9dea-997c60f758d6
2012-08-22 23:32:05 +00:00
golubdr
4247359df9 Fixed adler32.cpp to compile with the latest version of zlib.
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6254 212acab6-be3b-0410-9dea-997c60f758d6
2012-08-22 13:34:38 +00:00
golubdr
6047415427 Fixed regression that was causing RegQueryValueEx to always fail.
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6252 212acab6-be3b-0410-9dea-997c60f758d6
2012-08-07 00:33:55 +00:00
anders_k
f2ee8319f0 Docs: Limit pre tag line width
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6251 212acab6-be3b-0410-9dea-997c60f758d6
2012-08-06 22:26:12 +00:00
anders_k
5fc29c43e6 WinMessages: Minor ListView additions
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6250 212acab6-be3b-0410-9dea-997c60f758d6
2012-08-05 05:26:15 +00:00
anders_k
e0efe0aa7b Add logiclib macros for Win8
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6249 212acab6-be3b-0410-9dea-997c60f758d6
2012-08-05 05:13:55 +00:00
anders_k
fb9c8639c4 WinVer: Support Win8 and Srv2012
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6248 212acab6-be3b-0410-9dea-997c60f758d6
2012-08-05 00:04:30 +00:00
anders_k
1348ac341b Update zlib download URL
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6247 212acab6-be3b-0410-9dea-997c60f758d6
2012-08-04 23:19:49 +00:00
anders_k
40c7fd50a8 Fix bug#3532925: Wrong LangID
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6246 212acab6-be3b-0410-9dea-997c60f758d6
2012-07-01 22:28:14 +00:00
anders_k
27a82ca909 Added minimal Tab and ListView support to WinMessages.nsh and some COM helper macros
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6245 212acab6-be3b-0410-9dea-997c60f758d6
2012-06-23 00:26:26 +00:00
anders_k
7cd38f2367 System plugin: Try harder to find dll export function
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6243 212acab6-be3b-0410-9dea-997c60f758d6
2012-06-21 23:13:05 +00:00
anders_k
8aa67f8987 System plugin: Basic x64 fixes
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6222 212acab6-be3b-0410-9dea-997c60f758d6
2012-03-06 23:09:23 +00:00
anders_k
adbdce4c47 Docs: Fix escape warning
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6221 212acab6-be3b-0410-9dea-997c60f758d6
2012-03-06 01:21:30 +00:00
anders_k
2132661644 System plugin: Prefer A/W export when t type is used
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6220 212acab6-be3b-0410-9dea-997c60f758d6
2012-03-06 00:26:12 +00:00
anders_k
70408e8ae4 Generate ansi and unicode plugins
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6219 212acab6-be3b-0410-9dea-997c60f758d6
2012-03-05 23:29:20 +00:00
anders_k
200b6c0831 Clarify GetCurInstType documentation
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6218 212acab6-be3b-0410-9dea-997c60f758d6
2012-03-01 21:12:50 +00:00
anders_k
7cf2ef1a08 Unicode on posix fixes
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6217 212acab6-be3b-0410-9dea-997c60f758d6
2012-03-01 21:06:14 +00:00
anders_k
382b2fa282 Unicode fixes
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6216 212acab6-be3b-0410-9dea-997c60f758d6
2012-02-28 22:40:43 +00:00
anders_k
615ce82030 ifstream does not have a wchar_t constructor, use FILE* and our FOPEN wrapper.
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6215 212acab6-be3b-0410-9dea-997c60f758d6
2012-02-27 22:16:45 +00:00
anders_k
2c89cca183 FileRead is problematic on unicode, just document it for now and hope we can fix it later...
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6214 212acab6-be3b-0410-9dea-997c60f758d6
2012-02-24 15:25:55 +00:00
anders_k
bc9f86d506 Halibut: Allow macros to work across files (Upstream rev4803)
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6213 212acab6-be3b-0410-9dea-997c60f758d6
2012-02-24 12:56:57 +00:00
anders_k
6cf12d3c83 SCons options display hack: Fix ListVariable to generate comma separated (quoted if required) list of allowed names
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6212 212acab6-be3b-0410-9dea-997c60f758d6
2011-12-15 23:35:40 +00:00
anders_k
b3dc58c704 Added ${NSIS_PACKEDVERSION} predefine
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6211 212acab6-be3b-0410-9dea-997c60f758d6
2011-12-15 20:07:37 +00:00
anders_k
9931591d3a Emulate g as &g16 in *() struct syntax
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6210 212acab6-be3b-0410-9dea-997c60f758d6
2011-12-13 21:20:56 +00:00
anders_k
c57acd99d2 Added SYSTEM_LOG "param out" output
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6209 212acab6-be3b-0410-9dea-997c60f758d6
2011-12-13 21:16:24 +00:00
anders_k
51a0cb7355 Use malloc and not GlobalAlloc in makensis (POSIX)
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6208 212acab6-be3b-0410-9dea-997c60f758d6
2011-12-13 02:13:20 +00:00
anders_k
a97f08a281 Added some rarely used SW_ flags to ExecShell whitelist
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6207 212acab6-be3b-0410-9dea-997c60f758d6
2011-12-13 02:04:16 +00:00
anders_k
e57b4c5a67 UTF-8 support for SetFont and .nlf font name in ansi build
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6206 212acab6-be3b-0410-9dea-997c60f758d6
2011-12-07 08:18:41 +00:00
wizou
4d94e1ae8a fix warnings on BIF_NEWDIALOGSTYLE
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6205 212acab6-be3b-0410-9dea-997c60f758d6
2011-12-06 23:48:25 +00:00
wizou
985f4b5e00 fix Unicode compilation
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6204 212acab6-be3b-0410-9dea-997c60f758d6
2011-12-06 21:28:59 +00:00
wizou
e31ccf2190 fix warnings on BIF_NEWDIALOGSTYLE
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6203 212acab6-be3b-0410-9dea-997c60f758d6
2011-12-06 21:25:50 +00:00
wizou
d5caa9b185 fix Unicode compilation
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6202 212acab6-be3b-0410-9dea-997c60f758d6
2011-12-06 21:24:56 +00:00
wizou
b1c298f815 fix: use right compiler for x86 target on VS2010 under Windows 64 bits
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6201 212acab6-be3b-0410-9dea-997c60f758d6
2011-12-06 21:24:24 +00:00
wizou
0792c8a81f added svn:ignore for .instdist
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6200 212acab6-be3b-0410-9dea-997c60f758d6
2011-12-06 21:23:13 +00:00
anders_k
dca62fbbc7 Added <<, >> and >>> !define /math operations
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6199 212acab6-be3b-0410-9dea-997c60f758d6
2011-12-06 21:04:47 +00:00
anders_k
67d0b165b1 Added !if S==, S!=, = and <> compare ops and hex/int/float parsing support
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6198 212acab6-be3b-0410-9dea-997c60f758d6
2011-12-06 19:14:45 +00:00
anders_k
357aa9675b Only MSVC is able to generate a compatible pluginapi.lib
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6197 212acab6-be3b-0410-9dea-997c60f758d6
2011-12-06 00:48:17 +00:00
anders_k
ef8a83bd41 Basic UTF-8 support in ansi build so it can read UTF-8 .nlf files and LangStrings
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6196 212acab6-be3b-0410-9dea-997c60f758d6
2011-12-05 23:44:26 +00:00