docker emscripten script cleanup

openframeworks · Feb 5, 2025 · 4c2a5f7 · 4c2a5f7
1 parent 5730364
commit 4c2a5f7
Show file tree

Hide file tree

Showing 5 changed files with 74 additions and 161 deletions.
diff --git a/.github/workflows/build-msys2.yml b/.github/workflows/build-msys2.yml
@@ -69,7 +69,6 @@ jobs:
             gperf:p
             libxml2:p
             python3:p
-            wget2:p
             libpng:p
             zlib:p
       - name: Determine Release

diff --git a/scripts/artifact/artifact-clean.sh b/scripts/artifact/artifact-clean.sh
@@ -25,58 +25,31 @@ trapError() {
     exit 1
 }
 
-if [ "$TRAVIS" = true -o "$GITHUB_ACTIONS" = true ] && [ "$TARGET" == "emscripten" ]; then
-    run() {
-        echo "TARGET=\"emscripten\" $@"
-        docker exec -i emscripten sh -c "TARGET=\"emscripten\" $@"
-    }
-
-    run_bg() {
-        trap "trapError" ERR
-
-        #PATH=\"$DOCKER_HOME/bin:\$PATH\"
-        echo "TARGET=\"emscripten\" $@"
-        docker exec -i emscripten sh -c "TARGET=\"emscripten\" $@" >>"formula_${ARCH}.log" 2>&1 &
-        apothecaryPID=$!
-        echoDots $apothecaryPID
-        wait $apothecaryPID
-
-        echo "Tail of log for $formula_name"
-        run "tail -n 100 formula_${ARCH}.log"
-    }
-
-    # DOCKER_HOME=$(docker exec -i emscripten echo '$HOME')
-    # CCACHE_DOCKER=$(docker exec -i emscripten ccache -p | grep "cache_dir =" | sed "s/(default) cache_dir = \(.*\)/\1/")
-    ROOT=$(docker exec -i emscripten pwd)
-    LOCAL_ROOT=$(
-        cd $(dirname "$0")
-        pwd -P
-    )/../..
-else
-    run() {
-        echo "$@"
-        eval "$@"
-    }
-
-    run_bg() {
-        trap "trapError" ERR
-
-        echo "$@"
-        eval "$@" >>"formula_${ARCH}.log" 2>&1 &
-        apothecaryPID=$!
-        echoDots $apothecaryPID
-        wait $apothecaryPID
-
-        echo "Tail of log for $formula_name"
-        run "tail -n 10 formula_${ARCH}.log"
-    }
-
-    ROOT=$(
-        cd $(dirname "$0")
-        pwd -P
-    )/../..
-    LOCAL_ROOT=$ROOT
-fi
+
+run() {
+    echo "$@"
+    eval "$@"
+}
+
+run_bg() {
+    trap "trapError" ERR
+
+    echo "$@"
+    eval "$@" >>"formula_${ARCH}.log" 2>&1 &
+    apothecaryPID=$!
+    echoDots $apothecaryPID
+    wait $apothecaryPID
+
+    echo "Tail of log for $formula_name"
+    run "tail -n 10 formula_${ARCH}.log"
+}
+
+ROOT=$(
+    cd $(dirname "$0")
+    pwd -P
+)/../..
+LOCAL_ROOT=$ROOT
+
 
 APOTHECARY_PATH=$ROOT/apothecary
 

diff --git a/scripts/build.sh b/scripts/build.sh
@@ -45,58 +45,30 @@ trapError() {
     exit 1
 }
 
