Commit graph

535 commits

Author SHA1 Message Date
anders_k
43b30c9337 Refactor m_macros finder/getter
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6304 212acab6-be3b-0410-9dea-997c60f758d6
2013-03-16 20:09:44 +00:00
anders_k
9b287fc648 Added /plugin parameter to ReserveFile for our multi-arc. plugin subdirectories.
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6290 212acab6-be3b-0410-9dea-997c60f758d6
2013-03-07 23:38:25 +00:00
anders_k
dcddf977b2 Use a custom file reader with UTF8 support for nsi/nsh/nlf files and store UTF16LE or MBCS (stringblock) strings in ExeHeadStringList
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6289 212acab6-be3b-0410-9dea-997c60f758d6
2013-03-07 21:25:35 +00:00
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
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
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
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
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
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
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
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
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
anders_k
359ad0a055 Fix a couple of simple unicode merge and substart related bugs
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6195 212acab6-be3b-0410-9dea-997c60f758d6
2011-12-05 22:52:54 +00:00
anders_k
79dbea3321 Added !getdllversion [Bug#2809308,RFE#1873767]
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6186 212acab6-be3b-0410-9dea-997c60f758d6
2011-11-21 20:13:30 +00:00
anders_k
9a3f4e0cb1 !verbose varargs support (Ex: !verbose push 3)
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6183 212acab6-be3b-0410-9dea-997c60f758d6
2011-11-20 18:51:35 +00:00
anders_k
3d9c850bb5 Added !macroundef
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6177 212acab6-be3b-0410-9dea-997c60f758d6
2011-11-17 18:54:49 +00:00
anders_k
650a51baac Added UnsafeStrCpy
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6172 212acab6-be3b-0410-9dea-997c60f758d6
2011-11-15 17:59:25 +00:00
anders_k
8cde6958a8 Added ${__MACRO__}
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6171 212acab6-be3b-0410-9dea-997c60f758d6
2011-11-13 17:31:14 +00:00
anders_k
20dcb1923a Added !if /FileExists
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6170 212acab6-be3b-0410-9dea-997c60f758d6
2011-11-13 15:34:43 +00:00
anders_k
cf4e5cf132 Fix a lot of MinGW/GCC warnings
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6168 212acab6-be3b-0410-9dea-997c60f758d6
2011-11-09 18:12:57 +00:00
anders_k
3cd6ebbf39 Added VIFileVersion instruction and fixed version info resource default language
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6160 212acab6-be3b-0410-9dea-997c60f758d6
2011-07-29 22:11:00 +00:00
anders_k
96af71d0d1 Allow multiple !finalize commands
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6153 212acab6-be3b-0410-9dea-997c60f758d6
2011-06-09 20:05:18 +00:00
wizou
73501896d4 Updated documentation and file functions for Unicode support
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6119 212acab6-be3b-0410-9dea-997c60f758d6
2010-07-09 15:12:21 +00:00
wizou
4d19aaa9ab Adding new ${__FILEDIR__} preprocessor define containing directory of current script
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6108 212acab6-be3b-0410-9dea-997c60f758d6
2010-06-17 10:11:29 +00:00
wizou
ab8f90f99e #1787648: ${__SECTION__} is correctly defined in hidden section
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6107 212acab6-be3b-0410-9dea-997c60f758d6
2010-06-16 16:01:40 +00:00
wizou
51a7c3d647 #1977885: adding !finalize preprocessor commands for post-build execution
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6103 212acab6-be3b-0410-9dea-997c60f758d6
2010-06-16 14:10:41 +00:00
wizou
487e37ffb7 Changed keyword UnicodeInstaller to a more versatile TargetMinimalOS <version> keyword
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6102 212acab6-be3b-0410-9dea-997c60f758d6
2010-06-14 15:24:50 +00:00
wizou
57f7ff8a1c Unicode port: Unicode version of NSIS can now generate both ANSI & Unicode installers (using new instruction UnicodeInstaller on/off).
Stubs & Plugins differentiation is done automatically using a 'W' suffix.
SConscripts need to be reviewed to generate both variants of Plugins & pluginapi.lib under Unicode compilation.

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6100 212acab6-be3b-0410-9dea-997c60f758d6
2010-06-14 10:07:22 +00:00
anders_k
fbc7cb8fd0 Fixed and documented !if & operator
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6099 212acab6-be3b-0410-9dea-997c60f758d6
2010-06-11 16:33:10 +00:00
anders_k
d526c78d05 Added !define /ifndef and !define /redef optional arguments
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6097 212acab6-be3b-0410-9dea-997c60f758d6
2010-06-10 20:42:50 +00:00
wizou
74ffaada4e Merging various fixes from latest Jim Park repository
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6096 212acab6-be3b-0410-9dea-997c60f758d6
2010-05-28 14:09:08 +00:00
wizou
90e05acdd3 Unicode port: Generate Unicode LangStrings even if source was an ANSI file
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6093 212acab6-be3b-0410-9dea-997c60f758d6
2010-05-28 13:10:16 +00:00
wizou
24c02b97d0 Unicode port: adding UTF-16LE file functions
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6089 212acab6-be3b-0410-9dea-997c60f758d6
2010-05-17 15:11:29 +00:00
wizou
1b5e8adbb8 Unicode port: Support for Unicode license files
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6080 212acab6-be3b-0410-9dea-997c60f758d6
2010-05-04 08:21:49 +00:00
wizou
2c774a533c Adding CEXEBuild::LoadLicenseFile shared by TOK_LICENSELANGSTRING & TOK_LICENSEDATA
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6078 212acab6-be3b-0410-9dea-997c60f758d6
2010-05-03 14:04:22 +00:00
wizou
b431c21048 Minor changes on FOPENTEXT
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6077 212acab6-be3b-0410-9dea-997c60f758d6
2010-05-03 10:12:33 +00:00
wizou
d96bd3cb6e oops
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6073 212acab6-be3b-0410-9dea-997c60f758d6
2010-04-30 16:39:29 +00:00
wizou
f7f4d2f033 Using standard wchar string functions instead of winchar_*
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6072 212acab6-be3b-0410-9dea-997c60f758d6
2010-04-30 14:48:19 +00:00
wizou
cefeec3676 Additional error checking by Jim Park.
Also some cleaning.

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6058 212acab6-be3b-0410-9dea-997c60f758d6
2010-04-15 12:11:06 +00:00
wizou
36f6645935 Added comments, and removed unused #include
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6056 212acab6-be3b-0410-9dea-997c60f758d6
2010-04-14 16:27:00 +00:00
wizou
d7ffe58b2e Fix use of wrong MBCS version of string functions. (When playing with TCHAR pointers, most of the time you deal with a number of BYTE/WORD, not a number of multi-byte characters)
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6051 212acab6-be3b-0410-9dea-997c60f758d6
2010-04-13 16:14:16 +00:00
wizou
64a0f32e52 more simple TCHARs fixes
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6047 212acab6-be3b-0410-9dea-997c60f758d6
2010-04-12 16:00:17 +00:00
anders_k
82d42b1159 _countof and swprintf fixes for VC6
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6045 212acab6-be3b-0410-9dea-997c60f758d6
2010-03-30 17:50:08 +00:00
wizou
f4f18f9469 a little bit more TCHARs and minor fixes
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6042 212acab6-be3b-0410-9dea-997c60f758d6
2010-03-29 15:32:24 +00:00
wizou
acf9a8c21f Jim Park's Unicode NSIS merging - Step 4 : merging more TCHAR stuff that shouldn't have any impact
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6041 212acab6-be3b-0410-9dea-997c60f758d6
2010-03-29 14:24:47 +00:00
f0rt
8ab72b9ece #1753070: Enable that makensis and its related utilities can be built natively for 64-bit systems
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6040 212acab6-be3b-0410-9dea-997c60f758d6
2010-03-27 19:20:16 +00:00
wizou
752d7d239a Jim Park's Unicode NSIS merging - Step 1 : switch to TCHARs where relevant.
Compiler output is identical before & after this step

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/branches/wizou@6036 212acab6-be3b-0410-9dea-997c60f758d6
2010-03-24 17:22:56 +00:00