svn merge ^/trunk/blender -r49763:49774
authorCampbell Barton <ideasman42@gmail.com>
Fri, 10 Aug 2012 15:45:09 +0000 (15:45 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 10 Aug 2012 15:45:09 +0000 (15:45 +0000)
1  2 
SConstruct

diff --combined SConstruct
index a0fdf4b9fe30a1523e933407000f89c14379a3b5,53e1911a3e7cf0419e04f4eebe422a075826ea62..6cb2da36ccdfcdb08b07a071b28d68c7c9dc1ed2
@@@ -451,7 -451,7 +451,7 @@@ if not os.path.isdir ( B.root_build_dir
  if not os.path.isdir ( B.root_build_dir + 'data_headers'):
      os.makedirs ( B.root_build_dir + 'data_headers' )
  # use for includes
- env['DATA_HEADERS'] = "#" + env['BF_BUILDDIR'] + "/data_headers"
+ env['DATA_HEADERS'] = os.path.join(os.path.abspath(env['BF_BUILDDIR']), "data_headers")
  def ensure_data(FILE_FROM, FILE_TO, VAR_NAME):
      if os.sep == "\\":
          FILE_FROM = FILE_FROM.replace("/", "\\")
@@@ -656,26 -656,6 +656,26 @@@ if env['OURPLATFORM']!='darwin'
                      cubin_file = os.path.join(kernel_build_dir, "kernel_%s.cubin" % arch)
                      scriptinstall.append(env.Install(dir=dir,source=cubin_file))
  
 +    if env['WITH_BF_OCIO']:
 +        colormanagement = os.path.join('release', 'datafiles', 'colormanagement')
 +
 +        for dp, dn, df in os.walk(colormanagement):
 +            if '.svn' in dn:
 +                dn.remove('.svn')
 +            if '_svn' in dn:
 +                dn.remove('_svn')
 +
 +            dir = os.path.join(env['BF_INSTALLDIR'], VERSION, 'datafiles')
 +            dir += os.sep + os.path.basename(colormanagement) + dp[len(colormanagement):]
 +
 +            source = [os.path.join(dp, f) for f in df if not f.endswith(".pyc")]
 +
 +            # To ensure empty dirs are created too
 +            if len(source) == 0:
 +                env.Execute(Mkdir(dir))
 +
 +            scriptinstall.append(env.Install(dir=dir,source=source))
 +
      if env['WITH_BF_INTERNATIONAL']:
          internationalpaths=['release' + os.sep + 'datafiles']
  
@@@ -808,9 -788,6 +808,9 @@@ if env['OURPLATFORM'] in ('win32-vc', '
      if env['WITH_BF_OIIO'] and env['OURPLATFORM'] != 'win32-mingw':
          dllsources.append('${LCGDIR}/openimageio/bin/OpenImageIO.dll')
  
 +    if env['WITH_BF_OCIO'] and env['OURPLATFORM'] != 'win32-mingw':
 +        dllsources.append('${LCGDIR}/opencolorio/bin/OpenColorIO.dll')
 +
      dllsources.append('#source/icons/blender.exe.manifest')
  
      windlls = env.Install(dir=env['BF_INSTALLDIR'], source = dllsources)