Merge pull request #294 from drowe67/ms-build-bugfix

Add check for .git folder to allow use of build scripts in official release tarballs.

USER_MANUAL.html

@@ -571,6 +571,10 @@ FMA             -       Supports FMA extensions using YMM state</code></pre>
 <h1 id="release-notes"><span class="header-section-number">16</span> Release Notes</h1>
 <h2 id="tbd-tbd"><span class="header-section-number">16.1</span> TBD TBD</h2>
 <ol type="1">
+<li>Build system:
+<ul>
+<li>Add checks for .git folder to prevent errors when building from official release tarballs. (PR #294)</li>
+</ul></li>
 <li>Enhancements:
 <ul>
 <li>Update FreeDV configuration defaults to improve first-time usability. (PR #293)</li>

USER_MANUAL.md

@@ -783,7 +783,9 @@ LDPC | Low Density Parity Check Codes - a family of powerful FEC codes
 
 ## TBD TBD
 
-1. Enhancements:
+1. Build system:
+    * Add checks for .git folder to prevent errors when building from official release tarballs. (PR #294)
+2. Enhancements:
     * Update FreeDV configuration defaults to improve first-time usability. (PR #293)
 
 ## V1.8.4 October 2022

build_linux.sh

@@ -49,7 +49,10 @@ export LD_LIBRARY_PATH=$LPCNETDIR/build_linux/src
 ./freedv_tx 2020 $LPCNETDIR/wav/wia.wav - | ./freedv_rx 2020 - /dev/null
 
 # Finally, build freedv-gui
-cd $FREEDVGUIDIR && git pull
+cd $FREEDVGUIDIR
+if [ -d .git ]; then
+     git pull
+fi
 mkdir  -p build_linux && cd build_linux && rm -Rf *
 if [[ "$FREEDV_VARIANT" == "pulseaudio" ]]; then
     PULSEAUDIO_PARAM="-DUSE_PULSEAUDIO=1"

build_osx.sh

@@ -57,7 +57,10 @@ export LD_LIBRARY_PATH=$LPCNETDIR/build_osx/src
 ./freedv_tx 2020 $LPCNETDIR/wav/wia.wav - | ./freedv_rx 2020 - /dev/null
 
 # Finally, build freedv-gui
-cd $FREEDVGUIDIR && git pull
+cd $FREEDVGUIDIR
+if [ -d .git ]; then
+    git pull
+fi
 mkdir  -p build_osx && cd build_osx && rm -Rf *
 cmake -DBUILD_OSX_UNIVERSAL=1 -DCMAKE_BUILD_TYPE=Debug  -DBOOTSTRAP_WXWIDGETS=1 -DUSE_STATIC_SPEEXDSP=1 -DHAMLIB_INCLUDE_DIR=${HAMLIBDIR}/include -DHAMLIB_LIBRARY=${HAMLIBDIR}/lib/libhamlib.a -DCODEC2_BUILD_DIR=$CODEC2DIR/build_osx -DLPCNET_BUILD_DIR=$LPCNETDIR/build_osx ..
 make VERBOSE=1

build_windows.sh

@@ -54,7 +54,10 @@ fi
 cd codec2 && git switch master && git pull && git checkout $CODEC2_BRANCH
 mkdir -p $BUILD_DIR && cd $BUILD_DIR && rm -Rf * && $CMAKE -DLPCNET_BUILD_DIR=$LPCNETDIR/$BUILD_DIR .. && make VERBOSE=1
 
-cd $FREEDVGUIDIR && git pull
+cd $FREEDVGUIDIR
+if [ -d .git ]; then
+    git pull
+fi
 mkdir -p $BUILD_DIR && cd $BUILD_DIR 
 if [ $CLEAN -eq 1 ]; then rm -Rf *; fi