build: Optimize Windows build scripts

dist/win/bundle.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -xeu
 
 # This script will compile spek.exe under MSYS2 and make a ZIP archive.
 # Check README.md in this directory for instructions.
@@ -10,16 +11,16 @@ ZIP=zip
 STRIP=strip
 WINDRES=windres
 CYGPATH=cygpath
-WXCONFIG=wx-config
+WX_CONFIG=wx-config
 WX_PREFIX="$(wx-config --prefix)"
 
 LANGUAGES="bs ca cs da de el eo es fi fr gl he hu id it ja ko lv nb nl pl pt_BR ru sk sr@latin sv th tr uk vi zh_CN zh_TW"
 
-cd $(dirname $0)/../..
+cd "$(dirname $0)"/../..
 rm -fr dist/win/build && mkdir dist/win/build
 
 # Test windres
-"$WINDRES" dist/win/spek.rc -O coff -o dist/win/spek.res || exit 1
+"$WINDRES" dist/win/spek.rc -O coff -o dist/win/spek.res
 
 # Run autogen.sh
 CXXFLAGS="--static" \
@@ -28,18 +29,18 @@ LDFLAGS="-mwindows dist/win/spek.res" ./autogen.sh \
     --enable-static \
     --disable-valgrind \
     --with-wx-config="$WX_CONFIG" \
-    --prefix=${PWD}/dist/win/build && \
-    "$MAKE" clean || exit 1
+    --prefix="$PWD/dist/win/build" && \
+    "$MAKE" clean
 
 # Compile PO files first
-cd po && "$MAKE" && cd .. || exit 1
+cd po && "$MAKE" && cd ..
 
 # Compile the resource file
-./dist/win/compile-rc.py "$WINDRES" "$(CYGPATH "$WX_PREFIX")" $LANGUAGES || exit 1
+./dist/win/compile-rc.py "$WINDRES" "$(CYGPATH "$WX_PREFIX")" $LANGUAGES
 mkdir -p src/dist/win && cp dist/win/spek.res src/dist/win/
 
 # Compile spek.exe
-"$MAKE" V=1 -j $JOBS && "$MAKE" install || exit 1
+"$MAKE" V=1 -j "$JOBS" && "$MAKE" install
 "$STRIP" dist/win/build/bin/spek.exe
 
 # Copy files to the bundle
@@ -48,8 +49,11 @@ rm -fr Spek && mkdir Spek
 cp build/bin/spek.exe Spek/
 cp ../../LICENCE.md Spek/
 cp ../../README.md Spek/
