X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=build_release;h=3aa9bf31963a4a43052cdf291a3069e70b255429;hb=30ee6cc4364b3eb504a4b3df902308bb32006bfa;hp=66da32b7b43192ecd67adcfb04ac576fd76dffef;hpb=6fc6879bd55a394f807cbbe927df736c190cb8ab;p=mech_eap.git

diff --git a/build_release b/build_release
index 66da32b..3aa9bf3 100755
--- a/build_release
+++ b/build_release
@@ -1,13 +1,9 @@
 #!/bin/sh
 
-# Path to the Windows cross compiler (mingw)
-WINCROSS=/opt/xmingw/bin
-WINLOCAL=/home/jm/H-win/local
-
 set -e
 
 if [ -z "$1" ]; then
-    echo "build_release <version> [nobin]"
+    echo "build_release <version>"
     exit 1
 fi
 
@@ -33,14 +29,14 @@ fi
 mkdir $TMP
 mkdir -p $RELDIR
 
-git-archive --format=tar --prefix=wpa-$VER/ HEAD \
-	README COPYING patches src wpa_supplicant hostapd |
+git archive --format=tar --prefix=wpa-$VER/ HEAD \
+	README COPYING CONTRIBUTIONS src wpa_supplicant hostapd hs20 |
 	gzip > $RELDIR/wpa-$VER.tar.gz
-git-archive --format=tar --prefix=hostapd-$VER/ HEAD \
-	README COPYING patches src hostapd |
+git archive --format=tar --prefix=hostapd-$VER/ HEAD \
+	README COPYING CONTRIBUTIONS src hostapd |
 	gzip > $RELDIR/hostapd-$VER.tar.gz
-git-archive --format=tar --prefix=wpa_supplicant-$VER/ HEAD \
-	README COPYING patches src wpa_supplicant |
+git archive --format=tar --prefix=wpa_supplicant-$VER/ HEAD \
+	README COPYING CONTRIBUTIONS src wpa_supplicant hs20/client |
 	tar --directory=$TMP -xf -
 
 cd $TMP
@@ -49,95 +45,3 @@ rm -f wpa_supplicant-$VER/wpa_supplicant/doc/docbook/manpage.{links,refs}
 tar czf $RELDIR/wpa_supplicant-$VER.tar.gz wpa_supplicant-$VER
 cd ..
 rm -r $TMP
-
-if [ "$2" == "nobin" ]; then
-    exit 0
-fi
-
-if [ -d $WINCROSS ]; then
-    pushd $RELDIR
-
-    PDIR=wpa_supplicant-$VER
-    WDIR=wpa_supplicant-windows-bin-$VER
-    tar xzf $PDIR.tar.gz
-    mkdir "$WDIR"
-    cd "$PDIR/wpa_supplicant"
-    cat > .config <<EOF
-CONFIG_DRIVER_NDIS=y
-CONFIG_NATIVE_WINDOWS=y
-
-CFLAGS += -I/opt/xmingw/i386-mingw32msvc/include/ddk
-CC=i386-mingw32msvc-gcc
-STRIP=i386-mingw32msvc-strip
-PLATFORMSDKLIB=$WINLOCAL/lib
-CONFIG_NDIS_EVENTS_INTEGRATED=y
-
-CFLAGS += -I$WINLOCAL/include
-LIBS += -L$WINLOCAL/lib
-LIBS_w += -L$WINLOCAL/lib
-LIBS_p += -L$WINLOCAL/lib
-
-CONFIG_EAP_SIM=y
-CONFIG_EAP_AKA=y
-CONFIG_EAP_LEAP=y
-CONFIG_EAP_FAST=y
-CONFIG_EAP_TLS=y
-
-CONFIG_CTRL_IFACE=y
-CONFIG_EAP_FAST=y
-CONFIG_EAP_MSCHAPV2=y
-CONFIG_EAP_TTLS=y
-CONFIG_EAP_PEAP=y
-CONFIG_EAP_MD5=y
-CONFIG_EAP_GTC=y
-CONFIG_EAP_OTP=y
-CONFIG_EAP_PAX=y
-CONFIG_EAP_SAKE=y
-CONFIG_EAP_PSK=y
-CONFIG_EAP_TNC=y
-CONFIG_PKCS12=y
-CONFIG_PCSC=y
-
-CONFIG_L2_PACKET=winpcap
-CONFIG_MAIN=main_winsvc
-CONFIG_BACKEND=winreg
-CONFIG_ELOOP=eloop_win
-CFLAGS += -DCONFIG_DEBUG_FILE
-EOF
-
-    # First, build the Windows service & registry version and rename it
-    PATH=$PATH:$WINCROSS make windows-bin
-    mv wpa_supplicant.exe wpasvc.exe
-
-    # Then, build "the standard" wpa_supplicant.exe
-    cat >> .config <<EOF
-CONFIG_MAIN=main
-CONFIG_BACKEND=file
-EOF
-
-    PATH=$PATH:$WINCROSS make windows-bin
-
-    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"
-
-    cd wpa_gui-qt4
-    PATH=$PATH:$WINCROSS ./setup-mingw-cross-compiling
-    PATH=$PATH:$WINCROSS make
-    cp release/wpa_gui.exe ../../../"$WDIR"
-    cd ../../..
-    rm -rf "$PDIR"
-    zip "$WDIR.zip" "$WDIR"/*
-    rm -rf "$WDIR"
-
-    popd
-fi
-
-ls -l $RELDIR/*$VER*
-
-exit 0