Some cleanup, enable a few more builds

Signed-off-by: falkTX <falktx@falktx.com>

.github/workflows/bootstrap.yml

@@ -21,6 +21,10 @@ jobs:
             installer: apt
             os: ubuntu-20.04
             target: linux
+          - name: macos
+            installer: homebrew
+            os: macos-10.15
+            target: macos
           - name: macos-universal
             installer: homebrew
             os: macos-10.15
@@ -109,6 +113,10 @@ jobs:
             installer: apt
             os: ubuntu-20.04
             target: linux
+          - name: macos
+            installer: homebrew
+            os: macos-10.15
+            target: macos
           - name: macos-universal
             installer: homebrew
             os: macos-10.15
@@ -125,12 +133,12 @@ jobs:
     needs: common
     steps:
       - uses: actions/checkout@v2
-      #- name: Set up cache
-        #uses: actions/cache@v2
-        #with:
-          #path: |
-            #~/PawPawBuilds
-          #key: plugins-${{ matrix.target }}-v${{ env.CACHE_VERSION }}
+      - name: Set up cache
+        uses: actions/cache@v2
+        with:
+          path: |
+            ~/PawPawBuilds
+          key: plugins-${{ matrix.target }}-v${{ env.CACHE_VERSION }}
       - name: (apt) Restore debian package cache
         if: ${{ matrix.installer == 'apt' }}
         run: |
@@ -187,23 +195,27 @@ jobs:
         run: |
             cd ~/PawPawBuilds && \
             tar xf common-${{ matrix.target }}.tar.gz
-      #- name: Run bootstrap
-        #shell: bash
-        #run: |
-          #./bootstrap-plugins.sh ${{ matrix.target }} && ./.cleanup.sh ${{ matrix.target }}
-      #- name: Pack bootstrap build
-        #shell: bash
-        #run: |
-          #tar -C ~/PawPawBuilds -czf plugins-${{ matrix.target }}.tar.gz builds targets
-      #- uses: actions/upload-artifact@v2
-        #with:
-          #name: plugins-${{ matrix.target }}
-          #path: plugins-${{ matrix.target }}.tar.gz
+      - name: Run bootstrap
+        shell: bash
+        run: |
+          ./bootstrap-plugins.sh ${{ matrix.target }} && ./.cleanup.sh ${{ matrix.target }}
+      - name: Pack bootstrap build
+        shell: bash
+        run: |
+          tar -C ~/PawPawBuilds -czf plugins-${{ matrix.target }}.tar.gz builds targets
+      - uses: actions/upload-artifact@v2
+        with:
+          name: plugins-${{ matrix.target }}
+          path: plugins-${{ matrix.target }}.tar.gz
 
   jack2:
     strategy:
       matrix:
         include:
+          - name: macos
+            installer: homebrew
+            os: macos-10.15
+            target: macos
           - name: macos-universal
             installer: homebrew
             os: macos-10.15
@@ -220,12 +232,12 @@ jobs:
     needs: common
     steps:
       - uses: actions/checkout@v2
-      #- name: Set up cache
-        #uses: actions/cache@v2
-        #with:
-          #path: |
-            #~/PawPawBuilds
-          #key: jack2-${{ matrix.target }}-v${{ env.CACHE_VERSION }}
+      - name: Set up cache
+        uses: actions/cache@v2
+        with:
+          path: |
+            ~/PawPawBuilds
+          key: jack2-${{ matrix.target }}-v${{ env.CACHE_VERSION }}
       - name: (apt) Restore debian package cache
         if: ${{ matrix.installer == 'apt' }}
         run: |
@@ -282,18 +294,18 @@ jobs:
         run: |
             cd ~/PawPawBuilds && \
             tar xf common-${{ matrix.target }}.tar.gz
-      #- name: Run bootstrap
-        #shell: bash
-        #run: |
-          #./bootstrap-jack2.sh ${{ matrix.target }} && ./.cleanup.sh ${{ matrix.target }}
-      #- name: Pack bootstrap build
-        #shell: bash
-        #run: |
-          #tar -C ~/PawPawBuilds -czf jack2-${{ matrix.target }}.tar.gz builds targets
-      #- uses: actions/upload-artifact@v2
-        #with:
-          #name: jack2-${{ matrix.target }}
-          #path: jack2-${{ matrix.target }}.tar.gz
+      - name: Run bootstrap
+        shell: bash
+        run: |
+          ./bootstrap-jack2.sh ${{ matrix.target }} && ./.cleanup.sh ${{ matrix.target }}
+      - name: Pack bootstrap build
+        shell: bash
+        run: |
+          tar -C ~/PawPawBuilds -czf jack2-${{ matrix.target }}.tar.gz builds targets
+      - uses: actions/upload-artifact@v2
+        with:
+          name: jack2-${{ matrix.target }}
+          path: jack2-${{ matrix.target }}.tar.gz
 
   qt:
     strategy:

bootstrap-jack2.sh

@@ -37,22 +37,22 @@ source setup/versions.sh
 # aften (macos only)
 
 if [ "${MACOS}" -eq 1 ]; then
