From 1c4d5784f9957143e86a7455e64ea6ac9661bb9e Mon Sep 17 00:00:00 2001 From: tfarina Date: Sun, 22 Jun 2014 16:13:00 -0700 Subject: No need to include ../tools/flags in include_dirs when depending on flags target. "flags" target does it by direct_dependent_settings which exports the include_dirs to targets that depend on it. Along the way fixed the indentation of experimental.gyp and v8.gyp. BUG=None TEST=make all R=mtklein@google.com Author: tfarina@chromium.org Review URL: https://codereview.chromium.org/343283002 --- gyp/everything.gyp | 2 +- gyp/experimental.gyp | 101 +++++++++++++++------------------- gyp/flags.gyp | 2 +- gyp/pathops_unittest.gyp | 5 +- gyp/tools.gyp | 5 +- gyp/v8.gyp | 139 +++++++++++++++++++++++------------------------ 6 files changed, 116 insertions(+), 138 deletions(-) diff --git a/gyp/everything.gyp b/gyp/everything.gyp index c1e7937bce..78317ef492 100644 --- a/gyp/everything.gyp +++ b/gyp/everything.gyp @@ -24,7 +24,7 @@ 'pdfviewer.gyp:pdfviewer', #'v8.gyp:SkV8Example', #'webtry.gyp:webtry', - ], + ], }], ], }, diff --git a/gyp/experimental.gyp b/gyp/experimental.gyp index a0daf3da12..c3789fad57 100644 --- a/gyp/experimental.gyp +++ b/gyp/experimental.gyp @@ -23,70 +23,57 @@ 'target_name': 'SkiaExamples', 'type': 'executable', 'mac_bundle' : 1, - 'include_dirs' : [ - '../tools/flags', - ], - 'includes': [], - 'sources': [ - '../experimental/SkiaExamples/SkExample.h', - '../experimental/SkiaExamples/SkExample.cpp', - '../experimental/SkiaExamples/HelloSkiaExample.cpp', - ], - 'dependencies': [ - 'skia_lib.gyp:skia_lib', - 'views.gyp:views', - 'xml.gyp:xml', - 'flags.gyp:flags' - ], - 'conditions' : [ - [ 'skia_gpu == 1', { - 'include_dirs' : [ - '../src/gpu', #gl/GrGLUtil.h - ] - }], + 'sources': [ + '../experimental/SkiaExamples/SkExample.h', + '../experimental/SkiaExamples/SkExample.cpp', + '../experimental/SkiaExamples/HelloSkiaExample.cpp', + ], + 'dependencies': [ + 'flags.gyp:flags', + 'skia_lib.gyp:skia_lib', + 'views.gyp:views', + 'xml.gyp:xml', + ], + 'conditions' : [ + [ 'skia_gpu == 1', { + 'include_dirs' : [ + '../src/gpu', + ], + }], [ 'skia_os == "win"', { - 'sources' : [ - '../src/views/win/SkOSWindow_Win.cpp', - '../src/views/win/skia_win.cpp', - ], - }, - ], - + 'sources' : [ + '../src/views/win/SkOSWindow_Win.cpp', + '../src/views/win/skia_win.cpp', + ], + }], [ 'skia_os == "mac"', { 'sources': [ - -# SkiaExamples specific files - '../experimental/SkiaExamples/SkiaExamples-Info.plist', - '../experimental/SkiaExamples/SkExampleNSView.h', - '../experimental/SkiaExamples/SkExampleNSView.mm', - -# Mac files - '../src/views/mac/SampleAppDelegate.h', - '../src/views/mac/SampleAppDelegate.mm', - '../src/views/mac/SkEventNotifier.mm', - '../src/views/mac/skia_mac.mm', - '../src/views/mac/SkNSView.h', - '../src/views/mac/SkNSView.mm', - '../src/views/mac/SkOptionsTableView.h', - '../src/views/mac/SkOptionsTableView.mm', - '../src/views/mac/SkOSWindow_Mac.mm', - '../src/views/mac/SkTextFieldCell.h', - '../src/views/mac/SkTextFieldCell.m', + '../experimental/SkiaExamples/SkiaExamples-Info.plist', + '../experimental/SkiaExamples/SkExampleNSView.h', + '../experimental/SkiaExamples/SkExampleNSView.mm', + '../src/views/mac/SampleAppDelegate.h', + '../src/views/mac/SampleAppDelegate.mm', + '../src/views/mac/SkEventNotifier.mm', + '../src/views/mac/skia_mac.mm', + '../src/views/mac/SkNSView.h', + '../src/views/mac/SkNSView.mm', + '../src/views/mac/SkOptionsTableView.h', + '../src/views/mac/SkOptionsTableView.mm', + '../src/views/mac/SkOSWindow_Mac.mm', + '../src/views/mac/SkTextFieldCell.h', + '../src/views/mac/SkTextFieldCell.m', ], - 'include_dirs' : [ - '../src/views/mac/' + 'include_dirs' : [ + '../src/views/mac/' ], - 'link_settings': { - }, - 'xcode_settings' : { - 'INFOPLIST_FILE' : '../experimental/SkiaExamples/SkiaExamples-Info.plist', - }, - 'mac_bundle_resources' : [ - '../experimental/SkiaExamples/SkiaExamples.xib' + 'xcode_settings' : { + 'INFOPLIST_FILE' : '../experimental/SkiaExamples/SkiaExamples-Info.plist', + }, + 'mac_bundle_resources' : [ + '../experimental/SkiaExamples/SkiaExamples.xib' ], - } + }], ], - ], } ], } diff --git a/gyp/flags.gyp b/gyp/flags.gyp index c15624b050..874a4b20c1 100644 --- a/gyp/flags.gyp +++ b/gyp/flags.gyp @@ -6,8 +6,8 @@ 'target_name': 'flags', 'type': 'static_library', 'sources': [ - '../tools/flags/SkCommandLineFlags.h', '../tools/flags/SkCommandLineFlags.cpp', + '../tools/flags/SkCommandLineFlags.h', ], 'dependencies': [ 'skia_lib.gyp:skia_lib', diff --git a/gyp/pathops_unittest.gyp b/gyp/pathops_unittest.gyp index 35eeabd209..9803db9382 100644 --- a/gyp/pathops_unittest.gyp +++ b/gyp/pathops_unittest.gyp @@ -16,7 +16,6 @@ '../src/pdf', '../src/pipe/utils', '../src/utils', - '../tools/', ], 'includes': [ 'pathops_unittest.gypi', @@ -28,12 +27,12 @@ '../tests/PathOpsOpLoopThreadedTest.cpp', '../tests/PathOpsSkpClipTest.cpp', '../tests/Test.cpp', - '../tests/skia_test.cpp', '../tests/Test.h', + '../tests/skia_test.cpp', ], 'dependencies': [ - 'skia_lib.gyp:skia_lib', 'flags.gyp:flags', + 'skia_lib.gyp:skia_lib', ], 'conditions': [ [ 'skia_gpu == 1', { diff --git a/gyp/tools.gyp b/gyp/tools.gyp index 6913cc1c67..256852ddff 100644 --- a/gyp/tools.gyp +++ b/gyp/tools.gyp @@ -159,13 +159,12 @@ '../tools/skpdiff/SkImageDiffer.cpp', '../tools/skpdiff/SkPMetric.cpp', '../tools/skpdiff/skpdiff_util.cpp', - '../tools/flags/SkCommandLineFlags.cpp', ], 'include_dirs': [ - '../tools/flags', '../src/core/', # needed for SkTLList.h ], 'dependencies': [ + 'flags.gyp:flags', 'skia_lib.gyp:skia_lib', ], 'cflags': [ @@ -282,7 +281,6 @@ '../tools/skpinfo.cpp', ], 'include_dirs': [ - '../tools/flags', '../src/core/', ], 'dependencies': [ @@ -301,7 +299,6 @@ '../src/core/', '../src/images', '../src/lazy', - '../tools/flags', ], 'dependencies': [ 'flags.gyp:flags', diff --git a/gyp/v8.gyp b/gyp/v8.gyp index b2eb54c2ef..0316d34eb9 100644 --- a/gyp/v8.gyp +++ b/gyp/v8.gyp @@ -6,88 +6,83 @@ 'type': 'executable', 'mac_bundle' : 1, 'include_dirs' : [ - '../tools/flags', '../third_party/externals/v8/include', - ], - 'sources': [ - '../experimental/SkV8Example/SkV8Example.cpp', - '../experimental/SkV8Example/SkV8Example.h', - '../experimental/SkV8Example/Global.cpp', - '../experimental/SkV8Example/Global.h', - '../experimental/SkV8Example/Path2D.cpp', - '../experimental/SkV8Example/Path2D.h', - '../experimental/SkV8Example/BaseContext.cpp', - '../experimental/SkV8Example/BaseContext.h', - '../experimental/SkV8Example/JsContext.cpp', - '../experimental/SkV8Example/JsContext.h', - ], - 'dependencies': [ - 'flags.gyp:flags', - 'skia_lib.gyp:skia_lib', - 'views.gyp:views', - 'xml.gyp:xml', - ], - 'link_settings': { - 'libraries': [ + ], + 'sources': [ + '../experimental/SkV8Example/BaseContext.cpp', + '../experimental/SkV8Example/BaseContext.h', + '../experimental/SkV8Example/Global.cpp', + '../experimental/SkV8Example/Global.h', + '../experimental/SkV8Example/JsContext.cpp', + '../experimental/SkV8Example/JsContext.h', + '../experimental/SkV8Example/Path2D.cpp', + '../experimental/SkV8Example/Path2D.h', + '../experimental/SkV8Example/SkV8Example.cpp', + '../experimental/SkV8Example/SkV8Example.h', + ], + 'dependencies': [ + 'flags.gyp:flags', + 'skia_lib.gyp:skia_lib', + 'views.gyp:views', + 'xml.gyp:xml', + ], + 'link_settings': { + 'libraries': [ -# 'd:/src/v8/build/Debug/lib/v8_base.ia32.lib', -# 'd:/src/v8/build/Debug/lib/v8_snapshot.lib', -# 'd:/src/v8/build/Debug/lib/icuuc.lib', -# 'd:/src/v8/build/Debug/lib/icui18n.lib', -# 'Ws2_32.lib', -# 'Winmm.lib', +# 'd:/src/v8/build/Debug/lib/v8_base.ia32.lib', +# 'd:/src/v8/build/Debug/lib/v8_snapshot.lib', +# 'd:/src/v8/build/Debug/lib/icuuc.lib', +# 'd:/src/v8/build/Debug/lib/icui18n.lib', +# 'Ws2_32.lib', +# 'Winmm.lib', - '-lpthread', - '-lrt', - '../../third_party/externals/v8/out/native/obj.target/tools/gyp/libv8_base.x64.a', - '../../third_party/externals/v8/out/native/obj.target/tools/gyp/libv8_snapshot.a', - '../../third_party/externals/v8/out/native/obj.target/third_party/icu/libicudata.a', - '../../third_party/externals/v8/out/native/obj.target/third_party/icu/libicui18n.a', - '../../third_party/externals/v8/out/native/obj.target/third_party/icu/libicuuc.a', - '../../third_party/externals/v8/out/native/obj.target/icudata/third_party/icu/linux/icudt46l_dat.o', - ], - }, - 'conditions' : [ - [ 'skia_gpu == 1', { - 'include_dirs' : [ - '../src/gpu', #gl/GrGLUtil.h - ] - }], - [ 'skia_os == "win"', { - 'sources' : [ - '../src/views/win/SkOSWindow_Win.cpp', - '../src/views/win/skia_win.cpp', - ], - }, + '-lpthread', + '-lrt', + '../../third_party/externals/v8/out/native/obj.target/tools/gyp/libv8_base.x64.a', + '../../third_party/externals/v8/out/native/obj.target/tools/gyp/libv8_snapshot.a', + '../../third_party/externals/v8/out/native/obj.target/third_party/icu/libicudata.a', + '../../third_party/externals/v8/out/native/obj.target/third_party/icu/libicui18n.a', + '../../third_party/externals/v8/out/native/obj.target/third_party/icu/libicuuc.a', + '../../third_party/externals/v8/out/native/obj.target/icudata/third_party/icu/linux/icudt46l_dat.o', ], - + }, + 'conditions' : [ + [ 'skia_gpu == 1', { + 'include_dirs' : [ + '../src/gpu', + ] + }], + [ 'skia_os == "win"', { + 'sources' : [ + '../src/views/win/SkOSWindow_Win.cpp', + '../src/views/win/skia_win.cpp', + ], + }], [ 'skia_os == "mac"', { 'sources': [ - - '../src/views/mac/SampleAppDelegate.h', - '../src/views/mac/SampleAppDelegate.mm', - '../src/views/mac/SkEventNotifier.mm', - '../src/views/mac/skia_mac.mm', - '../src/views/mac/SkNSView.h', - '../src/views/mac/SkNSView.mm', - '../src/views/mac/SkOptionsTableView.h', - '../src/views/mac/SkOptionsTableView.mm', - '../src/views/mac/SkOSWindow_Mac.mm', - '../src/views/mac/SkTextFieldCell.h', - '../src/views/mac/SkTextFieldCell.m', + '../src/views/mac/SampleAppDelegate.h', + '../src/views/mac/SampleAppDelegate.mm', + '../src/views/mac/SkEventNotifier.mm', + '../src/views/mac/skia_mac.mm', + '../src/views/mac/SkNSView.h', + '../src/views/mac/SkNSView.mm', + '../src/views/mac/SkOptionsTableView.h', + '../src/views/mac/SkOptionsTableView.mm', + '../src/views/mac/SkOSWindow_Mac.mm', + '../src/views/mac/SkTextFieldCell.h', + '../src/views/mac/SkTextFieldCell.m', ], - 'include_dirs' : [ - '../src/views/mac/' + 'include_dirs' : [ + '../src/views/mac/' ], - 'xcode_settings' : { - 'INFOPLIST_FILE' : '../experimental/SkiaExamples/SkiaExamples-Info.plist', - }, - 'mac_bundle_resources' : [ - '../experimental/SkiaExamples/SkiaExamples.xib' + 'xcode_settings' : { + 'INFOPLIST_FILE' : '../experimental/SkiaExamples/SkiaExamples-Info.plist', + }, + 'mac_bundle_resources' : [ + '../experimental/SkiaExamples/SkiaExamples.xib' ], - } + }], ], - ], } ], } -- cgit v1.2.3