macOS: rename blender.app to Blender.app

Using a capitalized app name fits the platform guidelines. Since macOS file
systems are case insensitive by default this should not break scripts that
assume lowercase.

14 files changed, 27 insertions, 36 deletions

diff --git a/GNUmakefile b/GNUmakefile
index c2cd0a623ce..1c8602480f3 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -228,7 +228,7 @@ endif
 # Allow passing in own BLENDER_BIN so developers who don't
 # use the default build path can still use utility helpers.
 ifeq ($(OS), Darwin)
-	BLENDER_BIN?="$(BUILD_DIR)/bin/blender.app/Contents/MacOS/blender"
+	BLENDER_BIN?="$(BUILD_DIR)/bin/Blender.app/Contents/MacOS/Blender"
 else
 	BLENDER_BIN?="$(BUILD_DIR)/bin/blender"
 endif
diff --git a/release/darwin/blender.app/Contents/Info.plist b/release/darwin/Blender.app/Contents/Info.plist
index 9b09ef0f768..9b09ef0f768 100644
--- a/release/darwin/blender.app/Contents/Info.plist
+++ b/release/darwin/Blender.app/Contents/Info.plist
diff --git a/release/darwin/blender.app/Contents/MacOS/blender b/release/darwin/Blender.app/Contents/MacOS/blender
index 48cdce85287..48cdce85287 100644
--- a/release/darwin/blender.app/Contents/MacOS/blender
+++ b/release/darwin/Blender.app/Contents/MacOS/blender
diff --git a/release/darwin/blender.app/Contents/PkgInfo b/release/darwin/Blender.app/Contents/PkgInfo
index bd04210fb49..bd04210fb49 100644
--- a/release/darwin/blender.app/Contents/PkgInfo
+++ b/release/darwin/Blender.app/Contents/PkgInfo
diff --git a/release/darwin/blender.app/Contents/Resources/blender file icon.icns b/release/darwin/Blender.app/Contents/Resources/blender file icon.icns
index 2bf78d3eb0d..2bf78d3eb0d 100644
--- a/release/darwin/blender.app/Contents/Resources/blender file icon.icns
+++ b/release/darwin/Blender.app/Contents/Resources/blender file icon.icns
diff --git a/release/darwin/blender.app/Contents/Resources/blender icon.icns b/release/darwin/Blender.app/Contents/Resources/blender icon.icns
index d0c373fca97..d0c373fca97 100644
--- a/release/darwin/blender.app/Contents/Resources/blender icon.icns
+++ b/release/darwin/Blender.app/Contents/Resources/blender icon.icns
diff --git a/release/darwin/README.txt b/release/darwin/README.txt
index cb4c321f674..a1fce3caaf8 100644
--- a/release/darwin/README.txt
+++ b/release/darwin/README.txt
@@ -17,7 +17,7 @@ $ ./bundle.sh --source <sourcedir> --dmg <dmg> --bundle-id <bundleid> --username
 
 where:
 
-<sourcedir> directory where built blender.app is
+<sourcedir> directory where built Blender.app is
 <dmg>	    location and name of the final disk image
 <bundleid>  id on notarization, you choose (for example org.blender.release)
 <username>  your appleid
diff --git a/release/darwin/README_codesigning.txt b/release/darwin/README_codesigning.txt
index 3724ad1b0ac..34de5dc74a7 100644
--- a/release/darwin/README_codesigning.txt
+++ b/release/darwin/README_codesigning.txt
@@ -4,7 +4,7 @@ Updated as by august 01.2014 - removed deprecated rules and not recommended deep
 1. You need to obtain the certificates for blender foundation, they can bw pulled at Apple developer account for BF
 2. Run the following commands from terminal:
 
-codesign -s <IDENTITY> <path_to_blender.app>
+codesign -s <IDENTITY> <path_to_Blender.app>
 
 codesign -s <IDENTITY> <path_to_blenderplayer.app>
 
@@ -12,12 +12,12 @@ codesign -s <IDENTITY> <path_to_blenderplayer.app>
 3. Checking:
 
 codesign -vv <path_to_blenderplayer.app>
-codesign -vv <path_to_blender.app>
+codesign -vv <path_to_Blender.app>
 
 The result should be something like:
 
-<build_path>/blender.app: valid on disk
-<build_path>/blender.app: satisfies its Designated Requirement
+<build_path>/Blender.app: valid on disk
+<build_path>/Blender.app: satisfies its Designated Requirement
 
 <build_path>/blenderplayer.app: valid on disk
 <build_path>/blenderplayer.app: satisfies its Designated Requirement