-    download aften "${AFTEN_VERSION}" "http://downloads.sourceforge.net/aften" "tar.bz2"
+    download aften "${AFTEN_VERSION}" "${AFTEN_URL}" "tar.bz2"
     if [ ! -f "${PAWPAW_BUILDDIR}/aften-${AFTEN_VERSION}/.stamp_installed" ]; then
         rm -f "${PAWPAW_BUILDDIR}/aften-${AFTEN_VERSION}/.stamp_installed_libs"
     fi
     build_cmake aften "${AFTEN_VERSION}" "-DHAVE_MMX=ON -DHAVE_SSE=ON -DHAVE_SSE2=ON"
     if [ ! -f "${PAWPAW_BUILDDIR}/aften-${AFTEN_VERSION}/.stamp_installed_libs" ]; then
-    	cp -v "${PAWPAW_BUILDDIR}/aften-${AFTEN_VERSION}/build/libaften_pcm.a" "${PAWPAW_PREFIX}/lib/libaften_pcm.a"
-    	cp -v "${PAWPAW_BUILDDIR}/aften-${AFTEN_VERSION}/build/libaften_static.a" "${PAWPAW_PREFIX}/lib/libaften.a"
-    	touch "${PAWPAW_BUILDDIR}/aften-${AFTEN_VERSION}/.stamp_installed_libs"
+        cp -v "${PAWPAW_BUILDDIR}/aften-${AFTEN_VERSION}/build/libaften_pcm.a" "${PAWPAW_PREFIX}/lib/libaften_pcm.a"
+        cp -v "${PAWPAW_BUILDDIR}/aften-${AFTEN_VERSION}/build/libaften_static.a" "${PAWPAW_PREFIX}/lib/libaften.a"
+        touch "${PAWPAW_BUILDDIR}/aften-${AFTEN_VERSION}/.stamp_installed_libs"
     fi
 fi
 
 # ---------------------------------------------------------------------------------------------------------------------
 # db
 
-download db "${DB_VERSION}" "https://download.oracle.com/berkeley-db"
+download db "${DB_VERSION}" "${DB_URL}"
 
 # based on build_autoconf
 function build_custom_db() {
@@ -104,7 +104,7 @@ build_custom_db db "${DB_VERSION}" "--disable-java --disable-replication --disab
 # rtaudio (download, win32 only)
 
 if [ "${WIN32}" -eq 1 ]; then
-    download rtaudio "${RTAUDIO_VERSION}" "https://github.com/falkTX/rtaudio.git" "" "git"
+    download rtaudio "${RTAUDIO_VERSION}" "${RTAUDIO_URL}" "" "git"
     # fixes for portaudio
     ASIO_DIR="${PAWPAW_BUILDDIR}/rtaudio-${RTAUDIO_VERSION}/include"
     if [ -d "${ASIO_DIR}" ]; then
@@ -121,7 +121,7 @@ if [ "${WIN32}" -eq 1 ]; then
     export EXTRA_CFLAGS="-I${ASIO_DIR}"
     export EXTRA_CXXFLAGS="-I${ASIO_DIR}"
     export EXTRA_MAKE_ARGS="-j 1"
-    download portaudio19 "${PORTAUDIO_VERSION}" "http://deb.debian.org/debian/pool/main/p/portaudio19" "orig.tar.gz"
+    download portaudio19 "${PORTAUDIO_VERSION}" "${PORTAUDIO_URL}" "orig.tar.gz"
     remove_file portaudio19 "${PORTAUDIO_VERSION}" "src/hostapi/wasapi/mingw-include/audioclient.h"
     remove_file portaudio19 "${PORTAUDIO_VERSION}" "src/hostapi/wasapi/mingw-include/devicetopology.h"
     remove_file portaudio19 "${PORTAUDIO_VERSION}" "src/hostapi/wasapi/mingw-include/endpointvolume.h"
@@ -143,7 +143,7 @@ fi
 # tre (win32 only)
 
 if [ "${WIN32}" -eq 1 ]; then
-    download tre "${TRE_VERSION}" "https://github.com/laurikari/tre.git" "" "git"
+    download tre "${TRE_VERSION}" "${TRE_URL}" "" "git"
     build_autoconfgen tre "${TRE_VERSION}" "--disable-nls"
 fi
 

setup/versions.sh

@@ -144,10 +144,19 @@ fi
 # ---------------------------------------------------------------------------------------------------------------------
 # bootstrap jack
 
+AFTEN_URL=http://downloads.sourceforge.net/aften
 AFTEN_VERSION=0.0.8
+
+DB_URL=https://download.oracle.com/berkeley-db
 DB_VERSION=5.3.28
+
+PORTAUDIO_URL=http://deb.debian.org/debian/pool/main/p/portaudio19
 PORTAUDIO_VERSION=19.6.0
+
+RTAUDIO_URL=https://github.com/falkTX/rtaudio.git
 RTAUDIO_VERSION=e03448bd15c1c34e842459939d755f5f89e880ed
+
+TRE_URL=https://github.com/laurikari/tre.git
 TRE_VERSION=6092368aabdd0dbb0fbceb2766a37b98e0ff6911
 
 # ---------------------------------------------------------------------------------------------------------------------