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

Side by Side Diff: webkit/SConscript.port

Issue 7419: Move many files that were suffixed Win.cpp to Chromium.cpp, and place them in... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 12 years, 2 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 | « no previous file | webkit/build/glue/glue.vcproj » ('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 (c) 2006-2008 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 Import('env') 5 Import('env')
6 6
7 env = env.Clone() 7 env = env.Clone()
8 8
9 if env['PLATFORM'] == 'win32': 9 if env['PLATFORM'] == 'win32':
10 env.Prepend( 10 env.Prepend(
11 CCFLAGS = [ 11 CCFLAGS = [
12 '/TP', 12 '/TP',
13 13
14 '/wd4244', 14 '/wd4244',
15 '/wd4291', 15 '/wd4291',
16 '/wd4345', 16 '/wd4345',
17 '/wd4521', 17 '/wd4521',
18 '/wd4800', 18 '/wd4800',
19 ],) 19 ],)
20 elif env['PLATFORM'] == 'posix': 20 elif env['PLATFORM'] == 'posix':
21 env.Append( 21 env.Append(
22 # For the image readers and decoders: 22 # For the image readers and decoders:
23 CXXFLAGS = "-Wno-sign-compare", 23 CXXFLAGS = "-Wno-sign-compare",
24 LIBS = 'png' 24 LIBS = 'png'
25 ) 25 )
26 26
27 input_files = [ 27 input_files = [
28 '$PORT_DIR/bridge/chromium/PluginsChromium.cpp',
29
28 '$PORT_DIR/css/RGBColor.cpp', 30 '$PORT_DIR/css/RGBColor.cpp',
29 31
30 '$PORT_DIR/history/BackForwardList.cpp', 32 '$PORT_DIR/history/BackForwardList.cpp',
31 '$PORT_DIR/history/CachedPage.cpp', 33 '$PORT_DIR/history/CachedPage.cpp',
32 34
33 '$PORT_DIR/loader/IconLoader.cpp', 35 '$PORT_DIR/loader/IconLoader.cpp',
34 '$PORT_DIR/loader/IconDatabaseNone.cpp', 36 '$PORT_DIR/loader/IconDatabaseNone.cpp',
35 37
36 '$PORT_DIR/page/Console.cpp', 38 '$PORT_DIR/page/Console.cpp',
37 '$PORT_DIR/page/Location.cpp', 39 '$PORT_DIR/page/Location.cpp',
38 '$PORT_DIR/page/Navigator.cpp', 40 '$PORT_DIR/page/Navigator.cpp',
41 '$PORT_DIR/page/chromium/AccessibilityObjectChromium.cpp',
42 '$PORT_DIR/page/chromium/AXObjectCacheChromium.cpp',
43 '$PORT_DIR/page/chromium/DragControllerChromium.cpp',
44 '$PORT_DIR/page/chromium/EventHandlerChromium.cpp',
45 '$PORT_DIR/page/chromium/FrameChromium.cpp',
39 46
40 '$PORT_DIR/platform/BString.cpp',
41 '$PORT_DIR/platform/FramelessScrollView.cpp',
42 '$PORT_DIR/platform/GKURL.cpp', 47 '$PORT_DIR/platform/GKURL.cpp',
43 '$PORT_DIR/platform/Language.cpp', 48
44 '$PORT_DIR/platform/TemporaryLinkStubs.cpp', 49 '$PORT_DIR/platform/chromium/ContextMenuItemChromium.cpp',
50 '$PORT_DIR/platform/chromium/ContextMenuChromium.cpp',
51 '$PORT_DIR/platform/chromium/CursorChromium.cpp',
52 '$PORT_DIR/platform/chromium/DragDataChromium.cpp',
53 '$PORT_DIR/platform/chromium/DragImageChromium.cpp',
54 '$PORT_DIR/platform/chromium/FileChooserChromium.cpp',
55 '$PORT_DIR/platform/chromium/FramelessScrollView.cpp',
56 '$PORT_DIR/platform/chromium/Language.cpp',
57 '$PORT_DIR/platform/chromium/MimeTypeRegistryChromium.cpp',
58 '$PORT_DIR/platform/chromium/PlatformScrollBarChromium.cpp',
59 '$PORT_DIR/platform/chromium/PopupMenuChromium.cpp',
60 '$PORT_DIR/platform/chromium/SSLKeyGeneratorChromium.cpp',
61 '$PORT_DIR/platform/chromium/ScrollViewChromium.cpp',
62 '$PORT_DIR/platform/chromium/SearchPopupMenuChromium.cpp',
63 '$PORT_DIR/platform/chromium/SharedTimerChromium.cpp',
64 '$PORT_DIR/platform/chromium/SystemTimeChromium.cpp',
65 '$PORT_DIR/platform/chromium/TemporaryLinkStubs.cpp',
66 '$PORT_DIR/platform/chromium/TextBoundariesChromium.cpp',
67 '$PORT_DIR/platform/chromium/TextBreakIteratorInternalICUChromium.cpp',
68 '$PORT_DIR/platform/chromium/WidgetChromium.cpp',
45 69
46 '$PORT_DIR/platform/graphics/AffineTransformSkia.cpp', 70 '$PORT_DIR/platform/graphics/AffineTransformSkia.cpp',
47 '$PORT_DIR/platform/graphics/ColorSkia.cpp', 71 '$PORT_DIR/platform/graphics/ColorSkia.cpp',
48 '$PORT_DIR/platform/graphics/FloatPointSkia.cpp', 72 '$PORT_DIR/platform/graphics/FloatPointSkia.cpp',
49 '$PORT_DIR/platform/graphics/FloatRectSkia.cpp', 73 '$PORT_DIR/platform/graphics/FloatRectSkia.cpp',
50 '$PORT_DIR/platform/graphics/FontCustomPlatformData.cpp', 74 '$PORT_DIR/platform/graphics/FontCustomPlatformData.cpp',
51 '$PORT_DIR/platform/graphics/GradientSkia.cpp', 75 '$PORT_DIR/platform/graphics/GradientSkia.cpp',
52 '$PORT_DIR/platform/graphics/GraphicsContextPlatformPrivate.cpp', 76 '$PORT_DIR/platform/graphics/GraphicsContextPlatformPrivate.cpp',
53 '$PORT_DIR/platform/graphics/GraphicsContextSkia.cpp', 77 '$PORT_DIR/platform/graphics/GraphicsContextSkia.cpp',
54 '$PORT_DIR/platform/graphics/ImageBufferSkia.cpp', 78 '$PORT_DIR/platform/graphics/ImageBufferSkia.cpp',
(...skipping 21 matching lines...) Expand all
76 100
77 '$PORT_DIR/platform/image-decoders/bmp/BMPImageDecoder.cpp', 101 '$PORT_DIR/platform/image-decoders/bmp/BMPImageDecoder.cpp',
78 '$PORT_DIR/platform/image-decoders/bmp/BMPImageReader.cpp', 102 '$PORT_DIR/platform/image-decoders/bmp/BMPImageReader.cpp',
79 '$PORT_DIR/platform/image-decoders/gif/GIFImageDecoder.cpp', 103 '$PORT_DIR/platform/image-decoders/gif/GIFImageDecoder.cpp',
80 '$PORT_DIR/platform/image-decoders/gif/GIFImageReader.cpp', 104 '$PORT_DIR/platform/image-decoders/gif/GIFImageReader.cpp',
81 '$PORT_DIR/platform/image-decoders/ico/ICOImageDecoder.cpp', 105 '$PORT_DIR/platform/image-decoders/ico/ICOImageDecoder.cpp',
82 '$PORT_DIR/platform/image-decoders/jpeg/JPEGImageDecoder.cpp', 106 '$PORT_DIR/platform/image-decoders/jpeg/JPEGImageDecoder.cpp',
83 '$PORT_DIR/platform/image-decoders/png/PNGImageDecoder.cpp', 107 '$PORT_DIR/platform/image-decoders/png/PNGImageDecoder.cpp',
84 '$PORT_DIR/platform/image-decoders/xbm/XBMImageDecoder.cpp', 108 '$PORT_DIR/platform/image-decoders/xbm/XBMImageDecoder.cpp',
85 109
86 '$PORT_DIR/platform/network/AuthenticationChallenge.cpp', 110 '$PORT_DIR/platform/network/chromium/AuthenticationChallengeChromium.cpp',
87 '$PORT_DIR/platform/network/DNS.cpp', 111 '$PORT_DIR/platform/network/chromium/CookieJarChromium.cpp',
112 '$PORT_DIR/platform/network/chromium/DNSChromium.cpp',
113 '$PORT_DIR/platform/network/chromium/NetworkStateNotifierChromium.cpp',
88 114
89 '$PORT_DIR/plugins/PluginDataChromium.cpp', 115 '$PORT_DIR/plugins/chromium/PluginDataChromium.cpp',
90 ] 116 ]
91 117
92 if env['PLATFORM'] in ('posix', 'darwin'): 118 if env['PLATFORM'] in ('posix', 'darwin'):
93 # Remove from the list files that haven't yet been made portable 119 # Remove from the list files that haven't yet been made portable
94 # to Mac and Linux. 120 # to Mac and Linux.
95 remove_files = [ 121 remove_files = [
96 '$PORT_DIR/platform/BString.cpp', 122 '$PORT_DIR/bridge/chromium/PluginsChromium.cpp',
123 '$PORT_DIR/platform/chromium/ContextMenuItemChromium.cpp',
124 '$PORT_DIR/platform/chromium/ContextMenuChromium.cpp',
125 '$PORT_DIR/platform/chromium/CursorChromium.cpp',
126 '$PORT_DIR/platform/chromium/DragDataChromium.cpp',
127 '$PORT_DIR/platform/chromium/DragImageChromium.cpp',
128 '$PORT_DIR/platform/chromium/FileChooserChromium.cpp',
129 '$PORT_DIR/platform/chromium/MimeTypeRegistryChromium.cpp',
130 '$PORT_DIR/platform/chromium/PlatformScrollBarChromium.cpp',
131 '$PORT_DIR/platform/chromium/PopupMenuChromium.cpp',
132 '$PORT_DIR/platform/chromium/SSLKeyGeneratorChromium.cpp',
133 '$PORT_DIR/platform/chromium/ScrollViewChromium.cpp',
134 '$PORT_DIR/platform/chromium/SearchPopupMenuChromium.cpp',
135 '$PORT_DIR/platform/chromium/SharedTimerChromium.cpp',
136 '$PORT_DIR/platform/chromium/SystemTimeChromium.cpp',
137 '$PORT_DIR/platform/chromium/TextBoundariesChromium.cpp',
138 '$PORT_DIR/platform/chromium/TextBreakIteratorInternalICUChromium.cpp',
139 '$PORT_DIR/platform/chromium/WidgetChromium.cpp',
97 '$PORT_DIR/platform/graphics/FontCustomPlatformData.cpp', 140 '$PORT_DIR/platform/graphics/FontCustomPlatformData.cpp',
98 '$PORT_DIR/platform/graphics/GraphicsContextSkia.cpp', 141 '$PORT_DIR/platform/graphics/GraphicsContextSkia.cpp',
99 '$PORT_DIR/platform/graphics/ImageSkia.cpp', 142 '$PORT_DIR/platform/graphics/ImageSkia.cpp',
100 '$PORT_DIR/platform/graphics/PlatformContextSkia.cpp', 143 '$PORT_DIR/platform/graphics/PlatformContextSkia.cpp',
101 '$PORT_DIR/platform/graphics/SkGraphicsContext.cpp', 144 '$PORT_DIR/platform/graphics/SkGraphicsContext.cpp',
102 ] 145 ]
103 for remove in remove_files: 146 for remove in remove_files:
104 input_files.remove(remove) 147 input_files.remove(remove)
105 148
106 if env['PLATFORM'] == 'win32': 149 if env['PLATFORM'] == 'win32':
107 # These are win32 specific and will never be ported. 150 # These are win32 specific and will never be ported.
108 input_files.extend([ 151 input_files.extend([
109 '$PORT_DIR/bridge/FrameWin.cpp', 152 '$PORT_DIR/platform/win/BString.cpp',
110 '$PORT_DIR/bridge/PageWin.cpp', 153 '$PORT_DIR/platform/win/ClipboardUtilitiesWin.cpp',
111 '$PORT_DIR/bridge/PluginsWin.cpp', 154 '$PORT_DIR/platform/win/ClipboardWin.cpp',
112 '$PORT_DIR/page/AccessibilityObjectWin.cpp', 155 '$PORT_DIR/platform/win/EditorWin.cpp',
113 '$PORT_DIR/page/AXObjectCacheWin.cpp', 156 '$PORT_DIR/platform/win/KeyEventWin.cpp',
114 '$PORT_DIR/page/DragControllerWin.cpp', 157 '$PORT_DIR/platform/win/PasteboardWin.cpp',
115 '$PORT_DIR/page/EventHandlerWin.cpp', 158 '$PORT_DIR/platform/win/PlatformMouseEventWin.cpp',
116 '$PORT_DIR/platform/ClipboardUtilitiesWin.cpp', 159 '$PORT_DIR/platform/win/ScreenWin.cpp',
117 '$PORT_DIR/platform/ClipboardWin.cpp', 160 '$PORT_DIR/platform/win/SoundWin.cpp',
118 '$PORT_DIR/platform/ContextMenuItemWin.cpp',
119 '$PORT_DIR/platform/ContextMenuWin.cpp',
120 '$PORT_DIR/platform/CursorWin.cpp',
121 '$PORT_DIR/platform/DragDataWin.cpp',
122 '$PORT_DIR/platform/DragImageWin.cpp',
123 '$PORT_DIR/platform/EditorWin.cpp',
124 '$PORT_DIR/platform/FileChooserWin.cpp',
125 '$PORT_DIR/platform/KeyEventWin.cpp',
126 '$PORT_DIR/platform/LogWin.cpp',
127 '$PORT_DIR/platform/MimeTypeRegistryWin.cpp',
128 '$PORT_DIR/platform/PasteboardWin.cpp',
129 '$PORT_DIR/platform/PlatformMouseEventWin.cpp',
130 '$PORT_DIR/platform/PlatformScrollBarWin.cpp',
131 '$PORT_DIR/platform/PopupMenuWin.cpp',
132 '$PORT_DIR/platform/SSLKeyGeneratorWin.cpp',
133 '$PORT_DIR/platform/ScreenWin.cpp',
134 '$PORT_DIR/platform/ScrollViewWin.cpp',
135 '$PORT_DIR/platform/SearchPopupMenuWin.cpp',
136 '$PORT_DIR/platform/SharedTimerWin.cpp',
137 '$PORT_DIR/platform/SoundWin.cpp',
138 '$PORT_DIR/platform/SystemTimeWin.cpp',
139 '$PORT_DIR/platform/TextBoundariesWin.cpp',
140 '$PORT_DIR/platform/TextBreakIteratorInternalICUWin.cpp',
141 '$PORT_DIR/platform/UniscribeStateTextRun.cpp', 161 '$PORT_DIR/platform/UniscribeStateTextRun.cpp',
142 '$PORT_DIR/platform/WCDataObject.cpp', 162 '$PORT_DIR/platform/win/WCDataObject.cpp',
143 '$PORT_DIR/platform/WheelEventWin.cpp', 163 '$PORT_DIR/platform/win/WheelEventWin.cpp',
144 '$PORT_DIR/platform/WidgetWin.cpp',
145 '$PORT_DIR/platform/graphics/FontCacheWin.cpp', 164 '$PORT_DIR/platform/graphics/FontCacheWin.cpp',
146 '$PORT_DIR/platform/graphics/FontPlatformDataWin.cpp', 165 '$PORT_DIR/platform/graphics/FontPlatformDataWin.cpp',
147 '$PORT_DIR/platform/graphics/FontWin.cpp', 166 '$PORT_DIR/platform/graphics/FontWin.cpp',
148 '$PORT_DIR/platform/graphics/GlyphPageTreeNodeWin.cpp', 167 '$PORT_DIR/platform/graphics/GlyphPageTreeNodeWin.cpp',
149 '$PORT_DIR/platform/graphics/IconWin.cpp', 168 '$PORT_DIR/platform/graphics/IconWin.cpp',
150 '$PORT_DIR/platform/graphics/IntPointWin.cpp', 169 '$PORT_DIR/platform/graphics/IntPointWin.cpp',
151 '$PORT_DIR/platform/graphics/IntRectWin.cpp', 170 '$PORT_DIR/platform/graphics/IntRectWin.cpp',
152 '$PORT_DIR/platform/graphics/IntSizeWin.cpp', 171 '$PORT_DIR/platform/graphics/IntSizeWin.cpp',
153 '$PORT_DIR/platform/graphics/SimpleFontDataWin.cpp', 172 '$PORT_DIR/platform/graphics/SimpleFontDataWin.cpp',
154 '$PORT_DIR/platform/network/CookieJarWin.cpp',
155 '$PORT_DIR/platform/network/NetworkStateNotifierWin.cpp',
156 '$PORT_DIR/rendering/RenderThemeWin.cpp', 173 '$PORT_DIR/rendering/RenderThemeWin.cpp',
157 ]) 174 ])
158 175
159 if env['PLATFORM'] == 'darwin': 176 if env['PLATFORM'] == 'darwin':
160 input_files.extend([ 177 input_files.extend([
161 '$PORT_DIR/bridge/mac/FrameMac.mm', 178 '$PORT_DIR/bridge/mac/FrameMac.mm',
162 '$PORT_DIR/page/EventHandlerMac.mm', 179 '$PORT_DIR/page/EventHandlerMac.mm',
163 '$PORT_DIR/page/WebCoreFrameBridge.mm', 180 '$PORT_DIR/page/WebCoreFrameBridge.mm',
164 '$PORT_DIR/platform/GKURLMac.mm', 181 '$PORT_DIR/platform/GKURLMac.mm',
165 '$PORT_DIR/platform/PluginStubsMac.cpp', 182 '$PORT_DIR/platform/PluginStubsMac.cpp',
(...skipping 10 matching lines...) Expand all
176 input_files.extend([ 193 input_files.extend([
177 '$PORT_DIR/bridge/ScriptControllerKJS.cpp', 194 '$PORT_DIR/bridge/ScriptControllerKJS.cpp',
178 ]) 195 ])
179 else: 196 else:
180 input_files.extend([ 197 input_files.extend([
181 '$PORT_DIR/bridge/ScriptControllerV8.cpp', 198 '$PORT_DIR/bridge/ScriptControllerV8.cpp',
182 '$PORT_DIR/bridge/ExceptionContextV8.cpp', 199 '$PORT_DIR/bridge/ExceptionContextV8.cpp',
183 ]) 200 ])
184 201
185 env.ChromeStaticLibrary("port", input_files) 202 env.ChromeStaticLibrary("port", input_files)
OLDNEW
« no previous file with comments | « no previous file | webkit/build/glue/glue.vcproj » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698