summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2009-07-05 19:04:49 -0700
committerH. Peter Anvin <hpa@zytor.com>2009-07-05 19:04:49 -0700
commit93ac7e566a4d609c13d609da66ed867b185f93ba (patch)
treea750736a36e45a60141f04a381921656fb98b78a
parentcc62a2184f00657245db87c383cb28355565b825 (diff)
downloadnasmbuild-93ac7e566a4d609c13d609da66ed867b185f93ba.tar.gz
nasmbuild-93ac7e566a4d609c13d609da66ed867b185f93ba.tar.xz
nasmbuild-93ac7e566a4d609c13d609da66ed867b185f93ba.zip
Fix nsis invocation; add exclude directory
-rwxr-xr-xbuildall.sh34
1 files changed, 19 insertions, 15 deletions
diff --git a/buildall.sh b/buildall.sh
index 4b5ddaf..e47b946 100755
--- a/buildall.sh
+++ b/buildall.sh
@@ -4,6 +4,7 @@ here=/home/nasmbuild/work
patchdir=/home/nasmbuild/patches
snapdir=/pub/nasm/snapshots
reldir=/pub/nasm/releasebuilds
+excludedir=/pub/nasm/exclude
repo=/pub/git/nasm/nasm.git
tagrepo=/pub/git/nasm/nasm-daily.git
web=/home/www/nasm
@@ -59,9 +60,10 @@ build () {
cd ..
zip -9Dl ../nasm-$version-win32.zip nasm-$version/COPYING
zip -9Drg ../nasm-$version-win32.zip nasm-$version -i \*.exe
- makensis nasm.nsis
- mv nasm-$version-installer.exe ..
- cd ..
+ cd nasm-$version
+ makensis nasm.nsi
+ mv nasm-$version-installer.exe ../..
+ cd ../..
mkdir -p dos
cp -a nasm-$version dos
@@ -152,18 +154,20 @@ fi
#
(cd git && git tag) | while read tag; do
: $tag
- case "$tag" in
- nasm-0.99.0[5-9]|nasm-0.99.[1-9]*|nasm-[1-9]*)
- rel_version=$(echo "$tag" | sed -e 's/^nasm-//')
- if [ ! -d "$reldir"/"$rel_version" ]; then
- git clone -s -l -n git git-rel
- ( cd git-rel && git checkout "$tag" )
- tagref=$(cd git-rel && git rev-parse "$tag")
- build "$rel_version" "$reldir"/"$rel_version" git-rel "$tagref"
- process_release "$rel_version"
- fi
- ;;
- esac
+ if [ ! -f "$excludedir"/"$tag" ]; then
+ case "$tag" in
+ nasm-0.99.0[5-9]|nasm-0.99.[1-9]*|nasm-[1-9]*)
+ rel_version=$(echo "$tag" | sed -e 's/^nasm-//')
+ if [ ! -d "$reldir"/"$rel_version" ]; then
+ git clone -s -l -n git git-rel
+ ( cd git-rel && git checkout "$tag" )
+ tagref=$(cd git-rel && git rev-parse "$tag")
+ build "$rel_version" "$reldir"/"$rel_version" git-rel "$tagref"
+ process_release "$rel_version"
+ fi
+ ;;
+ esac
+ fi
done
#