aboutsummaryrefslogtreecommitdiffstats
path: root/build_release
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2007-03-25 22:30:17 (GMT)
committerJouni Malinen <j@w1.fi>2007-03-25 22:30:17 (GMT)
commit92dab3ba16be57d5cd0a5a2ddbc0df34ec9c0057 (patch)
tree845fa50f9cd8214948630899a347f2658064a70d /build_release
parent1c04f9f8ed8c5b826a59a3aa5b23a9c78ec4cd11 (diff)
downloadhostap-history-92dab3ba16be57d5cd0a5a2ddbc0df34ec9c0057.zip
hostap-history-92dab3ba16be57d5cd0a5a2ddbc0df34ec9c0057.tar.gz
hostap-history-92dab3ba16be57d5cd0a5a2ddbc0df34ec9c0057.tar.bz2
Updated release build to match with the current directory structure.
Diffstat (limited to 'build_release')
-rwxr-xr-xbuild_release69
1 files changed, 29 insertions, 40 deletions
diff --git a/build_release b/build_release
index b2d5b11..61a9a33 100755
--- a/build_release
+++ b/build_release
@@ -16,16 +16,6 @@ TMP=tmp.build_release
RELDIR=`pwd`/Release
VER=$1
NOW=`date +%Y-%m-%d`
-DIR=hostap-$VER
-
-if [ -r $TMP ]; then
- echo "Temporary directory '$TMP' exists. Remove it before running this."
- exit 1
-fi
-
-mkdir $TMP
-cg-export "$TMP/$DIR"
-cd "$TMP/$DIR"
echo "Version: $VER - $NOW"
@@ -36,29 +26,28 @@ if [ "$DATEw" != "$NOW" -o "$DATEh" != "$NOW" ]; then
echo "NOTE! Date mismatch in ChangeLog: wpa_supplicant $DATEw hostapd $DATEh != $NOW"
fi
-cd ..
+if [ -r $TMP ]; then
+ echo "Temporary directory '$TMP' exists. Remove it before running this."
+ exit 1
+fi
+
+mkdir $TMP
mkdir -p $RELDIR
-# New style tarballs
-mv $DIR/wpa_supplicant wpa_supplicant-$VER
-cp $DIR/COPYING wpa_supplicant-$VER
-cd wpa_supplicant-$VER
-cat Makefile | sed "s%../hostapd/%%g" > Makefile.tmp
-mv -f Makefile.tmp Makefile
-cat wpa_gui/wpa_gui.pro | sed "s%../hostapd/%%g" > wpa_gui.pro.tmp
-mv -f wpa_gui.pro.tmp wpa_gui/wpa_gui.pro
-cat wpa_gui-qt4/wpa_gui.pro | sed "s%../hostapd/%%g" > wpa_gui.pro.tmp
-mv -f wpa_gui.pro.tmp wpa_gui-qt4/wpa_gui.pro
-cd doc/docbook
-make man
-rm -f manpage.links manpage.refs
-cd ../../..
+git-archive --format=tar --prefix=wpa-$VER/ HEAD \
+ README COPYING patches src wpa_supplicant hostapd |
+ gzip > $RELDIR/wpa-$VER.tar.gz
+git-archive --format=tar --prefix=hostapd-$VER/ HEAD \
+ README COPYING patches src hostapd |
+ gzip > $RELDIR/hostapd-$VER.tar.gz
+git-archive --format=tar --prefix=wpa_supplicant-$VER/ HEAD \
+ README COPYING patches src wpa_supplicant |
+ tar --directory=$TMP -xf -
+
+cd $TMP
+make -C wpa_supplicant-$VER/wpa_supplicant/doc/docbook man
+rm -f wpa_supplicant-$VER/wpa_supplicant/doc/docbook/manpage.{links,refs}
tar czf $RELDIR/wpa_supplicant-$VER.tar.gz wpa_supplicant-$VER
-
-mv $DIR/hostapd hostapd-$VER
-cp $DIR/COPYING hostapd-$VER
-tar czf $RELDIR/hostapd-$VER.tar.gz hostapd-$VER
-
cd ..
rm -r $TMP
@@ -73,7 +62,7 @@ if [ -d $WINCROSS ]; then
WDIR=wpa_supplicant-windows-bin-$VER
tar xzf $PDIR.tar.gz
mkdir "$WDIR"
- cd "$PDIR"
+ cd "$PDIR/wpa_supplicant"
cat > .config <<EOF
CONFIG_DRIVER_NDIS=y
CONFIG_NATIVE_WINDOWS=y
@@ -128,19 +117,20 @@ EOF
PATH=$PATH:$WINCROSS make windows-bin
- for i in COPYING README README-Windows.txt wpa_supplicant.conf; do
- unix2dos < $i > ../"$WDIR"/$i
+ for i in COPYING; do
+ unix2dos < ../$i > ../../"$WDIR"/$i
+ done
+ for i in README README-Windows.txt wpa_supplicant.conf; do
+ unix2dos < $i > ../../"$WDIR"/$i
done
- mv *.exe ../"$WDIR"
- cp win_example.reg ../"$WDIR"
+ mv *.exe ../../"$WDIR"
+ cp win_example.reg ../../"$WDIR"
cd wpa_gui
PATH=$QT4HOSTBIN:$PATH:$WINCROSS ./setup-mingw-cross-compiling
PATH=$QT4HOSTBIN:$PATH:$WINCROSS make
- cp release/wpa_gui.exe ../../"$WDIR"
- cd ..
-
- cd ..
+ cp release/wpa_gui.exe ../../../"$WDIR"
+ cd ../../..
rm -rf "$PDIR"
zip "$WDIR.zip" "$WDIR"/*
rm -rf "$WDIR"
@@ -150,5 +140,4 @@ fi
ls -l $RELDIR/*$VER*
-
exit 0