[Cctbx-cvs] libtbx SConscript,1.88,1.89

[Ralf W. Grosse-K. <rw...@us...>]

Update of /cvsroot/cctbx/libtbx
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv7886

Modified Files:
	SConscript 
Log Message:
Mac OS 10: support building with both Python framework (worked before) and non-framework (new)

Index: SConscript
===================================================================
RCS file: /cvsroot/cctbx/libtbx/SConscript,v
retrieving revision 1.88
retrieving revision 1.89
diff -C2 -d -r1.88 -r1.89
*** SConscript	26 Mar 2007 23:16:34 -0000	1.88
--- SConscript	27 Mar 2007 02:58:40 -0000	1.89
***************
*** 36,42 ****
        env_etc.python_include.split("/")[:-2] + ["Python"])
  
- def darwin_framework_path():
-   return os.sep.join(os.path.realpath(sys.executable).split(os.sep)[:-5])
- 
  env_etc = empty()
  env_etc.no_boost_python = ARGUMENTS.get(
--- 36,39 ----
***************
*** 44,48 ****
    not libtbx.env.build_options.build_boost_python_extensions)
  env_etc.norm_join = norm_join
- env_etc.darwin_framework_path = darwin_framework_path
  
  env_etc.include_registry = libtbx.config.include_registry() \
--- 41,44 ----
***************
*** 169,172 ****
--- 165,176 ----
      raise RuntimeError("Unknown compiler choice: %s" % env_etc.compiler)
  else:
+   env_etc.mac_os_version = None
+   if (sys.platform.startswith("darwin")):
+     env_etc.mac_os_version = ".".join(easy_run.fully_buffered(
+       command="/usr/bin/sw_vers -productVersion") \
+       .raise_if_errors() \
+       .stdout_lines[0].strip().split(".")[:2])
+     if (env_etc.mac_os_version == "10.3"):
+       os.environ["MACOSX_DEPLOYMENT_TARGET"] = env_etc.mac_os_version
    env_base = Environment(
      ENV=os.environ,
***************
*** 488,493 ****
        "-w", # suppress "source/lib does not exist" warning
        "-bundle",
!       "-F"+darwin_framework_path(),
!       "-framework", "Python"]
      if (static_exe):
        # no action required
--- 492,496 ----
        "-w", # suppress "source/lib does not exist" warning
        "-bundle",
!       "-undefined", "dynamic_lookup"]
      if (static_exe):
        # no action required