Skip to content

Fix macOS folder #8284

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

Closed
danoli3 wants to merge 3 commits into from
Closed

Fix macOS folder #8284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bfa097e
Editor Config for sh
danoli3 Feb 23, 2025
ea10854
Fix Arching - SKIP_INSTALL = NO
danoli3 Feb 24, 2025
10bc951
Xcode project copy binary depth fix / app within app folder
danoli3 Feb 24, 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
2 changes: 1 addition & 1 deletion .editorconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ trim_trailing_whitespace = true
charset = utf-8

[*.sh]
indent_style = tab
indent_style = space
indent_size = 4
tab_width = 4
insert_final_newline = true
Expand Down
2 changes: 1 addition & 1 deletion libs/openFrameworksCompiled/project/ios/CoreOF.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ DEAD_CODE_STRIPPING = YES
ENABLE_BITCODE = NO
ENABLE_STRICT_OBJC_MSGSEND = YES

SKIP_INSTALL = YES
SKIP_INSTALL = NO

CC = $(OF_PATH)/scripts/osx/cc.sh
CXX = $(OF_PATH)/scripts/osx/cxx.sh
2 changes: 1 addition & 1 deletion libs/openFrameworksCompiled/project/macos/CoreOF.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ INSTALL_PATH = /Applications
//SDKROOT = macosx
//WRAPPER_EXTENSION = app

SKIP_INSTALL = YES
SKIP_INSTALL = NO

CC = $(OF_PATH)/scripts/osx/cc.sh
CXX = $(OF_PATH)/scripts/osx/cxx.sh
2 changes: 1 addition & 1 deletion libs/openFrameworksCompiled/project/osx/CoreOF.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ INSTALL_PATH = /Applications
SDKROOT = macosx
WRAPPER_EXTENSION = app

SKIP_INSTALL = YES
SKIP_INSTALL = NO

CC = $(OF_PATH)/scripts/osx/cc.sh
CXX = $(OF_PATH)/scripts/osx/cxx.sh
2 changes: 1 addition & 1 deletion libs/openFrameworksCompiled/project/tvOS/CoreOF.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ GCC_WARN_ABOUT_INVALID_OFFSETOF_MACRO = NO
GCC_WARN_ABOUT_RETURN_TYPE = YES
GLES_SILENCE_DEPRECATION = YES

CONFIGURATION_BUILD_DIR = $(SRCROOT)/bin/
SKIP_INSTALL = NO

CC = $(OF_PATH)/scripts/osx/cc.sh
CXX = $(OF_PATH)/scripts/osx/cxx.sh
17 changes: 15 additions & 2 deletions scripts/osx/xcode_project.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ copy_binary() {
msg "Copy Binary to bin/ ";
APP_NAME="${PRODUCT_NAME}.app"
APP_SOURCE="${CONFIGURATION_BUILD_DIR}/${APP_NAME}"
APP_DEST="${SRCROOT}/bin/${APP_NAME}"
APP_DEST="${SRCROOT}/bin/"
echo "------------------------------------------"
echo "🔍 Debugging copy_binary function"
echo "Configuration Build Dir: ${CONFIGURATION_BUILD_DIR}"
Expand All @@ -203,13 +203,26 @@ copy_binary() {
exit 1
fi



# Check if the .app file exists
if [ ! -d "${APP_SOURCE}" ]; then
echo "ERROR: Application bundle not found: ${APP_SOURCE}"
ls -l "${CONFIGURATION_BUILD_DIR}" # List files in the build directory for debugging
exit 1
fi
mkdir -p "${SRCROOT}/bin/"
mkdir -p "${SRCROOT}/bin/"
if [ "${ACTION}" = "archive" ]; then
echo "Skipping copy to bin/ during Archive action."
return 0
fi

if [ -L "${APP_SOURCE}" ] || file "${APP_SOURCE}" | grep -q "alias"; then
echo "WARNING: App source ${APP_SOURCE} is an alias or symlink. Skipping copy to prevent corruption."
return 0
fi


rsync -avz --delete "$APP_SOURCE" "$APP_DEST"
if [ $? -eq 0 ]; then
echo "App successfully $APP_DEST"
Expand Down