win: Update bundle.sh

.gitignore

@@ -24,6 +24,7 @@ dist/osx/Spek.app
 dist/osx/Spek.dmg
 dist/win/Spek
 dist/win/spek.wxs
+dist/win/tests
 env
 install-sh
 intltool-extract.in
@@ -40,8 +41,10 @@ po/.intltool-merge-cache
 po/POTFILES
 po/stamp-it
 src/*.stamp
+src/.libs
 src/spek
 stamp-h1
+tests/.libs
 tests/perf
 tests/samples/perf.wav
 tests/test

dist/win/README.md

@@ -10,7 +10,7 @@ For the first step you can use any Unix-y environment. Set up
 
 Apply `mxe.diff` and build Spek dependencies:
 
-    make pthreads ffmpeg wxwidgets -j4 JOBS=4
+    make pthreads ffmpeg wxwidgets -j8 JOBS=8
 
 Build Spek, adjusting `bundle.sh` variables as necessary:
 
@@ -18,4 +18,4 @@ Build Spek, adjusting `bundle.sh` variables as necessary:
 
 For the second step, you will need a Windows box with
 [WiX](http://wixtoolset.org/) installed. Copy over the entire `dist/win`
-directory and run `bundle.bat`.
+directory, cd into it, and run `bundle.bat`.

dist/win/bundle.sh

@@ -7,15 +7,13 @@
 # Adjust these variables if necessary.
 MXE=$(realpath $(dirname $0)/../../../mxe/usr)
 MAKE=gmake
-UPX=upx
 ZIP=zip
 
-HOST=i686-pc-mingw32
+HOST=i686-w64-mingw32.static
 LANGUAGES="ca cs da de el eo es fi fr gl it ja lv nb nl pl pt_BR ru sk sr@latin sv tr uk vi zh_CN zh_TW"
 PATH="$MXE"/bin:$PATH
-STRIP=i686-pc-mingw32-strip
-WINDRES=i686-pc-mingw32-windres
-WX_CONFIG="$MXE"/i686-pc-mingw32/bin/wx-config
+WINDRES="$HOST"-windres
+WX_CONFIG="$MXE"/"$HOST"/bin/wx-config
 
 cd $(dirname $0)/../..
 rm -fr dist/win/build && mkdir dist/win/build
@@ -26,7 +24,7 @@ rm -f dist/win/spek.res
 mkdir -p src/dist/win && cp dist/win/spek.res src/dist/win/
 mkdir -p tests/dist/win && cp dist/win/spek.res tests/dist/win/
 
-# Compile and strip spek.exe
+# Compile spek.exe
 LDFLAGS="-mwindows dist/win/spek.res" ./autogen.sh \
     --host="$HOST" \
     --disable-valgrind \
@@ -34,8 +32,6 @@ LDFLAGS="-mwindows dist/win/spek.res" ./autogen.sh \
     --prefix=${PWD}/dist/win/build && \
     "$MAKE" -j8 && \
     "$MAKE" install || exit 1
-"$STRIP" dist/win/build/bin/spek.exe
-"$UPX" dist/win/build/bin/spek.exe
 
 # Compile test.exe
 LDFLAGS="-mconsole" ./autogen.sh \
@@ -43,7 +39,7 @@ LDFLAGS="-mconsole" ./autogen.sh \
     --disable-valgrind \
     --with-wx-config="$WX_CONFIG" \
     --prefix=${PWD}/dist/win/build && \
-    "$MAKE" check -j8
+    "$MAKE" check -j8 TESTS=
 
 # Copy files to the bundle
 cd dist/win
@@ -55,8 +51,8 @@ mkdir Spek/lic
 cp ../../lic/* Spek/lic/
 for lang in $LANGUAGES; do
     mkdir -p Spek/"$lang"
-    cp build/lib/locale/"$lang"/LC_MESSAGES/spek.mo Spek/"$lang"/
-    cp "$MXE"/i686-pc-mingw32/share/locale/"$lang"/LC_MESSAGES/wxstd.mo Spek/"$lang"/
+    cp build/share/locale/"$lang"/LC_MESSAGES/spek.mo Spek/"$lang"/
+    cp "$MXE"/"$HOST"/share/locale/"$lang"/LC_MESSAGES/wxstd.mo Spek/"$lang"/
 done
 rm -fr build