summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2016-02-23 16:23:47 -0800
committerH. Peter Anvin <hpa@zytor.com>2016-02-23 16:23:47 -0800
commit0086ee56fa498b0a2da24cbb04b18d2a78875d12 (patch)
treea46e33a2402e52fdd8e4063d62fe12cc3c50f1a9
parent66f55312360796595f3241d97a1435c534b1b3e0 (diff)
downloadnasmbuild-0086ee56fa498b0a2da24cbb04b18d2a78875d12.tar.gz
nasmbuild-0086ee56fa498b0a2da24cbb04b18d2a78875d12.tar.xz
nasmbuild-0086ee56fa498b0a2da24cbb04b18d2a78875d12.zip
buildall.sh: build a Win64 binary package
-rwxr-xr-xbuildall.sh25
1 files changed, 21 insertions, 4 deletions
diff --git a/buildall.sh b/buildall.sh
index c918807..960e571 100755
--- a/buildall.sh
+++ b/buildall.sh
@@ -32,7 +32,7 @@ build () {
jobs=$((cpus+2))
makej="make -j$jobs"
- rm -rf nasm-* win32 dos macosx os2 rpmbuild doc html
+ rm -rf nasm-* win32 win64 dos macosx os2 rpmbuild doc html
mkdir -p rpmbuild/{BUILD,RPMS,SRPMS,SPECS,SOURCES}
# --- Generate tarballs ---
@@ -67,7 +67,21 @@ build () {
zip -9Drg ../nasm-$version-win32.zip nasm-$version -i \*.exe
cd nasm-$version
makensis nasm.nsi
- mv nasm-$version-installer.exe ../..
+ mv nasm-$version-installer.exe ../../nasm-$version-installer-x86.exe
+ cd ../..
+
+ # --- Generate Win64 binaries ---
+ mkdir -p win64
+ cp -a nasm-$version win64
+ cd win64/nasm-$version
+ LDFLAGS='-s' ./configure --host=x86_64-w64-mingw32
+ $makej
+ cd ..
+ 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
cd ../..
# --- Generate DOS binaries ---
@@ -117,7 +131,7 @@ build () {
# --- Publish resulting output files ---
mkdir -p "$outdir"
echo "$rev" > "$outdir"/git.id
- for os in linux win32 dos macosx; do
+ for os in linux win32 win64 dos macosx; do
mkdir -p "$outdir"/"$os"
done
@@ -126,7 +140,10 @@ build () {
mv -f nasm-${version}-xdoc.tar.* nasm-${version}-xdoc.zip "$outdir"
# Win32
mv -f nasm-${version}-win32.zip "$outdir"/win32/
- mv -f nasm-${version}-installer.exe "$outdir"/win32/
+ mv -f nasm-${version}-installer-x86.exe "$outdir"/win32/
+ # Win64
+ mv -f nasm-${version}-win64.zip "$outdir"/win64/
+ mv -f nasm-${version}-installer-x64.exe "$outdir"/win64/
# DOS
mv -f nasm-${version}-dos.zip nasm-${version}-dos-upx.zip "$outdir"/dos/
# MacOS X