X-Git-Url: http://www.project-moonshot.org/gitweb/?p=libeap.git;a=blobdiff_plain;f=build_release;h=22dcd4219d3a1ee156d4ba8443ee0442ee0b9091;hp=66da32b7b43192ecd67adcfb04ac576fd76dffef;hb=HEAD;hpb=6fc6879bd55a394f807cbbe927df736c190cb8ab

diff --git a/build_release b/build_release
index 66da32b..22dcd42 100755
--- a/build_release
+++ b/build_release
@@ -1,7 +1,5 @@
 #!/bin/sh
 
-# Path to the Windows cross compiler (mingw)
-WINCROSS=/opt/xmingw/bin
 WINLOCAL=/home/jm/H-win/local
 
 set -e
@@ -33,13 +31,13 @@ fi
 mkdir $TMP
 mkdir -p $RELDIR
 
-git-archive --format=tar --prefix=wpa-$VER/ HEAD \
+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 \
+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 \
+git archive --format=tar --prefix=wpa_supplicant-$VER/ HEAD \
 	README COPYING patches src wpa_supplicant |
 	tar --directory=$TMP -xf -
 
@@ -50,12 +48,12 @@ tar czf $RELDIR/wpa_supplicant-$VER.tar.gz wpa_supplicant-$VER
 cd ..
 rm -r $TMP
 
-if [ "$2" == "nobin" ]; then
+if [ "$2" = "nobin" ]; then
     exit 0
 fi
 
-if [ -d $WINCROSS ]; then
-    pushd $RELDIR
+
+cd $RELDIR
 
     PDIR=wpa_supplicant-$VER
     WDIR=wpa_supplicant-windows-bin-$VER
@@ -66,9 +64,8 @@ if [ -d $WINCROSS ]; then
 CONFIG_DRIVER_NDIS=y
 CONFIG_NATIVE_WINDOWS=y
 
-CFLAGS += -I/opt/xmingw/i386-mingw32msvc/include/ddk
-CC=i386-mingw32msvc-gcc
-STRIP=i386-mingw32msvc-strip
+CC=i586-mingw32msvc-gcc
+STRIP=i586-mingw32msvc-strip
 PLATFORMSDKLIB=$WINLOCAL/lib
 CONFIG_NDIS_EVENTS_INTEGRATED=y
 
@@ -78,7 +75,9 @@ LIBS_w += -L$WINLOCAL/lib
 LIBS_p += -L$WINLOCAL/lib
 
 CONFIG_EAP_SIM=y
+CONFIG_SIM_SIMULATOR=y
 CONFIG_EAP_AKA=y
+CONFIG_USIM_SIMULATOR=y
 CONFIG_EAP_LEAP=y
 CONFIG_EAP_FAST=y
 CONFIG_EAP_TLS=y
@@ -97,6 +96,7 @@ CONFIG_EAP_PSK=y
 CONFIG_EAP_TNC=y
 CONFIG_PKCS12=y
 CONFIG_PCSC=y
+CONFIG_WPS=y
 
 CONFIG_L2_PACKET=winpcap
 CONFIG_MAIN=main_winsvc
@@ -106,7 +106,7 @@ CFLAGS += -DCONFIG_DEBUG_FILE
 EOF
 
     # First, build the Windows service & registry version and rename it
-    PATH=$PATH:$WINCROSS make windows-bin
+    make -j2 windows-bin
     mv wpa_supplicant.exe wpasvc.exe
 
     # Then, build "the standard" wpa_supplicant.exe
@@ -115,7 +115,7 @@ CONFIG_MAIN=main
 CONFIG_BACKEND=file
 EOF
 
-    PATH=$PATH:$WINCROSS make windows-bin
+    make -j2 windows-bin
 
     for i in COPYING; do
 	unix2dos < ../$i > ../../"$WDIR"/$i
@@ -127,16 +127,21 @@ EOF
     cp win_example.reg ../../"$WDIR"
 
     cd wpa_gui-qt4
-    PATH=$PATH:$WINCROSS ./setup-mingw-cross-compiling
-    PATH=$PATH:$WINCROSS make
+    make -C icons
+    qmake -spec win32-x-g++
+    make -j2
     cp release/wpa_gui.exe ../../../"$WDIR"
+    lrelease wpa_gui.pro
+    cp lang/wpa_gui_de.qm ../../../"$WDIR"
     cd ../../..
     rm -rf "$PDIR"
     zip "$WDIR.zip" "$WDIR"/*
     rm -rf "$WDIR"
 
-    popd
-fi
+cd $RELDIR/..
+
+./build_nsis.sh "$RELDIR/$WDIR.zip"
+mv wpa_supplicant-$VER.exe $RELDIR
 
 ls -l $RELDIR/*$VER*