summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgspencer@google.com <gspencer@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-05 15:04:06 +0000
committergspencer@google.com <gspencer@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-05 15:04:06 +0000
commitd18bfdc01d0691126ab7d6edd07d926701b6db58 (patch)
treef96ee18faaedfc5acbf7ab23838777a2a52913a1
parent66be29eade7cccdb52857d2aedb5c5b9b9d1f152 (diff)
downloadchromium_src-d18bfdc01d0691126ab7d6edd07d926701b6db58.zip
chromium_src-d18bfdc01d0691126ab7d6edd07d926701b6db58.tar.gz
chromium_src-d18bfdc01d0691126ab7d6edd07d926701b6db58.tar.bz2
Putting some stubs in so that gyp generation doesn't fail on Mac and so that it doesn't fail when the internal repository isn't available.
Review URL: http://codereview.chromium.org/159848 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22476 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--o3d/build/libs.gyp7
-rw-r--r--o3d/documentation/documentation.gyp24
2 files changed, 26 insertions, 5 deletions
diff --git a/o3d/build/libs.gyp b/o3d/build/libs.gyp
index 64e597a..765afbb 100644
--- a/o3d/build/libs.gyp
+++ b/o3d/build/libs.gyp
@@ -28,6 +28,13 @@
],
},
],
+ [ 'OS=="mac"',
+ {
+ 'files': [
+ "../../<(cgdir)/Cg.framework",
+ ]
+ }
+ ],
],
},
],
diff --git a/o3d/documentation/documentation.gyp b/o3d/documentation/documentation.gyp
index f7f92a1..b8db20b 100644
--- a/o3d/documentation/documentation.gyp
+++ b/o3d/documentation/documentation.gyp
@@ -5,6 +5,9 @@
{
'variables': {
'chromium_code': 1,
+ # We only want the documentation targets to be defined if the JS
+ # Compiler is available, so we use python to find out if it's
+ # available.
'jscomp_exists': '<!(python ../build/file_exists.py '
'../../o3d-internal/jscomp/JSCompiler_deploy.jar)',
},
@@ -14,14 +17,16 @@
'targets': [
],
'conditions': [
- # We only want the documentation targets to be defined if the JS
- # Compiler is available, so we use python to find out if it's
- # available.
[ '"<(jscomp_exists)"=="True"',
{
+ # Define these here so we don't run the scripts unless we need to.
'variables': {
- 'input_js_files': '<!@(python get_docs_files.py --js)',
- 'input_idl_files': '<!@(python get_docs_files.py --idl)',
+ 'input_js_files': [
+ '<!@(python get_docs_files.py --js)',
+ ],
+ 'input_idl_files': [
+ '<!@(python get_docs_files.py --idl)',
+ ],
},
'targets': [
{
@@ -72,6 +77,15 @@
},
],
},
+ {
+ 'targets': [
+ {
+ # Empty target if the js compiler doesn't exist.
+ 'target_name': 'documentation',
+ 'type': 'none',
+ },
+ ],
+ },
],
],
}