Commit graph

13 commits

Author SHA1 Message Date
H. Peter Anvin
69c10c9692 nsis: show a warning message if we are not privileged
Apparently with newer versions of Windows, a program cannot
be forced-run as administrator without being signed.  Instead,
if we aren't administrator, show a message box rather than confusing
the user.

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
2017-04-06 22:33:04 -07:00
H. Peter Anvin
3d823faeea nsis: finally figure out how to get the proper install directory stuff...
I had fixed MultiUser.nsh, but it turns out that the builtin version
has higher priority, so we kept picking that one up...

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
2017-04-06 21:17:13 -07:00
H. Peter Anvin
5d2e42e621 Merge branch 'master' of ssh://repo.or.cz/nasm 2017-04-06 17:25:35 -07:00
H. Peter Anvin
cb8094a954 nsis: error out if getpearch.pl can't figure out what we need
Error out instead of failing silently in getpearch.pl

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
2017-04-06 17:14:10 -07:00
H. Peter Anvin
63f68f5ea3 Merge branch 'master' of ssh://repo.or.cz/nasm 2017-04-06 16:31:39 -07:00
H. Peter Anvin
79570527b3 nsis: newer versions of NSIS uses \ for paths even on Unix
It seems that we have to use \ for paths on native Windows, and it
works on Unix as well, so just change all the paths accordingly.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
2017-04-06 16:28:59 -07:00
H. Peter Anvin
c822585e77 getpearch.pl: the PE header offset may be > 255
The PE header offset field is not a byte; assume it is a long.  The
specification doesn't actually say...

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
2017-04-06 16:20:50 -07:00
Cyrill Gorcunov
a1461a5a89 nsis: Use Program Files (x86) directory for nasm installation on x86-64
https://bugzilla.nasm.us/show_bug.cgi?id=3392365

Reported-by: Mat <mberchtold@gmail.com>
Based-on-patch-by: Mat <mberchtold@gmail.com>
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
2016-10-23 16:27:48 +03:00
Cyrill Gorcunov
9e8c2466a4 nsis: Import x64.nsh
From NSIS-3.0 source code (Include/x64.nsh).
Hopefully it will be enough for nsis-v2.5
to support Win64.

https://sourceforge.net/p/nsis/code/HEAD/tree/NSIS/trunk/Include/x64.nsh

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
2016-10-23 16:27:44 +03:00
H. Peter Anvin
407166001c Fix building in a separate directory from the source code
The code to handle building in a separate directory had seriously
bitrotted.  This contains a number of fixes to make it possible,
including bits like the documentation which never worked in the past.

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
2016-05-16 20:30:09 -07:00
Cyrill Gorcunov
f8b33e9191 nsis: Update icons
To match the main logo.

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
2016-03-05 11:59:03 +03:00
H. Peter Anvin
d4c67b1597 nsis: make nsis output automatically select architecture
Make the NSIS output automatically select the output architecture to
generate the proper filename and, much more importantly, set up the
proper default install directory.

This requires Perl as well as makensis to be present in order to make
an installer, but that doesn't really seem like a too onerous of a
requirement (NSIS being the big external dependency here.)

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
2016-03-03 21:37:37 -08:00
Cyrill Gorcunov
2726889ece New NSIS script
Lets start using new NSIS features like
Modern UI2, Multiuser install.

The file named nasm2.nsi by purpose -- we should
_not_ break existing functionality.

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
2009-09-14 23:17:03 +04:00