diff --git a/release/darwin/bundle.sh b/release/darwin/bundle.sh
index b61238dc620..85084e07ee2 100755
--- a/release/darwin/bundle.sh
+++ b/release/darwin/bundle.sh
@@ -69,8 +69,8 @@ while [[ $# -gt 0 ]]; do
     esac
 done
 
-if [ ! -d "${SRC_DIR}/blender.app" ]; then
-    echo "use --source parameter to set source directory where blender.app can be found"
+if [ ! -d "${SRC_DIR}/Blender.app" ]; then
+    echo "use --source parameter to set source directory where Blender.app can be found"
     exit 1
 fi
 
@@ -91,8 +91,8 @@ fi
 
 # let's go.
 
-echo -n "Copying blender.app..."
-cp -r "${SRC_DIR}/blender.app" "${_tmpdir}/" || exit 1
+echo -n "Copying Blender.app..."
+cp -r "${SRC_DIR}/Blender.app" "${_tmpdir}/" || exit 1
 echo
 
 # Create the disk image
@@ -130,10 +130,10 @@ if [ ! -z "${C_CERT}" ]; then
     # codesigning seems to be thingie. all libs and binaries need to be
     # signed separately. todo: use some find magic to find those
     echo -n "Codesigning..."
-    codesign --timestamp --options runtime --sign "${C_CERT}" "${MOUNT_DIR}/blender.app/Contents/Resources/2.80/python/bin/python3.7m"
-    codesign --timestamp --options runtime --sign "${C_CERT}" "${MOUNT_DIR}/blender.app/Contents/Resources/2.80/python/lib/python3.7/site-packages/libextern_draco.dylib"
-    codesign --timestamp --options runtime --sign "${C_CERT}" "${MOUNT_DIR}/blender.app/Contents/Resources/lib/libomp.dylib"
-    codesign --timestamp --options runtime --sign "${C_CERT}" "${MOUNT_DIR}/blender.app"
+    codesign --timestamp --options runtime --sign "${C_CERT}" "${MOUNT_DIR}/Blender.app/Contents/Resources/2.80/python/bin/python3.7m"
+    codesign --timestamp --options runtime --sign "${C_CERT}" "${MOUNT_DIR}/Blender.app/Contents/Resources/2.80/python/lib/python3.7/site-packages/libextern_draco.dylib"
+    codesign --timestamp --options runtime --sign "${C_CERT}" "${MOUNT_DIR}/Blender.app/Contents/Resources/lib/libomp.dylib"
+    codesign --timestamp --options runtime --sign "${C_CERT}" "${MOUNT_DIR}/Blender.app"
     echo
 else
     echo "No codesigning cert given, skipping..."
diff --git a/release/datafiles/blender_icons_geom_update.py b/release/datafiles/blender_icons_geom_update.py
index 52db26d72dc..5e4b0383b9a 100755
--- a/release/datafiles/blender_icons_geom_update.py
+++ b/release/datafiles/blender_icons_geom_update.py
@@ -42,7 +42,7 @@ if not os.path.exists(blender_bin):
 
 if not os.path.exists(blender_bin):
     if sys.platform == 'darwin':
-        blender_app_path = '/Applications/blender.app/Contents/MacOS/blender'
+        blender_app_path = '/Applications/Blender.app/Contents/MacOS/Blender'
         if os.path.exists(blender_app_path):
             blender_bin = blender_app_path
 
diff --git a/release/datafiles/blender_icons_update.py b/release/datafiles/blender_icons_update.py
index 0c35693baae..c3b1e36f7fd 100755
--- a/release/datafiles/blender_icons_update.py
+++ b/release/datafiles/blender_icons_update.py
@@ -18,7 +18,7 @@ if sys.platform == 'darwin':
     inkscape_app_path = '/Applications/Inkscape.app/Contents/Resources/script'
     if os.path.exists(inkscape_app_path):
         inkscape_bin = inkscape_app_path
-    blender_app_path = '/Applications/blender.app/Contents/MacOS/blender'
+    blender_app_path = '/Applications/Blender.app/Contents/MacOS/Blender'
     if os.path.exists(blender_app_path):
         blender_bin = blender_app_path
 
diff --git a/release/text/readme.html b/release/text/readme.html
index d7038d4765c..ccffe35b29f 100644
--- a/release/text/readme.html
+++ b/release/text/readme.html
@@ -67,7 +67,7 @@ To launch Blender, double-click on Blender.exe.
 <b>Linux: </b>Unpack the archive, then run the Blender executable.
 </p>
 <p class="p4">
-<b>macOS: </b>The downloaded package includes blender.app.
+<b>macOS: </b>The downloaded package includes Blender.app.
 Optionally copy this to your Applications folder, and add it to the dock by dragging it from there to the dock.
 </p>
 <p class="p2"><br></p>
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 41412af9aea..abb3dd22673 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -340,7 +340,7 @@ elseif(APPLE)
   if(WITH_PYTHON_MODULE)
     set(TARGETDIR_VER ${BLENDER_VERSION})
   else()
-    set(TARGETDIR_VER blender.app/Contents/Resources/${BLENDER_VERSION})
+    set(TARGETDIR_VER Blender.app/Contents/Resources/${BLENDER_VERSION})
   endif()
   # Skip relinking on cpack / install
   set_target_properties(blender PROPERTIES BUILD_WITH_INSTALL_RPATH true)
@@ -868,6 +868,8 @@ elseif(WIN32)
     )
   endif()
 elseif(APPLE)
+  # Uppercase name for app bundle
+  set_target_properties(blender PROPERTIES OUTPUT_NAME Blender)
 
   # handy install macro to exclude files, we use \$ escape for the "to"
   # argument when calling so ${BUILD_TYPE} does not get expanded
@@ -895,7 +897,7 @@ elseif(APPLE)
     )
   endmacro()
 
