Skip to content

Commit

Permalink
Template fix for scripts - Fixes Clean (#8260)
Browse files Browse the repository at this point in the history
* osx fixes for scripts on build / clean work

* Template osx fix quotes

* oF script to route update and download commands - 0.1.0 - init update / download

(cherry picked from commit c59fac7)

* downloader [4.4.0 ~ 4.5.0] - fix close connection for zero urls.
shfmt formatted bash

(cherry picked from commit 8488c46)

* Emscripten fix download 32

* of added upgrade command.
scripts/dev/upgrade.sh added upgrade dev commands to find and replace strings from old versions automatically with sed.

(cherry picked from commit 15fc367)

* of script fix variables

(cherry picked from commit 7ee0b59)

* osx template
  • Loading branch information
danoli3 authored Jan 20, 2025
1 parent 25eb8ff commit 87b2868
Show file tree
Hide file tree
Showing 7 changed files with 409 additions and 235 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -809,7 +809,6 @@
isa = PBXNativeTarget;
buildConfigurationList = E4B27C3210CBEBB200536013 /* Build configuration list for PBXNativeTarget "openFrameworks" */;
buildPhases = (
BFEF3FA72C50AEC7009B3CD8 /* Run Script */,
E4B27C1110CBEB8E00536013 /* Headers */,
E4B27C1210CBEB8E00536013 /* Sources */,
E4B27C1310CBEB8E00536013 /* Frameworks */,
Expand Down Expand Up @@ -854,26 +853,6 @@
/* End PBXProject section */

/* Begin PBXShellScriptBuildPhase section */
BFEF3FA72C50AEC7009B3CD8 /* Run Script */ = {
isa = PBXShellScriptBuildPhase;
alwaysOutOfDate = 1;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
);
name = "Run Script";
outputFileListPaths = (
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = "/usr/bin/env bash";
shellScript = "#!/usr/bin/env bash\nif [ ! -d \"${SRCROOT}/../../../freetype/lib/macos/freetype.xcframework\" ]; then\n\techo \"openFrameworks has missing xcFrameworks for osx. Downloading libaries now via scripts/osx/download_libs.sh\"\n ${SRCROOT}/../../../../scripts/osx/download_libs.sh\nelse\n\techo \"xcFrameworks found\"\nfi\n";
showEnvVarsInLog = 0;
};
BFF80A5D2C50B2C300784E74 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
alwaysOutOfDate = 1;
Expand Down
8 changes: 8 additions & 0 deletions of
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# pipe commands to core oF script
_OF_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
_OF_DIR="$(realpath "$_OF_DIR")"
_OF_SCRIPT="$(realpath "$_OF_DIR/scripts/of.sh")"
echo "$(date): [openFrameworks: $@]"
source "$_OF_SCRIPT" $@
EXIT_CODE=$?
exit ${EXIT_CODE}
6 changes: 3 additions & 3 deletions scripts/dev/download_libs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -233,8 +233,8 @@ echo " openFrameworks download_libs.sh v$DL_VERSION args=$@"

if [ "$PLATFORM" == "emscripten" ]; then
if [[ $BLEEDING_EDGE = 1 ]] ; then
if [[ $ARCH = "64" ]] ; then
ARCH="_memory64"
if [[ $ARCH = "" ]] ; then
ARCH="32"
fi
fi
fi
Expand Down Expand Up @@ -303,7 +303,7 @@ elif [ "$ARCH" == "" ] && [ "$PLATFORM" == "android" ]; then
fi
elif [ "$PLATFORM" == "emscripten" ]; then
if [[ $BLEEDING_EDGE = 1 ]] ; then
PKGS="openFrameworksLibs_${VER}_${PLATFORM}${ARCH}.tar.bz2"
PKGS="openFrameworksLibs_${VER}_${PLATFORM}_${ARCH}.tar.bz2"
else
PKGS="openFrameworksLibs_${VER}_${PLATFORM}${ARCH}.tar.bz2"
fi
Expand Down
Loading

0 comments on commit 87b2868

Please sign in to comment.