fix path to release/python.zip for scons and cmake
authorStefan Gartner <stefang@aon.at>
Wed, 4 Aug 2010 11:07:14 +0000 (11:07 +0000)
committerStefan Gartner <stefang@aon.at>
Wed, 4 Aug 2010 11:07:14 +0000 (11:07 +0000)
I hope this doesn't break anything

build_files/scons/tools/Blender.py
source/creator/CMakeLists.txt

index 546f1e540cf4ddfca860639c64a1f29ca60930ef..89c4ef9cac9008ea0c375a6d609009bc74476297 100644 (file)
@@ -501,10 +501,7 @@ def AppIt(target=None, source=None, env=None):
        installdir = env['BF_INSTALLDIR']
        print("compiled architecture: %s"%(osxarch))
        print("Installing to %s"%(installdir))
-       if  libdir == '../lib/darwin-9.x.universal':
-               python_zip = 'python_' + osxarch + '.zip' # set specific python_arch.zip
-       else:
-               python_zip = 'python.zip' # compatibility for darwin8 python.zip
+       python_zip = 'python_' + osxarch + '.zip' # set specific python_arch.zip
        print("unzipping to app-bundle: %s"%(python_zip))
        bldroot = env.Dir('.').abspath
        binary = env['BINARYKIND']
index e8c53cf0374af4e3967c4a637f6f8d253303bf97..feeb99b07487e3a559d3fb2c45cc65386966b33c 100644 (file)
@@ -272,11 +272,7 @@ IF(WITH_INSTALL)
                ENDIF(WITH_INTERNATIONAL)
       
                IF(WITH_PYTHON)
-                       IF(WITH_LIBS10.5)
-                               SET(PYTHON_ZIP "python_${CMAKE_OSX_ARCHITECTURES}.zip")
-                       ELSE(WITH_LIBS10.5)
-                               SET(PYTHON_ZIP "python.zip")
-                       ENDIF(WITH_LIBS10.5)
+                       SET(PYTHON_ZIP "python_${CMAKE_OSX_ARCHITECTURES}.zip")
                        ADD_CUSTOM_COMMAND(
                                TARGET blender POST_BUILD MAIN_DEPENDENCY blender
                                COMMAND cp -Rf ${CMAKE_SOURCE_DIR}/release/scripts ${TARGETDIR}/blender.app/Contents/MacOS/scripts/