-mkdir Spek/lic
-cp ../../lic/* Spek/lic/
+mkdir Spek/licenses
+cp ../../lic/* Spek/licenses/
+for lic in Spek/licenses/*; do
+    mv "$lic" "$lic.txt"
+done
 rm -fr build
 cd ../..
 

dist/win/install_deps.sh

@@ -1,51 +1,56 @@
 #!/bin/bash
+set -xeu
 
 # This script will compile and install the dependencies which are needed to build spek.exe.
 # Check README.md in this directory for instructions.
 
 # Adjust these variables if necessary.
 WX_VER="3.2.6"
-FFMPEG_VER="7.1"
-PREFIX="$MINGW_PREFIX"
+WX_URL="https://github.com/wxWidgets/wxWidgets/releases/download/v$WX_VER/wxWidgets-$WX_VER.tar.bz2"
+WX_SHA="939e5b77ddc5b6092d1d7d29491fe67010a2433cf9b9c0d841ee4d04acb9dce7"
 
-# Check the envrionment variables
-[ -n "$MINGW_PREFIX" ] && [ -n "$MINGW_PACKAGE_PREFIX" ] && [ -n "$MSYSTEM" ] || {
-    echo "One or more of the following variables are not set:"
-    echo "MINGW_PREFIX  MINGW_PACKAGE_PREFIX  MSYSTEM"
-    exit 1
-}
+FFMPEG_VER="7.1"
+FFMPEG_URL="https://ffmpeg.org/releases/ffmpeg-$FFMPEG_VER.tar.bz2"
+FFMPEG_SHA="fd59e6160476095082e94150ada5a6032d7dcc282fe38ce682a00c18e7820528"
 
-[ "$MSYSTEM" = "CLANGARM64" ] && [ ! `grep '^\[clangarm64\]' /etc/pacman.conf` ] && {
-cat <<EOF >> /etc/pacman.conf
-# Enable ARM64 packages
-[clangarm64]
-Include = /etc/pacman.d/mirrorlist.mingw
-EOF
-}
+PREFIX="$MINGW_PREFIX"
 
-pacman -Sy && pacman -S --needed --noconfirm autotools intltool yasm zip "${MINGW_PACKAGE_PREFIX}-toolchain" || exit 1
+pacman -Sy && pacman -S --needed --noconfirm autotools intltool yasm zip "${MINGW_PACKAGE_PREFIX}-toolchain"
 
 rm -rf $(dirname $0)/deps
 mkdir -p $(dirname $0)/deps
 cd $(dirname $0)/deps
 
 # === wxWidgets ===
 echo "# Installing wxWidgets..."
-wget "https://github.com/wxWidgets/wxWidgets/releases/download/v${WX_VER}/wxWidgets-${WX_VER}.tar.bz2" || exit 1
-tar xjvf "wxWidgets-${WX_VER}.tar.bz2"
+wget "$WX_URL"
+echo "$WX_SHA wxWidgets-$WX_VER.tar.bz2" | sha256sum -c
+tar xf "wxWidgets-${WX_VER}.tar.bz2"
 cd "wxWidgets-${WX_VER}"
 mkdir msw-build
 cd msw-build
-../configure --prefix="$PREFIX" --disable-shared --with-libtiff=no || exit 1
-make -j3 && make install || exit 1
+../configure \
+    --prefix="$PREFIX" \
+    --disable-shared \
+    --without-libtiff \
+    --without-nanosvg \
+    --without-opengl \
+    --disable-stc \
+    --disable-richtext \
+    --disable-propgrid \
+    --disable-aui \
+    --disable-ribbon \
+    --disable-webview
+make -j$(nproc) && make install
 cd ../..
 
 # === FFmpeg ===
 # There are some problems assembling aarch64 code. Just disable it.
 [ "$MSYSTEM" = "CLANGARM64" ] && FFMPEG_ASM_OPTION="--disable-asm" || FFMPEG_ASM_OPTION=""
 echo "# Installing FFmpeg..."
-wget "https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VER}.tar.bz2" || exit 1
-tar xjvf "ffmpeg-${FFMPEG_VER}.tar.bz2"
+wget "$FFMPEG_URL"
+echo "$FFMPEG_SHA ffmpeg-${FFMPEG_VER}.tar.bz2" | sha256sum -c
+tar xf "ffmpeg-${FFMPEG_VER}.tar.bz2"
 cd "ffmpeg-${FFMPEG_VER}"
 ./configure \
     --prefix="$PREFIX" \
@@ -73,10 +78,10 @@ cd "ffmpeg-${FFMPEG_VER}"
     --disable-protocols \
     --enable-protocol=file,pipe \
     --disable-parsers \
-    --enable-parser=aac,aac_latm,ac3,cook,dca,dirac,dolby_e,flac,g723_1,g729,gsm,mlp,mpegaudio,opus,sbc,sipr,tak,vorbis\
+    --enable-parser=aac,aac_latm,ac3,cook,dca,dirac,dolby_e,flac,g723_1,g729,gsm,mlp,mpegaudio,opus,sbc,sipr,tak,vorbis \
     --disable-decoders \
-    --enable-decoder=aac,aac_fixed,aac_latm,ac3,ac3_fixed,acelp_kelvin,alac,als,amrnb,amrwb,ape,aptx,aptx_hd,atrac1,atrac3,atrac3al,atrac3p,atrac3pal,atrac9,binkaudio_dct,binkaudio_rdft,bmv_audio,cook,dca,dfpwm,dolby_e,dsd_lsbf,dsd_msbf,dsd_lsbf_planar,dsd_msbf_planar,dsicinaudio,dss_sp,dst,eac3,evrc,fastaudio,ffwavesynth,flac,g723_1,g729,gsm,gsm_ms,hca,hcom,iac,ilbc,imc,interplay_acm,mace3,mace6,metasound,mlp,mp1,mp1float,mp2,mp2float,mp3float,mp3,mp3adufloat,mp3adu,mp3on4float,mp3on4,mpc7,mpc8,msnsiren,nellymoser,on2avc,opus,paf_audio,qcelp,qdm2,qdmc,ra_144,ra_288,ralf,sbc,shorten,sipr,siren,smackaud,sonic,tak,truehd,truespeech,tta,twinvq,vmdaudio,vorbis,wavpack,wmalossless,wmapro,wmav1,wmav2,wmavoice,ws_snd1,xma1,xma2,pcm_alaw,pcm_bluray,pcm_dvd,pcm_f16le,pcm_f24le,pcm_f32be,pcm_f32le,pcm_f64be,pcm_f64le,pcm_lxf,pcm_mulaw,pcm_s8,pcm_s8_planar,pcm_s16be,pcm_s16be_planar,pcm_s16le,pcm_s16le_planar,pcm_s24be,pcm_s24daud,pcm_s24le,pcm_s24le_planar,pcm_s32be,pcm_s32le,pcm_s32le_planar,pcm_s64be,pcm_s64le,pcm_sga,pcm_u8,pcm_u16be,pcm_u16le,pcm_u24be,pcm_u24le,pcm_u32be,pcm_u32le,pcm_vidc,derf_dpcm,gremlin_dpcm,interplay_dpcm,roq_dpcm,sdx2_dpcm,sol_dpcm,xan_dpcm,adpcm_4xm,adpcm_adx,adpcm_afc,adpcm_agm,adpcm_aica,adpcm_argo,adpcm_ct,adpcm_dtk,adpcm_ea,adpcm_ea_maxis_xa,adpcm_ea_r1,adpcm_ea_r2,adpcm_ea_r3,adpcm_ea_xas,adpcm_g722,adpcm_g726,adpcm_g726le,adpcm_ima_acorn,adpcm_ima_amv,adpcm_ima_alp,adpcm_ima_apc,adpcm_ima_apm,adpcm_ima_cunning,adpcm_ima_dat4,adpcm_ima_dk3,adpcm_ima_dk4,adpcm_ima_ea_eacs,adpcm_ima_ea_sead,adpcm_ima_iss,adpcm_ima_moflex,adpcm_ima_mtf,adpcm_ima_oki,adpcm_ima_qt,adpcm_ima_rad,adpcm_ima_ssi,adpcm_ima_smjpeg,adpcm_ima_wav,adpcm_ima_ws,adpcm_ms,adpcm_mtaf,adpcm_psx,adpcm_sbpro_2,adpcm_sbpro_3,adpcm_sbpro_4,adpcm_swf,adpcm_thp,adpcm_thp_le,adpcm_vima,adpcm_xa,adpcm_yamaha,adpcm_zork || exit 1
-make -j3 && make install || exit 1
+    --enable-decoder=aac,aac_fixed,aac_latm,ac3,ac3_fixed,acelp_kelvin,alac,als,amrnb,amrwb,ape,aptx,aptx_hd,atrac1,atrac3,atrac3al,atrac3p,atrac3pal,atrac9,binkaudio_dct,binkaudio_rdft,bmv_audio,cook,dca,dfpwm,dolby_e,dsd_lsbf,dsd_msbf,dsd_lsbf_planar,dsd_msbf_planar,dsicinaudio,dss_sp,dst,eac3,evrc,fastaudio,ffwavesynth,flac,g723_1,g729,gsm,gsm_ms,hca,hcom,iac,ilbc,imc,interplay_acm,mace3,mace6,metasound,mlp,mp1,mp1float,mp2,mp2float,mp3float,mp3,mp3adufloat,mp3adu,mp3on4float,mp3on4,mpc7,mpc8,msnsiren,nellymoser,on2avc,opus,paf_audio,qcelp,qdm2,qdmc,ra_144,ra_288,ralf,sbc,shorten,sipr,siren,smackaud,sonic,tak,truehd,truespeech,tta,twinvq,vmdaudio,vorbis,wavpack,wmalossless,wmapro,wmav1,wmav2,wmavoice,ws_snd1,xma1,xma2,pcm_alaw,pcm_bluray,pcm_dvd,pcm_f16le,pcm_f24le,pcm_f32be,pcm_f32le,pcm_f64be,pcm_f64le,pcm_lxf,pcm_mulaw,pcm_s8,pcm_s8_planar,pcm_s16be,pcm_s16be_planar,pcm_s16le,pcm_s16le_planar,pcm_s24be,pcm_s24daud,pcm_s24le,pcm_s24le_planar,pcm_s32be,pcm_s32le,pcm_s32le_planar,pcm_s64be,pcm_s64le,pcm_sga,pcm_u8,pcm_u16be,pcm_u16le,pcm_u24be,pcm_u24le,pcm_u32be,pcm_u32le,pcm_vidc,derf_dpcm,gremlin_dpcm,interplay_dpcm,roq_dpcm,sdx2_dpcm,sol_dpcm,xan_dpcm,adpcm_4xm,adpcm_adx,adpcm_afc,adpcm_agm,adpcm_aica,adpcm_argo,adpcm_ct,adpcm_dtk,adpcm_ea,adpcm_ea_maxis_xa,adpcm_ea_r1,adpcm_ea_r2,adpcm_ea_r3,adpcm_ea_xas,adpcm_g722,adpcm_g726,adpcm_g726le,adpcm_ima_acorn,adpcm_ima_amv,adpcm_ima_alp,adpcm_ima_apc,adpcm_ima_apm,adpcm_ima_cunning,adpcm_ima_dat4,adpcm_ima_dk3,adpcm_ima_dk4,adpcm_ima_ea_eacs,adpcm_ima_ea_sead,adpcm_ima_iss,adpcm_ima_moflex,adpcm_ima_mtf,adpcm_ima_oki,adpcm_ima_qt,adpcm_ima_rad,adpcm_ima_ssi,adpcm_ima_smjpeg,adpcm_ima_wav,adpcm_ima_ws,adpcm_ms,adpcm_mtaf,adpcm_psx,adpcm_sbpro_2,adpcm_sbpro_3,adpcm_sbpro_4,adpcm_swf,adpcm_thp,adpcm_thp_le,adpcm_vima,adpcm_xa,adpcm_yamaha,adpcm_zork
+make -j$(nproc) && make install
 
 # Clean up
 cd ../..