Commit graph

5408 commits

Author SHA1 Message Date
anders_k
9b35c900cb Added !appendfile /CHARSET parameter, output is written using the new NOStream class
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6326 212acab6-be3b-0410-9dea-997c60f758d6
2013-04-03 22:46:17 +00:00
anders_k
fe8e4a36bf Added ${__COUNTER__} predefine
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6325 212acab6-be3b-0410-9dea-997c60f758d6
2013-03-29 02:39:07 +00:00
anders_k
9fa3398dd9 Support special ${U+1}...${U+FFFFFFFF} Unicode character defines
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6324 212acab6-be3b-0410-9dea-997c60f758d6
2013-03-29 02:04:21 +00:00
anders_k
12cb8bf7e3 Update System.dll mini-doc; b type has been removed and p should be used for pointers
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6323 212acab6-be3b-0410-9dea-997c60f758d6
2013-03-28 21:25:52 +00:00
anders_k
e173cd33a4 Updated changelog and fixed minor documentation bugs (bug #3063566, bug #3567313)
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6322 212acab6-be3b-0410-9dea-997c60f758d6
2013-03-27 02:50:27 +00:00
anders_k
d5962e9b67 DWORD type is unsigned long, not int
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6321 212acab6-be3b-0410-9dea-997c60f758d6
2013-03-24 23:27:09 +00:00
kichik
a93eebeef6 no need for tstring.cpp after all as we only use the tstring typedef and non of the functions
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6320 212acab6-be3b-0410-9dea-997c60f758d6
2013-03-24 22:38:11 +00:00
kichik
8c50ab9201 fix operator syntax error
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6319 212acab6-be3b-0410-9dea-997c60f758d6
2013-03-24 22:37:00 +00:00
kichik
9e0ad1187e revert bad commit
TCHAR is not WCHAR on POSIX, it's wchar_t which can even be 32-bit


git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6318 212acab6-be3b-0410-9dea-997c60f758d6
2013-03-24 06:39:24 +00:00
kichik
b7d9abe03b gotta cast for gcc
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6317 212acab6-be3b-0410-9dea-997c60f758d6
2013-03-24 06:12:24 +00:00
kichik
5f235e0325 iconv doesn't do TCHAR, only char
and we need stdarg.h for va_arg and friends


git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6316 212acab6-be3b-0410-9dea-997c60f758d6
2013-03-24 06:11:36 +00:00
kichik
ae0b6f6f62 gcc doesn't like %lu for DWORD as it's just unsigned int and not long unsigned int
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6315 212acab6-be3b-0410-9dea-997c60f758d6
2013-03-24 06:10:27 +00:00
kichik
b9a225ff84 we need tstring.cpp too now for conversion
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6314 212acab6-be3b-0410-9dea-997c60f758d6
2013-03-24 06:09:50 +00:00
kichik
43af25ac0b MultiByteToWideChar is defined by tchar.h, but tchar.h includes tstring.h
also, it seems _TSTRING_H_ is used by something else


git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6313 212acab6-be3b-0410-9dea-997c60f758d6
2013-03-24 06:08:16 +00:00
kichik
d20e3a5c7f we need properly defined TCHAR on POSIX too
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6312 212acab6-be3b-0410-9dea-997c60f758d6
2013-03-24 06:06:54 +00:00
anders_k
baf8bb138b Fix dead links with archive.org
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6311 212acab6-be3b-0410-9dea-997c60f758d6
2013-03-22 22:33:52 +00:00
anders_k
97799b73fe Added "LegalCopyright" version string to our installer, removes compiler warning
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6310 212acab6-be3b-0410-9dea-997c60f758d6
2013-03-22 21:57:00 +00:00
anders_k
d3d637fab9 Fixed minor MakeNSIS leaks (Bug #3474662)
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6309 212acab6-be3b-0410-9dea-997c60f758d6
2013-03-19 02:11:37 +00:00
anders_k
a2fe9bec1b Language files are text and not binary, remove svn:mime-type property
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6308 212acab6-be3b-0410-9dea-997c60f758d6
2013-03-17 22:44:26 +00:00
anders_k
97cc6033e1 Fixed Korean MUI_[UN]TEXT_FINISH_INFO_* (Bug #3541515)
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6307 212acab6-be3b-0410-9dea-997c60f758d6
2013-03-17 22:10:24 +00:00
anders_k
0e851e4b79 Reduced !include/!insertmacro recursion stack usage (Bug #3067954)
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6306 212acab6-be3b-0410-9dea-997c60f758d6
2013-03-17 21:13:07 +00:00
kichik
6ef6d6dfb0 "#pragma diagnostic push" only works on gcc 4.6+
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6305 212acab6-be3b-0410-9dea-997c60f758d6
2013-03-17 00:36:07 +00:00
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
809f5e9b1b Don't allow Unicode-only language files to be used in ANSI installers
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6303 212acab6-be3b-0410-9dea-997c60f758d6
2013-03-16 01:28:57 +00:00
anders_k
043b4006ed * Georgian and Pashto are now part of default install.
* LANGFILE macro now takes 4 parameters, all .nsh files have been updated
* LANGFILE_INCLUDE_WITHDEFAULT will now warn if the fallback string is used
* Removed some invalid English strings in various files
* Fixed Khmer LangId
* Minor Norwegian language fixes
* Some files changed from UTF16LE to UTF8SIG


git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6302 212acab6-be3b-0410-9dea-997c60f758d6
2013-03-16 00:28:45 +00:00
anders_k
2fc40abca0 Allow CP_ACP as the codepage in NLF files even if IsValidCodePage() says no
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6301 212acab6-be3b-0410-9dea-997c60f758d6
2013-03-14 22:27:48 +00:00
anders_k
7e6db0aa39 Warn if MUI_PAGE_* is inserted after MUI_LANGUAGE
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6300 212acab6-be3b-0410-9dea-997c60f758d6
2013-03-14 22:14:23 +00:00
anders_k
68d42b02da Unicode plugin W function suffix has been removed
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6299 212acab6-be3b-0410-9dea-997c60f758d6
2013-03-14 22:04:45 +00:00
anders_k
e43d5a3b9e Add new (optional) makensis win32 abort event to avoid multiple instance issues
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6298 212acab6-be3b-0410-9dea-997c60f758d6
2013-03-14 18:00:00 +00:00
anders_k
b8903496e3 SConstruct only needs to export environments that are imported by other SConscript files
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6297 212acab6-be3b-0410-9dea-997c60f758d6
2013-03-13 17:23:17 +00:00
kichik
75405adb9d fix mingw env for unicode too
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6296 212acab6-be3b-0410-9dea-997c60f758d6
2013-03-13 08:22:56 +00:00
anders_k
088c7ba872 Add !define for PKEY_AppUserModel_StartPinOption and use it in the COM.nsh example
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6295 212acab6-be3b-0410-9dea-997c60f758d6
2013-03-12 23:23:01 +00:00
anders_k
9334c3fe89 Fix duplicate defines/conflicts in Include/Win*.nsh, nsDialogs.nsh and System.nsh
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6294 212acab6-be3b-0410-9dea-997c60f758d6
2013-03-10 23:28:31 +00:00
anders_k
4f8bf3c466 Fix some MinGW warnings
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6293 212acab6-be3b-0410-9dea-997c60f758d6
2013-03-10 23:02:09 +00:00
anders_k
0d2edb2f1b Use dynamic buffer sizes for formated CEXEBuild warning/error methods
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6292 212acab6-be3b-0410-9dea-997c60f758d6
2013-03-10 22:26:27 +00:00
anders_k
a0cd389c78 Experimental UTF16 reading support on POSIX
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6291 212acab6-be3b-0410-9dea-997c60f758d6
2013-03-08 19:38:46 +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
kichik
e6ac4e6d9b fixed MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO for NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE
on r5228 and r5229 the MUI language files were moved to a new format in a new directory
during this move, the differences between the two MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO disappeared
instead of having two variations depending on NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE, they were the same

this commit restores the old values from the old language files from r5227
where these values are missing, a #FIXME was added

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6287 212acab6-be3b-0410-9dea-997c60f758d6
2012-12-12 19:34:13 +00:00
gavenkoa
6ba3b31b83 Fix "LATIN SMALL LETTER I" to "CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I".
It is possible that fonts have different glyph for this letter.

I think that original translation was prepared in build-in editor of popular
"Far" file manager which is console application and it usually run in cp866
codepage which doesn't have codepoint for "CYRILLIC SMALL UKRAINIAN I". (xD)

But most valuable reason to make this change is to have an ability to run
ispell like program.

I also fix some spelling errors, so ispell with 'ukrainian' dictionary doesn't
show any errors by now.


git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6286 212acab6-be3b-0410-9dea-997c60f758d6
2012-12-11 21:12:32 +00:00
gavenkoa
2404c414a6 Fix spelling.
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6285 212acab6-be3b-0410-9dea-997c60f758d6
2012-12-11 20:36:31 +00:00
gavenkoa
d8dd88aebb Another one zlib import lib name (to build with Gnuwin32/Cygwin-Mingw zlib build).
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6284 212acab6-be3b-0410-9dea-997c60f758d6
2012-11-13 20:57:18 +00:00
anders_k
8217b2c61f Display "Install data" size statistics as unsigned number. (Partial fix for bug #3564918)
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6283 212acab6-be3b-0410-9dea-997c60f758d6
2012-11-12 21:24:37 +00:00
kichik
6d71b946e3 tdefenv must be defined after defenv is ready
this caused tdefenv (and therefore util_env) not to contain the right pointers to libcp.lib

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6282 212acab6-be3b-0410-9dea-997c60f758d6
2012-11-11 04:33:52 +00:00
kichik
3076227025 Platform.h defines TCHAR, no need to include tchar.h from the system
this fixes another set of redefinition warnings

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6281 212acab6-be3b-0410-9dea-997c60f758d6
2012-11-11 03:48:27 +00:00
kichik
c57a89312f there's only one header.gif (the unicode fork has a different header)
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6280 212acab6-be3b-0410-9dea-997c60f758d6
2012-11-11 03:36:45 +00:00
kichik
bafaa78c40 NSIS.exe should be built as a GUI executable not as CLI
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6279 212acab6-be3b-0410-9dea-997c60f758d6
2012-11-11 03:12:50 +00:00
kichik
5289607dbd tchar.h is already included in platform.h
no need to include nsis_tchar.h from exdll (this is not a plug-in anyway)

this fixes a '_tstof' redefinition warning 

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6278 212acab6-be3b-0410-9dea-997c60f758d6
2012-11-11 02:39:35 +00:00
kichik
378a89112e link to a working dll of zlib 1.2.7
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6277 212acab6-be3b-0410-9dea-997c60f758d6
2012-11-11 02:09:29 +00:00
anders_k
56b0149fd1 Fix Bug#3571461 - Include POSIX header file
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6276 212acab6-be3b-0410-9dea-997c60f758d6
2012-11-09 23:43:03 +00:00