osx to macos

libs/openFrameworksCompiled/project/osx/config.osx.default.mk

@@ -134,7 +134,7 @@ endif
 
 #PLATFORM_CFLAGS += -arch i386
 
-# other osx
+# other macos
 PLATFORM_CFLAGS += -fpascal-strings
 
 ifdef MAC_OS_SDK_ROOT
@@ -291,7 +291,7 @@ PLATFORM_LIBRARY_SEARCH_PATHS =
 ##########################################################################################
 # PLATFORM FRAMEWORKS
 #   These are a list of platform frameworks.
-#   These are used exclusively with Darwin/OSX.
+#   These are used exclusively with Darwin/macOS.
 #
 # Note: Be sure to leave a leading space when using a += operator to add items to the list
 ##########################################################################################
@@ -320,7 +320,7 @@ endif
 ##########################################################################################
 # PLATFORM FRAMEWORK SEARCH PATHS
 #   These are a list of platform framework search paths.
-#   These are used exclusively with Darwin/OSX.
+#   These are used exclusively with Darwin/macOS.
 #
 # Note: Be sure to leave a leading space when using a += operator to add items to the list
 ##########################################################################################
@@ -364,7 +364,7 @@ afterplatform: $(TARGET_NAME)
 	@mkdir -p bin/$(BIN_NAME).app/Contents/Resources
 
 # Use the openFrameworks-Info.plist as the default. Feel free to edit it in your project folder to override and values.
-	@if [ ! -f openFrameworks-Info.plist ]; then cp $(OF_ROOT)/scripts/templates/osx/openFrameworks-Info.plist openFrameworks-Info.plist; fi
+	@if [ ! -f openFrameworks-Info.plist ]; then cp $(OF_ROOT)/scripts/templates/macos/openFrameworks-Info.plist openFrameworks-Info.plist; fi
 	@cp openFrameworks-Info.plist bin/$(BIN_NAME).app/Contents/Info.plist;
 
 # App icons

scripts/ci/osx/build.sh

@@ -3,6 +3,5 @@ set -ev
 ROOT=${TRAVIS_BUILD_DIR:-"$( cd "$(dirname "$0")/../../.." ; pwd -P )"}
 
 echo "**** Building oF + emptyExample - OSX Template Project ****"
-# xcodebuild -arch x86_64 -configuration Release -target emptyExample -project "$ROOT/scripts/templates/osx/emptyExample.xcodeproj"
-xcodebuild -configuration Release -target emptyExample -project "$ROOT/scripts/templates/osx/emptyExample.xcodeproj"
+xcodebuild -configuration Release -target emptyExample -project "$ROOT/scripts/templates/macos/emptyExample.xcodeproj"
 echo "**** Done building emptyExample ****"

scripts/ci/osx/run_tests.sh

@@ -7,16 +7,14 @@ trap 'for f in ~/Library/Logs/DiagnosticReports/*; do cat $f; done' 11
 
 echo "**** Building emptyExample ****"
 cd $ROOT
-cp scripts/templates/osx/Makefile examples/templates/emptyExample/
-cp scripts/templates/osx/config.make examples/templates/emptyExample/
 cd examples/templates/emptyExample/
+cp ../../../scripts/templates/macos/{Makefile,config.make} .
 make -j Debug
 
 echo "**** Building allAddonsExample ****"
 cd $ROOT
-cp scripts/templates/osx/Makefile examples/templates/allAddonsExample/
-cp scripts/templates/osx/config.make examples/templates/allAddonsExample/
 cd examples/templates/allAddonsExample/
+cp ../../../scripts/templates/macos/{Makefile,config.make} .
 make -j Debug
 
 echo "**** Running unit tests ****"
@@ -26,8 +24,7 @@ for group in *; do
         for test in $group/*; do
             if [ -d $test ]; then
                 cd $test
-                cp ../../../scripts/templates/osx/Makefile .
-                cp ../../../scripts/templates/osx/config.make .
+                cp ../../../scripts/templates/macos/{Makefile,config.make} .
                 make -j Debug
                 make RunDebug
 				errorcode=$?