dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
5743 commits 1 branch 0 tags 12 MiB
Commit graph

152 commits

Author SHA1 Message Date
anders_k
1c1d1d5e12 Fixed all VS2015 warnings except C4577 ('noexcept' used with no exception handling mode specified) 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6627 212acab6-be3b-0410-9dea-997c60f758d6
 2015-10-30 03:55:30 +00:00
anders_k
fe491ddf94 Changed the order of the zlib lib files SConstruct searches for so it can find the MinGW specific .a first. 64-bit MinGW has problems with a MSVC generated lib file. 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6615 212acab6-be3b-0410-9dea-997c60f758d6
 2015-09-19 18:54:02 +00:00
anders_k
5615d42881 * !AddIncludeDir displays the cpu architecture in the script message if specified as a parameter 
* Removed unused SYSTEM_PARTIALCALLSUPPORT define
* Fixed minor typos
* Allow MSVC_USE_SCRIPT to be specified on the commandline or in the environment


git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6611 212acab6-be3b-0410-9dea-997c60f758d6
 2015-09-18 23:16:34 +00:00
anders_k
286edd20c4 * Basic System::Call support when compiling with 64-bit MinGW/GCC toolchain 
* Win64 fixes


git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6607 212acab6-be3b-0410-9dea-997c60f758d6
 2015-09-17 14:30:07 +00:00
kichik
c1d2072dca patch #253 -- allow overriding CC and CXX 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6549 212acab6-be3b-0410-9dea-997c60f758d6
 2014-10-05 23:51:09 +00:00
kichik
6fb77d0a16 applied patch #254 to allow skipping of ExDLL using SKIPPLUGINS 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6544 212acab6-be3b-0410-9dea-997c60f758d6
 2014-10-05 21:08:15 +00:00
anders_k
d43e3a717c mstoolkit toolchain should use the VC toolkit linker by default. link.exe can even stand in for lib.exe if required 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6504 212acab6-be3b-0410-9dea-997c60f758d6
 2014-06-23 19:15:59 +00:00
anders_k
a81d5dfb49 scons DEBUG=true adds DEBUG to CPPDEFINES 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6497 212acab6-be3b-0410-9dea-997c60f758d6
 2014-06-20 18:36:05 +00:00
anders_k
d799ee53d7 Basic Win64 support (MSVC) 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6439 212acab6-be3b-0410-9dea-997c60f758d6
 2014-02-08 00:13:52 +00:00
anders_k
52a8b320ef POSIX fixes for native and crossplatform utils 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6427 212acab6-be3b-0410-9dea-997c60f758d6
 2014-01-21 14:13:00 +00:00
anders_k
be6c7e6a1d Major POSIX overhaul 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6416 212acab6-be3b-0410-9dea-997c60f758d6
 2013-12-08 14:34:38 +00:00
anders_k
e63fa6c53b Win64 fixes 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6413 212acab6-be3b-0410-9dea-997c60f758d6
 2013-09-06 23:48:59 +00:00
kichik
3f0107c995 fixed version numbering - always use what command line tells you to use (not 3.0.0) 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6360 212acab6-be3b-0410-9dea-997c60f758d6
 2013-05-19 23:30:43 +00:00
kichik
4ce053e411 there will be only one version (that can generate two different types of installers) 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6342 212acab6-be3b-0410-9dea-997c60f758d6
 2013-04-11 09:47:10 +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
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
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
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
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
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
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
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
anders_k
1e138ea336 Fix SConstruct Mkdir exists warning and empty verbose stack pop warning in MUI2 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6191 212acab6-be3b-0410-9dea-997c60f758d6
 2011-12-03 00:14:44 +00:00
anders_k
bbb592401a Replaced CHMDOCS build switch with DOCTYPES=chm,html,htmlsingle 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6190 212acab6-be3b-0410-9dea-997c60f758d6
 2011-12-02 23:18:34 +00:00
anders_k
3095000536 Don't install "bin\substart.exe" 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6182 212acab6-be3b-0410-9dea-997c60f758d6
 2011-11-19 20:22:56 +00:00
