X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=build_release;h=b5050a55f0b9aa356d14c5161662af220155ede4;hb=4625a47f4bb722710a5e622085ccd2b32ebaf6c9;hp=b1a6ee8002ac5dfe9169fcf80b5c793326da5170;hpb=36cb321611b557ff2e3a9fa49513e2341f4028cc;p=wpasupplicant

diff --git a/build_release b/build_release
index b1a6ee8..b5050a5 100755
--- a/build_release
+++ b/build_release
@@ -48,7 +48,7 @@ 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
 
@@ -75,6 +75,7 @@ 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
@@ -95,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
@@ -104,7 +106,7 @@ CFLAGS += -DCONFIG_DEBUG_FILE
 EOF
 
     # First, build the Windows service & registry version and rename it
-    make windows-bin
+    make -j2 windows-bin
     mv wpa_supplicant.exe wpasvc.exe
 
     # Then, build "the standard" wpa_supplicant.exe
@@ -113,7 +115,7 @@ CONFIG_MAIN=main
 CONFIG_BACKEND=file
 EOF
 
-    make windows-bin
+    make -j2 windows-bin
 
     for i in COPYING; do
 	unix2dos < ../$i > ../../"$WDIR"/$i
@@ -125,9 +127,9 @@ EOF
     cp win_example.reg ../../"$WDIR"
 
     cd wpa_gui-qt4
-    qmake -spec win32-x-g++
     make -C icons
-    make
+    qmake -spec win32-x-g++
+    make -j2
     cp release/wpa_gui.exe ../../../"$WDIR"
     cd ../../..
     rm -rf "$PDIR"
@@ -136,6 +138,9 @@ EOF
 
 cd $RELDIR/..
 
+./build_nsis.sh "$RELDIR/$WDIR.zip"
+mv wpa_supplicant-$VER.exe $RELDIR
+
 ls -l $RELDIR/*$VER*
 
 exit 0