-  set(OSX_APP_SOURCEDIR ${CMAKE_SOURCE_DIR}/release/darwin/blender.app)
+  set(OSX_APP_SOURCEDIR ${CMAKE_SOURCE_DIR}/release/darwin/Blender.app)
 
   # setup Info.plist
   execute_process(COMMAND date "+%Y-%m-%d"
@@ -914,7 +916,7 @@ elseif(APPLE)
 
   # Give the bundle actual creation/modification date
   execute_process(COMMAND SetFile -d ${SETFILE_DATE} -m ${SETFILE_DATE}
-                  ${EXECUTABLE_OUTPUT_PATH}/blender.app)
+                  ${EXECUTABLE_OUTPUT_PATH}/Blender.app)
 
   install(
     TARGETS blender
@@ -926,25 +928,25 @@ elseif(APPLE)
 
   install(
     FILES ${OSX_APP_SOURCEDIR}/Contents/PkgInfo
-    DESTINATION blender.app/Contents
+    DESTINATION Blender.app/Contents
   )
 
   install_dir(
     ${OSX_APP_SOURCEDIR}/Contents/Resources
-    blender.app/Contents/
+    Blender.app/Contents/
   )
 
   if(WITH_OPENMP AND OPENMP_CUSTOM)
     install(
       FILES ${LIBDIR}/openmp/lib/libomp.dylib
-      DESTINATION blender.app/Contents/Resources/lib
+      DESTINATION Blender.app/Contents/Resources/lib
     )
   endif()
 
   if(WITH_LLVM AND NOT LLVM_STATIC)
     install(
       FILES ${LIBDIR}/llvm/lib/libLLVM-3.4.dylib
-      DESTINATION blender.app/Contents/MacOS
+      DESTINATION Blender.app/Contents/MacOS
     )
   endif()
 
diff --git a/tests/python/view_layer/CMakeLists.txt b/tests/python/view_layer/CMakeLists.txt
index 68c89fb9911..cca3cd22b67 100644
--- a/tests/python/view_layer/CMakeLists.txt
+++ b/tests/python/view_layer/CMakeLists.txt
@@ -29,19 +29,8 @@ execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${TEST_OUT_DIR})
 #~      message(FATAL_ERROR "CMake test directory not found!")
 #~  endif()
 
-# all calls to blender use this
-if(APPLE)
-  if(${CMAKE_GENERATOR} MATCHES "Xcode")
-    set(TEST_BLENDER_EXE ${EXECUTABLE_OUTPUT_PATH}/Debug/blender.app/Contents/MacOS/blender)
-  else()
-    set(TEST_BLENDER_EXE ${EXECUTABLE_OUTPUT_PATH}/blender.app/Contents/MacOS/blender)
-  endif()
-else()
-  set(TEST_BLENDER_EXE ${EXECUTABLE_OUTPUT_PATH}/blender)
-endif()
-
 # for testing with valgrind prefix: valgrind --track-origins=yes --error-limit=no
-set(TEST_BLENDER_EXE ${TEST_BLENDER_EXE} --background -noaudio --factory-startup --env-system-scripts ${CMAKE_SOURCE_DIR}/release/scripts)
+set(TEST_BLENDER_EXE $<TARGET_FILE:blender> --background -noaudio --factory-startup --env-system-scripts ${CMAKE_SOURCE_DIR}/release/scripts)
 
 
 # ------------------------------------------------------------------------------