diff options
| author | mpcomplete@google.com <mpcomplete@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-23 19:40:08 +0000 |
|---|---|---|
| committer | mpcomplete@google.com <mpcomplete@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-23 19:40:08 +0000 |
| commit | b92ed9d2ae1bce0d5240fd7e30b2ba4dfdee299a (patch) | |
| tree | 24b7f2fc48a7e535871bf4be9dfd705618e9557e /gears | |
| parent | 524b38893b0dc11de8707292c5348b9823f78787 (diff) | |
| download | chromium_src-b92ed9d2ae1bce0d5240fd7e30b2ba4dfdee299a.zip chromium_src-b92ed9d2ae1bce0d5240fd7e30b2ba4dfdee299a.tar.gz chromium_src-b92ed9d2ae1bce0d5240fd7e30b2ba4dfdee299a.tar.bz2 | |
Change DEPS to pull Gears from the opensource svn mirror.
Also, I adjusted the SConscripts to reflect the new source tree layout (gears,
third_party, and third_party_internal).
Review URL: http://codereview.chromium.org/8046
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3841 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gears')
| -rw-r--r-- | gears/SConscript | 15 | ||||
| -rw-r--r-- | gears/SConscript.dll | 2 | ||||
| -rw-r--r-- | gears/SConscript.installers | 2 |
3 files changed, 14 insertions, 5 deletions
diff --git a/gears/SConscript b/gears/SConscript index f373024..bfc0b65 100644 --- a/gears/SConscript +++ b/gears/SConscript @@ -35,9 +35,9 @@ import os Import('env') env = env.Clone( - OPEN_DIR = "googleclient/gears/opensource/gears", - THIRD_PARTY_DIR = "googleclient/gears/opensource/third_party", - PRIVATE_THIRD_PARTY_DIR = "googleclient/third_party", + OPEN_DIR = "gears", + THIRD_PARTY_DIR = "third_party", + PRIVATE_THIRD_PARTY_DIR = "third_party_internal", ) if not os.path.exists(env.Dir('#/$OPEN_DIR').abspath): @@ -680,6 +680,15 @@ elif env['OS'] == 'osx': '-O2', ], ) + +# TODO(mpcomplete): fix this and properly separate our DLL flags from EXE +# flags. +env.Append( + SHLINKFLAGS = [ + '$LINKFLAGS', + '/DLL', + ], +) # Load all the components diff --git a/gears/SConscript.dll b/gears/SConscript.dll index 8136e54..4759308 100644 --- a/gears/SConscript.dll +++ b/gears/SConscript.dll @@ -34,7 +34,7 @@ env.Tool('midl') if env['BROWSER'] == 'IE': env.Replace( - SCONS_DIR = '../../../..', # the scons dir relative to OPEN_DIR + SCONS_DIR = '..', # the scons dir relative to OPEN_DIR IDLINCPREFIX = '/I$SCONS_DIR/', IDLINCSUFFIX = '', _IDLINCFLAGS = ('${_concat(IDLINCPREFIX, CPPPATH, IDLINCSUFFIX, ' diff --git a/gears/SConscript.installers b/gears/SConscript.installers index 57bc128..513a01f 100644 --- a/gears/SConscript.installers +++ b/gears/SConscript.installers @@ -76,7 +76,7 @@ if env['OS'] == 'win32': env.Append( # Note: Since light.exe is run from $OPEN_DIR, candle.exe must generate # output with paths relative to that dir. - SCONS_DIR = '../../../..', # the scons dir relative to OPEN_DIR + SCONS_DIR = '..', # the scons dir relative to OPEN_DIR # You can change the names of ProductId vars, but NEVER change their values! CANDLEDEFINES = [ ('OurWin32ProductId', |