From 3920ec8dfe6306b13846eab7af20559595730ad5 Mon Sep 17 00:00:00 2001 From: David Date: Mon, 18 Nov 2019 18:20:34 +1030 Subject: [PATCH 1/2] removing assert that is firing on Windows machines --- src/fdmdv2_main.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/fdmdv2_main.cpp b/src/fdmdv2_main.cpp index f6e0360cd..e1acffe10 100644 --- a/src/fdmdv2_main.cpp +++ b/src/fdmdv2_main.cpp @@ -4094,8 +4094,6 @@ void txRxProcessing() fprintf(stderr, " nout: %d\n", nout); } ret = codec2_fifo_write(cbData->outfifo1, outsound_card, nout); - // should never fire as we check there is enough room before entering while loop - assert(ret != -1); } } From 7dd8b61909f70a4b094a7a07a5cfb960644e1a76 Mon Sep 17 00:00:00 2001 From: David Date: Mon, 18 Nov 2019 21:20:39 +1030 Subject: [PATCH 2/2] access freedv-gui branches, and updated README --- docker/README_docker.md | 14 ++++++++++---- docker/fdv_win_fedora/entrypoint.sh | 9 ++++++--- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/docker/README_docker.md b/docker/README_docker.md index e9adec473..2f0c79ac6 100644 --- a/docker/README_docker.md +++ b/docker/README_docker.md @@ -19,17 +19,23 @@ Building is only required once ``` docker-compose -f docker-compose-win.yml build ``` + ## Running the image(s) ``` docker-compose -f docker-compose-win.yml up ``` -You can optionally control via the environment variables GIT_REPO and GIT_REF which branch/commit from which repo is being built. The if these are not defined default is the `master` branch of (https://github.com/drowe67/freedv-gui.git) and does not have to be specified explicitly. +You can optionally control via the environment variables FDV_GIT_REPO, FDV_GIT_BRANCH, FDV_CMAKE, FDV_CLEAN, for example: +Build from freedv-gui branch =my-super-branch: ```bash -export GIT_REF=my-super-branch -export GIT_REPO=http://github.com/dummy/freedv-gui.git -docker-compose -f docker-compose-win.yml up +FDV_GIT_BRANCH=my-super-branch docker-compose -f docker-compose-win.yml up + +``` + +Build a 32 bit image (default is 64 bit): +```bash +FDV_CMAKE=mingw32-cmake docker-compose -f docker-compose-win.yml up ``` ## Accessing created output diff --git a/docker/fdv_win_fedora/entrypoint.sh b/docker/fdv_win_fedora/entrypoint.sh index 0dfd8dc40..31c14a59f 100755 --- a/docker/fdv_win_fedora/entrypoint.sh +++ b/docker/fdv_win_fedora/entrypoint.sh @@ -7,7 +7,7 @@ cd $BUILDROOT # variables that can be passed in to Docker process ------------------ # note this is just the freedv-gui repo, codec2 and LPCNet repos are hard coded in build_windows.sh -GIT_REPO=${FDV_GIT_REPO:-http://github.com/drowe67/freedv-gui.git} +GIT_REPO=${FDV_GIT_REPO:-https://github.com/drowe67/freedv-gui.git} GIT_BRANCH=${FDV_GIT_BRANCH:-master} # override with "mingw32-cmake" for a 32 bit build @@ -20,8 +20,11 @@ echo "FDV_CMAKE=$CMAKE" # OK lets get started ----------------------------------------------- -if [ ! -d freedv-gui ] ; then git clone --depth=1 $GIT_REPO ; fi -cd freedv-gui && git pull && git checkout $GIT_BRANCH +if [ ! -d freedv-gui ] ; then git clone $GIT_REPO ; fi +cd freedv-gui +git pull -v +git branch +git checkout $GIT_BRANCH echo "--------------------- starting build_windows.sh ---------------------" GIT_REPO=$GIT_REPO GIT_REF=$GIT_REF CMAKE=$CMAKE ./build_windows.sh if [ $CMAKE = "mingw64-cmake" ]; then