forked from bartvdbraak/blender
move source/darwin into release/darwin since these files are for osx packaging.
This commit is contained in:
parent
6810813068
commit
d3d5c57c32
@ -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
|
||||
|
0
source/darwin/blender.app/Contents/MacOS/blender → release/darwin/blender.app/Contents/MacOS/blender
0
source/darwin/blender.app/Contents/MacOS/blender → release/darwin/blender.app/Contents/MacOS/blender
0
source/darwin/blenderplayer.app/Contents/PkgInfo → release/darwin/blenderplayer.app/Contents/PkgInfo
0
source/darwin/blenderplayer.app/Contents/PkgInfo → release/darwin/blenderplayer.app/Contents/PkgInfo
Before Width: | Height: | Size: 362 B After Width: | Height: | Size: 362 B |
@ -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}
|
||||
|
@ -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})
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user