summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2016-03-04 10:53:00 -0800
committerH. Peter Anvin <hpa@zytor.com>2016-03-04 10:53:00 -0800
commite2e38ae6d65e248126def23bd8180eea8eacbf7c (patch)
tree9f95a2e8d5518133b42e348def14424293d6e931
parent1861eea34e8e5d90175794aa6d00e6f1efedea91 (diff)
downloadnasmbuild-e2e38ae6d65e248126def23bd8180eea8eacbf7c.tar.gz
nasmbuild-e2e38ae6d65e248126def23bd8180eea8eacbf7c.tar.xz
nasmbuild-e2e38ae6d65e248126def23bd8180eea8eacbf7c.zip
buildall.sh: support "make nsis" for newer builds
Support "make nsis" if nasm.nsi lives in the nsis/ directory. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
-rwxr-xr-xbuildall.sh18
1 files changed, 14 insertions, 4 deletions
diff --git a/buildall.sh b/buildall.sh
index 960e571..212ad50 100755
--- a/buildall.sh
+++ b/buildall.sh
@@ -66,8 +66,13 @@ build () {
zip -9Dl ../nasm-$version-win32.zip nasm-$version/LICENSE
zip -9Drg ../nasm-$version-win32.zip nasm-$version -i \*.exe
cd nasm-$version
- makensis nasm.nsi
- mv nasm-$version-installer.exe ../../nasm-$version-installer-x86.exe
+ if [ -f nsis/nasm.nsi ]; then
+ make nsis
+ mv nasm-$version-installer*.exe ../../
+ elif [ -f nasm.nsi ]; then
+ makensis nasm.nsi
+ mv nasm-$version-installer.exe ../../nasm-$version-installer-x86.exe
+ fi
cd ../..
# --- Generate Win64 binaries ---
@@ -80,8 +85,13 @@ build () {
zip -9Dl ../nasm-$version-win64.zip nasm-$version/LICENSE
zip -9Drg ../nasm-$version-win64.zip nasm-$version -i \*.exe
cd nasm-$version
- makensis nasm.nsi
- mv nasm-$version-installer.exe ../../nasm-$version-installer-x64.exe
+ if [ -f nsis/nasm.nsi ]; then
+ make nsis
+ mv nasm-$version-installer*.exe ../../
+ elif [ -f nasm.nsi ]; then
+ makensis nasm.nsi
+ mv nasm-$version-installer.exe ../../nasm-$version-installer-x64.exe
+ fi
cd ../..
# --- Generate DOS binaries ---