diff --git a/.editorconfig b/.editorconfig index 93f51704fe5..db2102a6ce9 100644 --- a/.editorconfig +++ b/.editorconfig @@ -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 diff --git a/libs/openFrameworksCompiled/project/ios/CoreOF.xcconfig b/libs/openFrameworksCompiled/project/ios/CoreOF.xcconfig index cdec6bf8db1..13fd81ff121 100644 --- a/libs/openFrameworksCompiled/project/ios/CoreOF.xcconfig +++ b/libs/openFrameworksCompiled/project/ios/CoreOF.xcconfig @@ -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 diff --git a/libs/openFrameworksCompiled/project/macos/CoreOF.xcconfig b/libs/openFrameworksCompiled/project/macos/CoreOF.xcconfig index 93689c00446..5d6ca786855 100644 --- a/libs/openFrameworksCompiled/project/macos/CoreOF.xcconfig +++ b/libs/openFrameworksCompiled/project/macos/CoreOF.xcconfig @@ -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 diff --git a/libs/openFrameworksCompiled/project/osx/CoreOF.xcconfig b/libs/openFrameworksCompiled/project/osx/CoreOF.xcconfig index 8ff1d788f3c..cf89c2a3038 100644 --- a/libs/openFrameworksCompiled/project/osx/CoreOF.xcconfig +++ b/libs/openFrameworksCompiled/project/osx/CoreOF.xcconfig @@ -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 diff --git a/libs/openFrameworksCompiled/project/tvOS/CoreOF.xcconfig b/libs/openFrameworksCompiled/project/tvOS/CoreOF.xcconfig index 11f02f936df..89eacc40ec7 100644 --- a/libs/openFrameworksCompiled/project/tvOS/CoreOF.xcconfig +++ b/libs/openFrameworksCompiled/project/tvOS/CoreOF.xcconfig @@ -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 diff --git a/scripts/osx/xcode_project.sh b/scripts/osx/xcode_project.sh index a4ed0d4fd96..04964aac243 100755 --- a/scripts/osx/xcode_project.sh +++ b/scripts/osx/xcode_project.sh @@ -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}" @@ -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"