From d3d5c57c32c16fcff38fe31acfefa36a6aef8420 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 18 Nov 2012 07:41:38 +0000 Subject: [PATCH] move source/darwin into release/darwin since these files are for osx packaging. --- build_files/scons/tools/Blender.py | 6 +++--- .../darwin/blender.app/Contents/Info.plist | 0 .../darwin/blender.app/Contents/MacOS/blender | 0 .../darwin/blender.app/Contents/PkgInfo | 0 .../Contents/Resources/blender file icon.icns | Bin .../Contents/Resources/blender icon.icns | Bin .../darwin/blenderplayer.app/Contents/Info.plist | 0 .../blenderplayer.app/Contents/MacOS/blenderplayer | 0 .../darwin/blenderplayer.app/Contents/PkgInfo | 0 .../Contents/Resources/blender file icon.icns | Bin .../Contents/Resources/blender player icon.icns | Bin .../set_simulation_threads.app/Contents/Info.plist | 0 .../Contents/MacOS/applet | Bin .../set_simulation_threads.app/Contents/PkgInfo | 0 .../Contents/Resources/Scripts/main.scpt | Bin .../Contents/Resources/applet.icns | Bin .../Contents/Resources/applet.rsrc | Bin .../Contents/Resources/description.rtfd/TXT.rtf | 0 source/blenderplayer/CMakeLists.txt | 2 +- source/creator/CMakeLists.txt | 4 ++-- 20 files changed, 6 insertions(+), 6 deletions(-) rename {source => release}/darwin/blender.app/Contents/Info.plist (100%) rename {source => release}/darwin/blender.app/Contents/MacOS/blender (100%) rename {source => release}/darwin/blender.app/Contents/PkgInfo (100%) rename {source => release}/darwin/blender.app/Contents/Resources/blender file icon.icns (100%) rename {source => release}/darwin/blender.app/Contents/Resources/blender icon.icns (100%) rename {source => release}/darwin/blenderplayer.app/Contents/Info.plist (100%) rename {source => release}/darwin/blenderplayer.app/Contents/MacOS/blenderplayer (100%) rename {source => release}/darwin/blenderplayer.app/Contents/PkgInfo (100%) rename {source => release}/darwin/blenderplayer.app/Contents/Resources/blender file icon.icns (100%) rename {source => release}/darwin/blenderplayer.app/Contents/Resources/blender player icon.icns (100%) rename {source => release}/darwin/set_simulation_threads.app/Contents/Info.plist (100%) rename {source => release}/darwin/set_simulation_threads.app/Contents/MacOS/applet (100%) rename {source => release}/darwin/set_simulation_threads.app/Contents/PkgInfo (100%) rename {source => release}/darwin/set_simulation_threads.app/Contents/Resources/Scripts/main.scpt (100%) rename {source => release}/darwin/set_simulation_threads.app/Contents/Resources/applet.icns (100%) rename {source => release}/darwin/set_simulation_threads.app/Contents/Resources/applet.rsrc (100%) rename {source => release}/darwin/set_simulation_threads.app/Contents/Resources/description.rtfd/TXT.rtf (100%) diff --git a/build_files/scons/tools/Blender.py b/build_files/scons/tools/Blender.py index 27e8feaea80..7aa2a293ae6 100644 --- a/build_files/scons/tools/Blender.py +++ b/build_files/scons/tools/Blender.py @@ -596,8 +596,8 @@ def AppIt(target=None, source=None, env=None): bldroot = env.Dir('.').abspath binary = env['BINARYKIND'] - sourcedir = bldroot + '/source/darwin/%s.app'%binary - sourceinfo = bldroot + "/source/darwin/%s.app/Contents/Info.plist"%binary + sourcedir = bldroot + '/release/darwin/%s.app' % binary + sourceinfo = bldroot + "/release/darwin/%s.app/Contents/Info.plist"%binary targetinfo = installdir +'/' + "%s.app/Contents/Info.plist"%binary cmd = installdir + '/' +'%s.app'%binary @@ -686,7 +686,7 @@ def AppIt(target=None, source=None, env=None): commands.getoutput(cmd) cmd = 'rm -rf %s/set_simulation_threads.app'%(installdir) # first clear omp_num_threads applescript commands.getoutput(cmd) - cmd = 'cp -R %s/source/darwin/set_simulation_threads.app %s/'%(bldroot, installdir) # copy the omp_num_threads applescript + cmd = 'cp -R %s/release/darwin/set_simulation_threads.app %s/'%(bldroot, installdir) # copy the omp_num_threads applescript commands.getoutput(cmd) # extract copy system python, be sure to update other build systems diff --git a/source/darwin/blender.app/Contents/Info.plist b/release/darwin/blender.app/Contents/Info.plist similarity index 100% rename from source/darwin/blender.app/Contents/Info.plist rename to release/darwin/blender.app/Contents/Info.plist diff --git a/source/darwin/blender.app/Contents/MacOS/blender b/release/darwin/blender.app/Contents/MacOS/blender similarity index 100% rename from source/darwin/blender.app/Contents/MacOS/blender rename to release/darwin/blender.app/Contents/MacOS/blender diff --git a/source/darwin/blender.app/Contents/PkgInfo b/release/darwin/blender.app/Contents/PkgInfo similarity index 100% rename from source/darwin/blender.app/Contents/PkgInfo rename to release/darwin/blender.app/Contents/PkgInfo diff --git a/source/darwin/blender.app/Contents/Resources/blender file icon.icns b/release/darwin/blender.app/Contents/Resources/blender file icon.icns similarity index 100% rename from source/darwin/blender.app/Contents/Resources/blender file icon.icns rename to release/darwin/blender.app/Contents/Resources/blender file icon.icns diff --git a/source/darwin/blender.app/Contents/Resources/blender icon.icns b/release/darwin/blender.app/Contents/Resources/blender icon.icns similarity index 100% rename from source/darwin/blender.app/Contents/Resources/blender icon.icns rename to release/darwin/blender.app/Contents/Resources/blender icon.icns diff --git a/source/darwin/blenderplayer.app/Contents/Info.plist b/release/darwin/blenderplayer.app/Contents/Info.plist similarity index 100% rename from source/darwin/blenderplayer.app/Contents/Info.plist rename to release/darwin/blenderplayer.app/Contents/Info.plist diff --git a/source/darwin/blenderplayer.app/Contents/MacOS/blenderplayer b/release/darwin/blenderplayer.app/Contents/MacOS/blenderplayer similarity index 100% rename from source/darwin/blenderplayer.app/Contents/MacOS/blenderplayer rename to release/darwin/blenderplayer.app/Contents/MacOS/blenderplayer diff --git a/source/darwin/blenderplayer.app/Contents/PkgInfo b/release/darwin/blenderplayer.app/Contents/PkgInfo similarity index 100% rename from source/darwin/blenderplayer.app/Contents/PkgInfo rename to release/darwin/blenderplayer.app/Contents/PkgInfo diff --git a/source/darwin/blenderplayer.app/Contents/Resources/blender file icon.icns b/release/darwin/blenderplayer.app/Contents/Resources/blender file icon.icns similarity index 100% rename from source/darwin/blenderplayer.app/Contents/Resources/blender file icon.icns rename to release/darwin/blenderplayer.app/Contents/Resources/blender file icon.icns diff --git a/source/darwin/blenderplayer.app/Contents/Resources/blender player icon.icns b/release/darwin/blenderplayer.app/Contents/Resources/blender player icon.icns similarity index 100% rename from source/darwin/blenderplayer.app/Contents/Resources/blender player icon.icns rename to release/darwin/blenderplayer.app/Contents/Resources/blender player icon.icns diff --git a/source/darwin/set_simulation_threads.app/Contents/Info.plist b/release/darwin/set_simulation_threads.app/Contents/Info.plist similarity index 100% rename from source/darwin/set_simulation_threads.app/Contents/Info.plist rename to release/darwin/set_simulation_threads.app/Contents/Info.plist diff --git a/source/darwin/set_simulation_threads.app/Contents/MacOS/applet b/release/darwin/set_simulation_threads.app/Contents/MacOS/applet similarity index 100% rename from source/darwin/set_simulation_threads.app/Contents/MacOS/applet rename to release/darwin/set_simulation_threads.app/Contents/MacOS/applet diff --git a/source/darwin/set_simulation_threads.app/Contents/PkgInfo b/release/darwin/set_simulation_threads.app/Contents/PkgInfo similarity index 100% rename from source/darwin/set_simulation_threads.app/Contents/PkgInfo rename to release/darwin/set_simulation_threads.app/Contents/PkgInfo diff --git a/source/darwin/set_simulation_threads.app/Contents/Resources/Scripts/main.scpt b/release/darwin/set_simulation_threads.app/Contents/Resources/Scripts/main.scpt similarity index 100% rename from source/darwin/set_simulation_threads.app/Contents/Resources/Scripts/main.scpt rename to release/darwin/set_simulation_threads.app/Contents/Resources/Scripts/main.scpt diff --git a/source/darwin/set_simulation_threads.app/Contents/Resources/applet.icns b/release/darwin/set_simulation_threads.app/Contents/Resources/applet.icns similarity index 100% rename from source/darwin/set_simulation_threads.app/Contents/Resources/applet.icns rename to release/darwin/set_simulation_threads.app/Contents/Resources/applet.icns diff --git a/source/darwin/set_simulation_threads.app/Contents/Resources/applet.rsrc b/release/darwin/set_simulation_threads.app/Contents/Resources/applet.rsrc similarity index 100% rename from source/darwin/set_simulation_threads.app/Contents/Resources/applet.rsrc rename to release/darwin/set_simulation_threads.app/Contents/Resources/applet.rsrc diff --git a/source/darwin/set_simulation_threads.app/Contents/Resources/description.rtfd/TXT.rtf b/release/darwin/set_simulation_threads.app/Contents/Resources/description.rtfd/TXT.rtf similarity index 100% rename from source/darwin/set_simulation_threads.app/Contents/Resources/description.rtfd/TXT.rtf rename to release/darwin/set_simulation_threads.app/Contents/Resources/description.rtfd/TXT.rtf diff --git a/source/blenderplayer/CMakeLists.txt b/source/blenderplayer/CMakeLists.txt index 11e790451cd..85bb07d6e83 100644 --- a/source/blenderplayer/CMakeLists.txt +++ b/source/blenderplayer/CMakeLists.txt @@ -60,7 +60,7 @@ elseif(APPLE) add_executable(blenderplayer ${EXETYPE} bad_level_call_stubs/stubs.c) # setup Info.plist execute_process(COMMAND date "+%Y-%m-%d" OUTPUT_VARIABLE BLENDER_DATE OUTPUT_STRIP_TRAILING_WHITESPACE) - set(PLAYER_SOURCEDIR ${CMAKE_SOURCE_DIR}/source/darwin/blenderplayer.app) + set(PLAYER_SOURCEDIR ${CMAKE_SOURCE_DIR}/release/darwin/blenderplayer.app) set(PLAYER_SOURCEINFO ${PLAYER_SOURCEDIR}/Contents/Info.plist) set_target_properties(blenderplayer PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${PLAYER_SOURCEINFO} diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 66c3beeebad..32b990d14c5 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -656,7 +656,7 @@ elseif(APPLE) ) endmacro() - set(OSX_APP_SOURCEDIR ${CMAKE_SOURCE_DIR}/source/darwin/blender.app) + set(OSX_APP_SOURCEDIR ${CMAKE_SOURCE_DIR}/release/darwin/blender.app) # setup Info.plist execute_process(COMMAND date "+%Y-%m-%d" OUTPUT_VARIABLE BLENDER_DATE OUTPUT_STRIP_TRAILING_WHITESPACE) @@ -715,7 +715,7 @@ elseif(APPLE) # install blenderplayer bundle - copy of blender.app above. re-using macros et al # note we are using OSX Bundle as base and copying Blender dummy bundle on top of it if(WITH_GAMEENGINE AND WITH_PLAYER) - set(OSX_APP_PLAYER_SOURCEDIR ${CMAKE_SOURCE_DIR}/source/darwin/blenderplayer.app) + set(OSX_APP_PLAYER_SOURCEDIR ${CMAKE_SOURCE_DIR}/release/darwin/blenderplayer.app) set(PLAYER_SOURCEINFO ${OSX_APP_PLAYER_SOURCEDIR}/Contents/Info.plist) set(PLAYER_TARGETDIR_VER ${TARGETDIR}/blenderplayer.app/Contents/MacOS/${BLENDER_VERSION})