Merge branch 'moonshot' of ssh://moonshot.suchdamage.org:822/srv/git/libeap into...

[libeap.git] / build_release

diff --git a/build_release b/build_release
index b1a6ee8..22dcd42 100755 (executable)
--- a/build_release
+++ b/build_release
@@ -31,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 -
 
@@ -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,10 +127,12 @@ 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"
+    lrelease wpa_gui.pro
+    cp lang/wpa_gui_de.qm ../../../"$WDIR"
     cd ../../..
     rm -rf "$PDIR"
     zip "$WDIR.zip" "$WDIR"/*
@@ -136,6 +140,9 @@ EOF
 
 cd $RELDIR/..
 
+./build_nsis.sh "$RELDIR/$WDIR.zip"
+mv wpa_supplicant-$VER.exe $RELDIR
+
 ls -l $RELDIR/*$VER*
 
 exit 0