macOS: rename blender.app to Blender.app
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Fri, 21 Jun 2019 16:12:00 +0000 (18:12 +0200)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Fri, 21 Jun 2019 21:37:40 +0000 (23:37 +0200)
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:
GNUmakefile
release/darwin/Blender.app/Contents/Info.plist [moved from release/darwin/blender.app/Contents/Info.plist with 100% similarity]
release/darwin/Blender.app/Contents/MacOS/blender [moved from release/darwin/blender.app/Contents/MacOS/blender with 100% similarity]
release/darwin/Blender.app/Contents/PkgInfo [moved from release/darwin/blender.app/Contents/PkgInfo with 100% similarity]
release/darwin/Blender.app/Contents/Resources/blender file icon.icns [moved from release/darwin/blender.app/Contents/Resources/blender file icon.icns with 100% similarity]
release/darwin/Blender.app/Contents/Resources/blender icon.icns [moved from release/darwin/blender.app/Contents/Resources/blender icon.icns with 100% similarity]
release/darwin/README.txt
release/darwin/README_codesigning.txt
release/darwin/bundle.sh
release/datafiles/blender_icons_geom_update.py
release/datafiles/blender_icons_update.py
release/text/readme.html
source/creator/CMakeLists.txt
tests/python/view_layer/CMakeLists.txt

index c2cd0a623ce4769d92265deb4759b8af04ce49c7..1c8602480f3819fda8b6fc8436591815c128d2ee 100644 (file)
@@ -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
index cb4c321f67443bbefec4888f6942c8ae9b1771b2..a1fce3caaf89bb28c1e90cb2f5215d4bebc96f35 100644 (file)
@@ -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
index 3724ad1b0acd56a3d74d5898f204779ffd2abb8f..34de5dc74a7caa637d8a6e6a1338a52afc97c8ab 100644 (file)
@@ -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
index b61238dc6203d7e7591cf3e6cad626da4b95040f..85084e07ee2739e0b098f2ae9adc9664fa51e91c 100755 (executable)
@@ -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..."
index 52db26d72dc35d6cf4e973ed005ad5fe48dced06..5e4b0383b9a1f5060a1ee1eb96f1b0ef66495feb 100755 (executable)
@@ -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
 
index 0c35693baaef3e67cfcd1473fa3e22dc2c2e359d..c3b1e36f7fdd8d693c6b02f23e3ac1910af5ce82 100755 (executable)
@@ -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
 
index d7038d4765c4616f46f2a0f07053bdd5872212c2..ccffe35b29fab83623b0f95c0a6b0c7c1f472659 100644 (file)
@@ -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>
index 41412af9aeafe624e3f6a68fa712466b8a9f3203..abb3dd22673faf94aa0cda420275a1c9eaff0539 100644 (file)
@@ -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()
 
index 68c89fb99116e46669a404dabe939fd674f7f904..cca3cd22b67243bfd0b9a6a841e5c3939a9f6a9e 100644 (file)
@@ -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)
 
 
 # ------------------------------------------------------------------------------