Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(458)

Side by Side Diff: main.scons

Issue 131116: This adds in the GYP files needed for our GYP build. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/o3d/
Patch Set: '' Created 11 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « import/import.gyp ('k') | plugin/idl/codegen.py » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 O3D_PLUGIN_VERSION_COMMAS = GetCommaVersion(plugin_version), 70 O3D_PLUGIN_VERSION_COMMAS = GetCommaVersion(plugin_version),
71 O3D_SDK_VERSION = GetDotVersion(sdk_version), 71 O3D_SDK_VERSION = GetDotVersion(sdk_version),
72 O3D_SDK_VERSION_COMMAS = GetCommaVersion(sdk_version), 72 O3D_SDK_VERSION_COMMAS = GetCommaVersion(sdk_version),
73 73
74 # TODO: this will be the default, but is set for now 74 # TODO: this will be the default, but is set for now
75 COMPONENT_STATIC = True, 75 COMPONENT_STATIC = True,
76 76
77 COVERAGE_TARGETS = ['unit_tests', 'system_tests'], 77 COVERAGE_TARGETS = ['unit_tests', 'system_tests'],
78 MSVS_USE_MFC_DIRS=1, 78 MSVS_USE_MFC_DIRS=1,
79 ) 79 )
80 # @@REWRITE(insert python-copyright) 80
81 base_env.ApplySConscript(['svn_paths.scons']) 81 base_env.ApplySConscript(['svn_paths.scons'])
82 82
83 base_env.Append( 83 base_env.Append(
84 # Some derived paths 84 # Some derived paths
85 NACL_NRD_XFER_SOURCE_DIR = '$NACL_DIR/src/trusted/desc', 85 NACL_NRD_XFER_SOURCE_DIR = '$NACL_DIR/src/trusted/desc',
86 NACL_PLUGIN_SOURCE_DIR = '$NACL_DIR/npapi_plugin', 86 NACL_PLUGIN_SOURCE_DIR = '$NACL_DIR/npapi_plugin',
87 DOCS_DIR = '$DESTINATION_ROOT/docs', 87 DOCS_DIR = '$DESTINATION_ROOT/docs',
88 88
89 CPPPATH = [ 89 CPPPATH = [
90 # The internal dir is first so that headers in internal can replace 90 # The internal dir is first so that headers in internal can replace
(...skipping 739 matching lines...) Expand 10 before | Expand all | Expand 10 after
830 'o3d', environment_list, 830 'o3d', environment_list,
831 exclude_pattern = '.*third_party.*', 831 exclude_pattern = '.*third_party.*',
832 extra_build_targets = { 832 extra_build_targets = {
833 'Firefox': 'c:/Program Files/Mozilla FireFox/firefox.exe', 833 'Firefox': 'c:/Program Files/Mozilla FireFox/firefox.exe',
834 'unit_tests': '$ARTIFACTS_DIR/unit_tests.exe', 834 'unit_tests': '$ARTIFACTS_DIR/unit_tests.exe',
835 'system_tests': '$ARTIFACTS_DIR/system_tests.exe', 835 'system_tests': '$ARTIFACTS_DIR/system_tests.exe',
836 'converter': '$ARTIFACTS_DIR/o3dConverter.exe', 836 'converter': '$ARTIFACTS_DIR/o3dConverter.exe',
837 }, 837 },
838 ) 838 )
839 solution_env.Alias('solution', solution) 839 solution_env.Alias('solution', solution)
OLDNEW
« no previous file with comments | « import/import.gyp ('k') | plugin/idl/codegen.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698