-if [ "$TRAVIS" = true -o "$GITHUB_ACTIONS" = true ] && [ "$TARGET" == "emscripten" ]; then
-    run() {
-        echo "TARGET=\"emscripten\" $@"
-        docker exec -i emscripten sh -c "TARGET=\"emscripten\" $@"
-    }
-
-    run_bg() {
-        trap "trapError" ERR
-
-        #PATH=\"$DOCKER_HOME/bin:\$PATH\"
-        echo "TARGET=\"emscripten\" $@"
-        docker exec -i emscripten sh -c "TARGET=\"emscripten\" $@" >>"formula_${ARCH}.log" 2>&1 &
-        apothecaryPID=$!
-        echoDots $apothecaryPID
-        wait $apothecaryPID
-
-        echo "Tail of log for $formula_name"
-        run "tail -n 100 formula_${ARCH}.log"
-    }
-
-    # DOCKER_HOME=$(docker exec -i emscripten echo '$HOME')
-    # CCACHE_DOCKER=$(docker exec -i emscripten ccache -p | grep "cache_dir =" | sed "s/(default) cache_dir = \(.*\)/\1/")
-    ROOT=$(docker exec -i emscripten pwd)
-    LOCAL_ROOT=$(
-        cd $(dirname "$0")
-        pwd -P
-    )/..
-else
-    run() {
-        echo "$@"
-        eval "$@"
-    }
-
-    run_bg() {
-        trap "trapError" ERR
-
-        echo "$@"
-        eval "$@" >>"formula_${ARCH}.log" 2>&1 &
-        apothecaryPID=$!
-        echoDots $apothecaryPID
-        wait $apothecaryPID
-
-        echo "Tail of log for $formula_name"
-        run "tail -n 10 formula_${ARCH}.log"
-    }
-
-    ROOT=$(
-        cd $(dirname "$0")
-        pwd -P
-    )/..
-    LOCAL_ROOT=$ROOT
-fi
+run() {
+    echo "$@"
+    eval "$@"
+}
+
+run_bg() {
+    trap "trapError" ERR
+
+    echo "$@"
+    eval "$@" >>"formula_${ARCH}.log" 2>&1 &
+    apothecaryPID=$!
+    echoDots $apothecaryPID
+    wait $apothecaryPID
+
+    echo "Tail of log for $formula_name"
+    run "tail -n 10 formula_${ARCH}.log"
+}
+
+ROOT=$(
+    cd $(dirname "$0")
+    pwd -P
+)/..
+LOCAL_ROOT=$ROOT
+
 
 APOTHECARY_PATH=$ROOT/apothecary
 

diff --git a/scripts/macos/xcframework-split.sh b/scripts/macos/xcframework-split.sh
@@ -25,58 +25,31 @@ trapError() {
     exit 1
 }
 
-if [ "$TRAVIS" = true -o "$GITHUB_ACTIONS" = true ] && [ "$TARGET" == "emscripten" ]; then
-    run() {
-        echo "TARGET=\"emscripten\" $@"
-        docker exec -i emscripten sh -c "TARGET=\"emscripten\" $@"
-    }
-
-    run_bg() {
-        trap "trapError" ERR
-
-        #PATH=\"$DOCKER_HOME/bin:\$PATH\"
-        echo "TARGET=\"emscripten\" $@"
-        docker exec -i emscripten sh -c "TARGET=\"emscripten\" $@" >>"formula_${ARCH}.log" 2>&1 &
-        apothecaryPID=$!
-        echoDots $apothecaryPID
-        wait $apothecaryPID
-
-        echo "Tail of log for $formula_name"
-        run "tail -n 100 formula_${ARCH}.log"
-    }
-
-    # DOCKER_HOME=$(docker exec -i emscripten echo '$HOME')
-    # CCACHE_DOCKER=$(docker exec -i emscripten ccache -p | grep "cache_dir =" | sed "s/(default) cache_dir = \(.*\)/\1/")
-    ROOT=$(docker exec -i emscripten pwd)
-    LOCAL_ROOT=$(
-        cd $(dirname "$0")
-        pwd -P
-    )/../..
-else
-    run() {
-        echo "$@"
-        eval "$@"
-    }
-
-    run_bg() {
-        trap "trapError" ERR
-
-        echo "$@"
-        eval "$@" >>"formula_${ARCH}.log" 2>&1 &
-        apothecaryPID=$!
-        echoDots $apothecaryPID
-        wait $apothecaryPID
-
-        echo "Tail of log for $formula_name"
-        run "tail -n 10 formula_${ARCH}.log"
-    }
-
-    ROOT=$(
-        cd $(dirname "$0")
-        pwd -P
-    )/../..
-    LOCAL_ROOT=$ROOT
-fi
+
+run() {
+    echo "$@"
+    eval "$@"
+}
+
+run_bg() {
+    trap "trapError" ERR
+
+    echo "$@"
+    eval "$@" >>"formula_${ARCH}.log" 2>&1 &
+    apothecaryPID=$!
+    echoDots $apothecaryPID
+    wait $apothecaryPID
+
+    echo "Tail of log for $formula_name"
+    run "tail -n 10 formula_${ARCH}.log"
+}
+
+ROOT=$(
+    cd $(dirname "$0")
+    pwd -P
+)/../..
+LOCAL_ROOT=$ROOT
+
 
 APOTHECARY_PATH=$ROOT/apothecary
 

diff --git a/scripts/package_libraries.sh b/scripts/package_libraries.sh
@@ -94,10 +94,6 @@ if [ -z "$LIBRARIES" ]; then
     echo "No libraries found to package."
     exit 0
 fi
-if [ "$TRAVIS" = true -o "$GITHUB_ACTIONS" = true ] && [ "$TARGET" == "emscripten" ]; then
-    LIBSX=$(docker exec -i emscripten sh -c "cd $OUTPUT_FOLDER; ls")
-    LIBS=${LIBSX//[$'\t\r\n']/ }
-fi
 
 # Process each library
 echo "Libraries found: [$LIBS]"