Allow users to opt into building wxWidgets.

build_windows.sh

@@ -38,12 +38,18 @@ cd $CODEC2DIR/$BUILD_DIR && rm -Rf *
 $CMAKE -DLPCNET_BUILD_DIR=$LPCNETDIR/$BUILD_DIR ..
 make VERBOSE=1
 
-# build wxWidgets
+if [ $BOOTSTRAP_WX -eq 1 ]; then
-cd $FREEDVGUIDIR && git pull
+    # build wxWidgets
-mkdir -p $BUILD_DIR && cd $BUILD_DIR && rm -Rf *
+    cd $FREEDVGUIDIR && git pull
-$CMAKE -DBOOTSTRAP_WXWIDGETS=1 -DCMAKE_BUILD_TYPE=Debug -DCODEC2_BUILD_DIR=$CODEC2DIR/$BUILD_DIR -DLPCNET_BUILD_DIR=$LPCNETDIR/$BUILD_DIR ..
+    mkdir -p $BUILD_DIR && cd $BUILD_DIR && rm -Rf *
-make VERBOSE=1
+    $CMAKE -DBOOTSTRAP_WXWIDGETS=1 -DCMAKE_BUILD_TYPE=Debug -DCODEC2_BUILD_DIR=$CODEC2DIR/$BUILD_DIR -DLPCNET_BUILD_DIR=$LPCNETDIR/$BUILD_DIR ..
+    make VERBOSE=1
 
-# build freedv-gui
+    # build freedv-gui
-$CMAKE -DBOOTSTRAP_WXWIDGETS=1 -DCMAKE_BUILD_TYPE=Debug -DCODEC2_BUILD_DIR=$CODEC2DIR/$BUILD_DIR -DLPCNET_BUILD_DIR=$LPCNETDIR/$BUILD_DIR ..
+    $CMAKE -DBOOTSTRAP_WXWIDGETS=1 -DCMAKE_BUILD_TYPE=Debug -DCODEC2_BUILD_DIR=$CODEC2DIR/$BUILD_DIR -DLPCNET_BUILD_DIR=$LPCNETDIR/$BUILD_DIR ..
-make VERBOSE=1
+    make VERBOSE=1
+else
+    # build freedv-gui
+    $CMAKE -DCMAKE_BUILD_TYPE=Debug -DCODEC2_BUILD_DIR=$CODEC2DIR/$BUILD_DIR -DLPCNET_BUILD_DIR=$LPCNETDIR/$BUILD_DIR ..
+    make VERBOSE=1
+fi

docker/docker-compose-win.yml

@@ -7,6 +7,7 @@ services:
         - FDV_GIT_BRANCH
         - FDV_CLEAN
         - FDV_CMAKE
+        - FDV_BOOTSTRAP_WX
     build: 
       context: fdv_win_fedora
       args:

docker/fdv_win_fedora/entrypoint.sh

@@ -14,6 +14,7 @@ GIT_BRANCH=${FDV_GIT_BRANCH:-master}
 CMAKE=${FDV_CMAKE:-mingw64-cmake}
 
 CLEAN=${FDV_CLEAN:-1}
+BOOTSTRAP_WX=${FDV_BOOTSTRAP_WX:-0}
 
 echo "FDV_GIT_REPO=$GIT_REPO"
 echo "FDV_GIT_BRANCH=$GIT_BRANCH"
@@ -32,7 +33,7 @@ fi
 git checkout $GIT_BRANCH
 
 echo "--------------------- starting build_windows.sh ---------------------"
-CMAKE=$CMAKE ./build_windows.sh
+CMAKE=$CMAKE BOOTSTRAP_WX=$BOOTSTRAP_WX ./build_windows.sh
 
 if [ $CMAKE = "mingw64-cmake" ]; then
     cd build_win64

docker/freedv_build_windows.sh

@@ -12,6 +12,7 @@ function print_help {
     echo "    --build             Rebuild docker image first (run if you have modifed the docker scripts)"
     echo "    --repo GitRepo      (default https://github.com/drowe67/freedv-gui.git)"
     echo "    --branch GitBranch  (default master)"
+    echo "    --bootstrap-wx      Builds wxWidgets from source (may take significantly longer to complete)"
     echo
     exit
 }
@@ -21,6 +22,7 @@ FDV_CLEAN=1
 FDV_BUILD=""
 FDV_GIT_REPO=https://github.com/drowe67/freedv-gui.git
 FDV_GIT_BRANCH=master
+FDV_BOOTSTRAP_WX=0
 
 POSITIONAL=()
 while [[ $# -gt 0 ]]; do
@@ -48,7 +50,11 @@ case $key in
         shift
         shift
     ;;
-    -h)
+    --bootstrap-wx)
+        FDV_BOOTSTRAP_WX=1
+        shift
+    ;;
+    -h|--help)
         print_help	
     ;;
     *)
@@ -70,7 +76,7 @@ fi
 
 log=build_log.txt
 
-FDV_CLEAN=$FDV_CLEAN FDV_CMAKE=$FDV_CMAKE FDV_GIT_REPO=$FDV_GIT_REPO FDV_GIT_BRANCH=$FDV_GIT_BRANCH docker-compose -f docker-compose-win.yml up --remove-orphans $FDV_BUILD > $log
+FDV_CLEAN=$FDV_CLEAN FDV_BOOTSTRAP_WX=$FDV_BOOTSTRAP_WX FDV_CMAKE=$FDV_CMAKE FDV_GIT_REPO=$FDV_GIT_REPO FDV_GIT_BRANCH=$FDV_GIT_BRANCH docker-compose -f docker-compose-win.yml up --remove-orphans $FDV_BUILD > $log
 package_docker_path=$(cat $log | sed  -n "s/.*package: \(.*exe\) .*/\1/p")
 echo $package_docker_path
 docker cp fdv_win_fed34_c:$package_docker_path .