[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31036] trunk/blender: fix path to release /python.zip for scons and cmake

[Stefan Gartner]

Revision: 31036
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31036
Author:   sgefant
Date:     2010-08-04 13:07:14 +0200 (Wed, 04 Aug 2010)

Log Message:
-----------
fix path to release/python.zip for scons and cmake

I hope this doesn't break anything

Modified Paths:
--------------
    trunk/blender/build_files/scons/tools/Blender.py
    trunk/blender/source/creator/CMakeLists.txt

Modified: trunk/blender/build_files/scons/tools/Blender.py
===================================================================
--- trunk/blender/build_files/scons/tools/Blender.py	2010-08-04 11:04:54 UTC (rev 31035)
+++ trunk/blender/build_files/scons/tools/Blender.py	2010-08-04 11:07:14 UTC (rev 31036)
@@ -501,10 +501,7 @@
 	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']

Modified: trunk/blender/source/creator/CMakeLists.txt
===================================================================
--- trunk/blender/source/creator/CMakeLists.txt	2010-08-04 11:04:54 UTC (rev 31035)
+++ trunk/blender/source/creator/CMakeLists.txt	2010-08-04 11:07:14 UTC (rev 31036)
@@ -272,11 +272,7 @@
 		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/