Skip to content

Commit 87b2868

Browse files
authored
Template fix for scripts - Fixes Clean (#8260)
* 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
1 parent 25eb8ff commit 87b2868

File tree

7 files changed

+409
-235
lines changed

7 files changed

+409
-235
lines changed

libs/openFrameworksCompiled/project/osx/openFrameworksLib.xcodeproj/project.pbxproj

-21
Original file line numberDiff line numberDiff line change
@@ -809,7 +809,6 @@
809809
isa = PBXNativeTarget;
810810
buildConfigurationList = E4B27C3210CBEBB200536013 /* Build configuration list for PBXNativeTarget "openFrameworks" */;
811811
buildPhases = (
812-
BFEF3FA72C50AEC7009B3CD8 /* Run Script */,
813812
E4B27C1110CBEB8E00536013 /* Headers */,
814813
E4B27C1210CBEB8E00536013 /* Sources */,
815814
E4B27C1310CBEB8E00536013 /* Frameworks */,
@@ -854,26 +853,6 @@
854853
/* End PBXProject section */
855854

856855
/* Begin PBXShellScriptBuildPhase section */
857-
BFEF3FA72C50AEC7009B3CD8 /* Run Script */ = {
858-
isa = PBXShellScriptBuildPhase;
859-
alwaysOutOfDate = 1;
860-
buildActionMask = 2147483647;
861-
files = (
862-
);
863-
inputFileListPaths = (
864-
);
865-
inputPaths = (
866-
);
867-
name = "Run Script";
868-
outputFileListPaths = (
869-
);
870-
outputPaths = (
871-
);
872-
runOnlyForDeploymentPostprocessing = 0;
873-
shellPath = "/usr/bin/env bash";
874-
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";
875-
showEnvVarsInLog = 0;
876-
};
877856
BFF80A5D2C50B2C300784E74 /* ShellScript */ = {
878857
isa = PBXShellScriptBuildPhase;
879858
alwaysOutOfDate = 1;

of

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# pipe commands to core oF script
2+
_OF_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
3+
_OF_DIR="$(realpath "$_OF_DIR")"
4+
_OF_SCRIPT="$(realpath "$_OF_DIR/scripts/of.sh")"
5+
echo "$(date): [openFrameworks: $@]"
6+
source "$_OF_SCRIPT" $@
7+
EXIT_CODE=$?
8+
exit ${EXIT_CODE}

scripts/dev/download_libs.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -233,8 +233,8 @@ echo " openFrameworks download_libs.sh v$DL_VERSION args=$@"
233233

234234
if [ "$PLATFORM" == "emscripten" ]; then
235235
if [[ $BLEEDING_EDGE = 1 ]] ; then
236-
if [[ $ARCH = "64" ]] ; then
237-
ARCH="_memory64"
236+
if [[ $ARCH = "" ]] ; then
237+
ARCH="32"
238238
fi
239239
fi
240240
fi
@@ -303,7 +303,7 @@ elif [ "$ARCH" == "" ] && [ "$PLATFORM" == "android" ]; then
303303
fi
304304
elif [ "$PLATFORM" == "emscripten" ]; then
305305
if [[ $BLEEDING_EDGE = 1 ]] ; then
306-
PKGS="openFrameworksLibs_${VER}_${PLATFORM}${ARCH}.tar.bz2"
306+
PKGS="openFrameworksLibs_${VER}_${PLATFORM}_${ARCH}.tar.bz2"
307307
else
308308
PKGS="openFrameworksLibs_${VER}_${PLATFORM}${ARCH}.tar.bz2"
309309
fi

0 commit comments

Comments
 (0)