| OLD | NEW |
| 1 # Copyright 2009, Google Inc. | 1 # Copyright 2009, Google Inc. |
| 2 # All rights reserved. | 2 # All rights reserved. |
| 3 # | 3 # |
| 4 # Redistribution and use in source and binary forms, with or without | 4 # Redistribution and use in source and binary forms, with or without |
| 5 # modification, are permitted provided that the following conditions are | 5 # modification, are permitted provided that the following conditions are |
| 6 # met: | 6 # met: |
| 7 # | 7 # |
| 8 # * Redistributions of source code must retain the above copyright | 8 # * Redistributions of source code must retain the above copyright |
| 9 # notice, this list of conditions and the following disclaimer. | 9 # notice, this list of conditions and the following disclaimer. |
| 10 # * Redistributions in binary form must reproduce the above | 10 # * Redistributions in binary form must reproduce the above |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 44 # TODO: pull from Chrome's SVN with gclient ? | 44 # TODO: pull from Chrome's SVN with gclient ? |
| 45 CHROME_SRC_DIR = '$THIRD_PARTY/chrome/files', | 45 CHROME_SRC_DIR = '$THIRD_PARTY/chrome/files', |
| 46 COLLADA_DIR = '$THIRD_PARTY/fcollada/files', | 46 COLLADA_DIR = '$THIRD_PARTY/fcollada/files', |
| 47 DOXYGEN_DIR = '$THIRD_PARTY/doxygen', | 47 DOXYGEN_DIR = '$THIRD_PARTY/doxygen', |
| 48 GFLAGS_DIR = '$THIRD_PARTY/gflags', | 48 GFLAGS_DIR = '$THIRD_PARTY/gflags', |
| 49 GLEW_DIR = '$THIRD_PARTY/glew/files', | 49 GLEW_DIR = '$THIRD_PARTY/glew/files', |
| 50 GMOCK_DIR = '$THIRD_PARTY/gmock/files', | 50 GMOCK_DIR = '$THIRD_PARTY/gmock/files', |
| 51 GTEST_DIR = '$THIRD_PARTY/gtest/files', | 51 GTEST_DIR = '$THIRD_PARTY/gtest/files', |
| 52 # TODO: pull from Chrome's SVN with gclient ? | 52 # TODO: pull from Chrome's SVN with gclient ? |
| 53 ICU38_DIR = '$THIRD_PARTY/icu38/files', | 53 ICU38_DIR = '$THIRD_PARTY/icu38/files', |
| 54 INTERNAL_DIR = '$SCONSTRUCT_DIR/../o3d-internal', |
| 54 JPEG_DIR = '$THIRD_PARTY/jpeg/src', | 55 JPEG_DIR = '$THIRD_PARTY/jpeg/src', |
| 55 JSDOCTOOLKIT_DIR = '$THIRD_PARTY/jsdoctoolkit/files', | 56 JSDOCTOOLKIT_DIR = '$THIRD_PARTY/jsdoctoolkit/files', |
| 56 # To run selenium tests you will need a tgz'ed copy of firefox. | 57 # To run selenium tests you will need a tgz'ed copy of firefox. |
| 57 # Specify the path to it below. | 58 # Specify the path to it below. |
| 58 # See tests/build.scons | 59 # See tests/build.scons |
| 59 MAC_HERMETIC_FIREFOX_DIR = ( | 60 MAC_HERMETIC_FIREFOX_DIR = ( |
| 60 '$SCONSTRUCT_DIR/../o3d-internal/third_party/firefox'), | 61 '$INTERNAL_DIR/third_party/firefox'), |
| 61 # If we have directx redistributables present, | 62 # If we have directx redistributables present, |
| 62 # then build o3dextras. | 63 # then build o3dextras. |
| 63 DIRECTX_REDIST_DIR=( | 64 DIRECTX_REDIST_DIR=( |
| 64 '$SCONSTRUCT_DIR/../o3d-internal/third_party/dx_nov_2007_redist'), | 65 '$INTERNAL_DIR/third_party/dx_nov_2007_redist'), |
| 65 # NACL has to be in this weird directory because it looks for | 66 # NACL has to be in this weird directory because it looks for |
| 66 # googleclient two levels above it. | 67 # googleclient two levels above it. |
| 67 NACL_DIR = '$THIRD_PARTY/native_client/googleclient/native_client', | 68 NACL_DIR = '$THIRD_PARTY/native_client/googleclient/native_client', |
| 68 NIXYSA_DIR = '$THIRD_PARTY/nixysa/files', | 69 NIXYSA_DIR = '$THIRD_PARTY/nixysa/files', |
| 69 NPAPI_DIR = '$THIRD_PARTY/npapi/files', | 70 NPAPI_DIR = '$THIRD_PARTY/npapi/files', |
| 70 PDIFF_DIR = '$THIRD_PARTY/pdiff/files', | 71 PDIFF_DIR = '$THIRD_PARTY/pdiff/files', |
| 71 PLY_DIR = '$THIRD_PARTY/ply/files', | 72 PLY_DIR = '$THIRD_PARTY/ply/files', |
| 72 PNG_DIR = '$THIRD_PARTY/png/src', | 73 PNG_DIR = '$THIRD_PARTY/png/src', |
| 73 SCONS_DIR = '$THIRD_PARTY/scons', | 74 SCONS_DIR = '$THIRD_PARTY/scons', |
| 74 SELENIUM_JAVA_DIR = '$THIRD_PARTY/java/selenium/rev2478_mod', | 75 SELENIUM_JAVA_DIR = '$THIRD_PARTY/java/selenium/rev2478_mod', |
| 75 SELENIUM_PYTHON_DIR = '$THIRD_PARTY/py/selenium', | 76 SELENIUM_PYTHON_DIR = '$THIRD_PARTY/py/selenium', |
| 76 # TODO: pull from SVN with gclient ? | 77 # TODO: pull from SVN with gclient ? |
| 77 SKIA_DIR = '$THIRD_PARTY/skia/files', | 78 SKIA_DIR = '$THIRD_PARTY/skia/files', |
| 79 SWIFTSHADER_DIR = '$INTERNAL_DIR/third_party/swiftshader/files', |
| 78 # TODO: pull from SVN with gclient ? | 80 # TODO: pull from SVN with gclient ? |
| 79 V8_SRC_DIR = '$THIRD_PARTY/v8', | 81 V8_SRC_DIR = '$THIRD_PARTY/v8', |
| 80 WIX_DIR = '$THIRD_PARTY/wix_2_0_4221/files', | 82 WIX_DIR = '$THIRD_PARTY/wix_2_0_4221/files', |
| 81 ZIP_UTILS_DIR = '$THIRD_PARTY/zip_utils/files', | 83 ZIP_UTILS_DIR = '$THIRD_PARTY/zip_utils/files', |
| 82 ZLIB_DIR = '$THIRD_PARTY/zlib/files', | 84 ZLIB_DIR = '$THIRD_PARTY/zlib/files', |
| 83 # Big stuff that we don't want to be part of the chrome tree. | 85 # Big stuff that we don't want to be part of the chrome tree. |
| 84 SAMPLE_ASSETS = '$GOOGLECLIENT/o3d_assets/samples', | 86 SAMPLE_ASSETS = '$GOOGLECLIENT/o3d_assets/samples', |
| 85 TEST_REFERENCE_IMAGES = '$GOOGLECLIENT/o3d_assets/tests/screenshots', | 87 TEST_REFERENCE_IMAGES = '$GOOGLECLIENT/o3d_assets/tests/screenshots', |
| 86 ) | 88 ) |
| 87 if env.Bit('host_windows'): | 89 if env.Bit('host_windows'): |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 122 env['ENV']['PATH'] = "%s%s%s" % (env['ENV']['PATH'], os.pathsep, | 124 env['ENV']['PATH'] = "%s%s%s" % (env['ENV']['PATH'], os.pathsep, |
| 123 os.path.join(winsdk_dir, 'Bin')) | 125 os.path.join(winsdk_dir, 'Bin')) |
| 124 except KeyError: | 126 except KeyError: |
| 125 env['ENV']['PATH'] = os.path.join(winsdk_dir, 'Bin') | 127 env['ENV']['PATH'] = os.path.join(winsdk_dir, 'Bin') |
| 126 else: | 128 else: |
| 127 env.Replace(JAVA_EXE = 'java') | 129 env.Replace(JAVA_EXE = 'java') |
| 128 if env.Bit('host_linux'): | 130 if env.Bit('host_linux'): |
| 129 env.Replace(DOXYGEN = '$DOXYGEN_DIR/linux/doxygen') | 131 env.Replace(DOXYGEN = '$DOXYGEN_DIR/linux/doxygen') |
| 130 else: | 132 else: |
| 131 env.Replace(DOXYGEN = '$DOXYGEN_DIR/osx/doxygen') | 133 env.Replace(DOXYGEN = '$DOXYGEN_DIR/osx/doxygen') |
| OLD | NEW |