Skip to content

Template fix for scripts - Fixes Clean #8260

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danoli3 merged 8 commits into from
Jan 20, 2025
Merged

Template fix for scripts - Fixes Clean #8260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
bb8265e
osx fixes for scripts on build / clean work
danoli3 Jan 20, 2025
8064821
Template osx fix quotes
danoli3 Jan 20, 2025
c6520f4
oF script to route update and download commands - 0.1.0 - init update…
danoli3 Jan 17, 2025
3c696fe
downloader [4.4.0 ~ 4.5.0] - fix close connection for zero urls.
danoli3 Jan 17, 2025
48d5d49
Emscripten fix download 32
danoli3 Jan 17, 2025
a7434a8
of added upgrade command.
danoli3 Jan 18, 2025
c4753d7
of script fix variables
danoli3 Jan 18, 2025
809e9cc
osx template
danoli3 Jan 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 0 additions & 21 deletions libs/openFrameworksCompiled/project/osx/openFrameworksLib.xcodeproj/project.pbxproj
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Loading