anders_k
020864c3da Make sure SubStart is a CLI app (MinGW/GNU config bug) 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6181 212acab6-be3b-0410-9dea-997c60f758d6
 2011-11-19 19:53:59 +00:00
kichik
8ce89b9c47 what's this doing here? 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6126 212acab6-be3b-0410-9dea-997c60f758d6
 2010-11-13 20:40:18 +00:00
f0rt
6659375178 #3075573: Use variant_dir instead of build_dir in SConstruct file 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6125 212acab6-be3b-0410-9dea-997c60f758d6
 2010-10-02 16:27:18 +00:00
wizou
403ff55f81 added MSVS_VERSION option to scons command-line to specify which compiler to use 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6110 212acab6-be3b-0410-9dea-997c60f758d6
 2010-07-04 00:07:59 +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
kichik
86c8f0bb32 install substart.exe as makensis.exe 
this distribution code needs some serious cleanup...

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6063 212acab6-be3b-0410-9dea-997c60f758d6
 2010-04-17 23:20:18 +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
f0rt
34395604e8 #2918870: Ensure minimum scons version of 1.2.0 otherwise build scripts won't work. 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6044 212acab6-be3b-0410-9dea-997c60f758d6
 2010-03-30 12:27:15 +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
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
f0rt
b402798885 #2918870: Detect Win32 zlib in flat and include/lib directory structure, updated INSTALL and build documentation, removed obsolete Source\zlib\DEFLATE.H. 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6039 212acab6-be3b-0410-9dea-997c60f758d6
 2010-03-27 15:52:04 +00:00
wizou
cdf7735a77 Jim Park's Unicode NSIS merging - Step 2 : merge TCHARs changes into trunk 
Compiler output is identical before & after this step

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6037 212acab6-be3b-0410-9dea-997c60f758d6
 2010-03-26 17:18:17 +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
f0rt
6c70d8ddf0 patch 2918870: reverted fix attempt to install substart.exe as makensis.exe in root directory when installing 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6031 212acab6-be3b-0410-9dea-997c60f758d6
 2010-02-08 19:18:35 +00:00
f0rt
c39ffff404 applied patch #2918870 - use of the zlib compression library provided by the system 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6030 212acab6-be3b-0410-9dea-997c60f758d6
 2010-02-07 21:24:09 +00:00
kichik
45da025cd8 support specifying WXWIN on command line 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6002 212acab6-be3b-0410-9dea-997c60f758d6
 2009-11-29 23:19:58 +00:00
pabs3
b016a4402c fix Library.nsi test by adding the test directory to PATH so it can run LibraryLocal 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5933 212acab6-be3b-0410-9dea-997c60f758d6
 2009-02-05 07:26:16 +00:00
pabs3
f41ba95bab fix bug #2497148 - allow out of tree builds on POSIX platforms 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5921 212acab6-be3b-0410-9dea-997c60f758d6
 2009-02-04 14:05:48 +00:00
pabs3
bf6c65b158 Fix up plugin API header/lib installation for non-Windows platforms. 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5904 212acab6-be3b-0410-9dea-997c60f758d6
 2009-01-11 09:48:07 +00:00
kichik
59501c0174 scons 1.2.0 - Options -> Variables 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5882 212acab6-be3b-0410-9dea-997c60f758d6
 2008-12-24 23:40:38 +00:00
kichik
eceb3ce333 - create plugin.lib that contains all 
- distribute plugin.h, api.h and plugin.lib
- remove inc_c stuff because we don't really want to install win32 header files as something that can be used on linux (this should be revisited later)
- fix up MakeFileList for newer versions of SCons (should be removed in the future)

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5826 212acab6-be3b-0410-9dea-997c60f758d6
 2008-12-12 16:33:25 +00:00
kichik
4c87ec9e83 applied patch #2193442 - port System::Call and related functions to GCC 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5775 212acab6-be3b-0410-9dea-997c60f758d6
 2008-11-20 21:04:23 +00:00