move source/darwin into release/darwin since these files are for osx packaging.
authorCampbell Barton <ideasman42@gmail.com>
Sun, 18 Nov 2012 07:41:38 +0000 (07:41 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 18 Nov 2012 07:41:38 +0000 (07:41 +0000)
20 files changed:
build_files/scons/tools/Blender.py
release/darwin/blender.app/Contents/Info.plist [moved from source/darwin/blender.app/Contents/Info.plist with 100% similarity]
release/darwin/blender.app/Contents/MacOS/blender [moved from source/darwin/blender.app/Contents/MacOS/blender with 100% similarity]
release/darwin/blender.app/Contents/PkgInfo [moved from source/darwin/blender.app/Contents/PkgInfo with 100% similarity]
release/darwin/blender.app/Contents/Resources/blender file icon.icns [moved from source/darwin/blender.app/Contents/Resources/blender file icon.icns with 100% similarity]
release/darwin/blender.app/Contents/Resources/blender icon.icns [moved from source/darwin/blender.app/Contents/Resources/blender icon.icns with 100% similarity]
release/darwin/blenderplayer.app/Contents/Info.plist [moved from source/darwin/blenderplayer.app/Contents/Info.plist with 100% similarity]
release/darwin/blenderplayer.app/Contents/MacOS/blenderplayer [moved from source/darwin/blenderplayer.app/Contents/MacOS/blenderplayer with 100% similarity]
release/darwin/blenderplayer.app/Contents/PkgInfo [moved from source/darwin/blenderplayer.app/Contents/PkgInfo with 100% similarity]
release/darwin/blenderplayer.app/Contents/Resources/blender file icon.icns [moved from source/darwin/blenderplayer.app/Contents/Resources/blender file icon.icns with 100% similarity]
release/darwin/blenderplayer.app/Contents/Resources/blender player icon.icns [moved from source/darwin/blenderplayer.app/Contents/Resources/blender player icon.icns with 100% similarity]
release/darwin/set_simulation_threads.app/Contents/Info.plist [moved from source/darwin/set_simulation_threads.app/Contents/Info.plist with 100% similarity]
release/darwin/set_simulation_threads.app/Contents/MacOS/applet [moved from source/darwin/set_simulation_threads.app/Contents/MacOS/applet with 100% similarity]
release/darwin/set_simulation_threads.app/Contents/PkgInfo [moved from source/darwin/set_simulation_threads.app/Contents/PkgInfo with 100% similarity]
release/darwin/set_simulation_threads.app/Contents/Resources/Scripts/main.scpt [moved from source/darwin/set_simulation_threads.app/Contents/Resources/Scripts/main.scpt with 100% similarity]
release/darwin/set_simulation_threads.app/Contents/Resources/applet.icns [moved from source/darwin/set_simulation_threads.app/Contents/Resources/applet.icns with 100% similarity]
release/darwin/set_simulation_threads.app/Contents/Resources/applet.rsrc [moved from source/darwin/set_simulation_threads.app/Contents/Resources/applet.rsrc with 100% similarity]
release/darwin/set_simulation_threads.app/Contents/Resources/description.rtfd/TXT.rtf [moved from source/darwin/set_simulation_threads.app/Contents/Resources/description.rtfd/TXT.rtf with 100% similarity]
source/blenderplayer/CMakeLists.txt
source/creator/CMakeLists.txt

index 27e8fea..7aa2a29 100644 (file)
@@ -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
index 11e7904..85bb07d 100644 (file)
@@ -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}
index 66c3bee..32b990d 100644 (file)
@@ -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})