dart-lang/sdk
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Cleanup gypi mess.

Browse Source 
My change that introduced a platform directory shared between vm and bin runtime components did not correctly update gypi files.

BUG=
TEST=

Review URL: http://codereview.chromium.org//9124030

git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge/dart@3155 260f80e4-7a28-3924-810f-c04153c831b5
This commit is contained in:
ager@google.com
2012-01-10 16:50:14 +00:00
parent 568329fe06
commit 607eea1402
16 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
runtime/bin/bin.gypi
+4 -1
View File
@@ -1,4 +1,4 @@
# Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file
# Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file
# for details. All rights reserved. Use of this source code is governed by a
# BSD-style license that can be found in the LICENSE file.
@@ -22,6 +22,7 @@
],
'includes': [
'builtin_sources.gypi',
'../platform/platform_sources.gypi',
],
'sources/': [
['exclude', '\\.(cc|h)$'],
@@ -63,6 +64,7 @@
],
'includes': [
'builtin_sources.gypi',
'../platform/platform_sources.gypi',
],
'sources/': [
['exclude', '_test\\.(cc|h)$'],
@@ -224,6 +226,7 @@
],
'includes': [
'builtin_sources.gypi',
'../platform/platform_sources.gypi',
'../vm/vm_sources.gypi',
],
'defines': [
runtime/bin/builtin.h
+1 -2
View File
@@ -1,4 +1,4 @@
// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file
// Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
@@ -9,7 +9,6 @@
#include <stdlib.h>
#include "include/dart_api.h"
#include "platform/globals.h"
#ifdef DEBUG
runtime/bin/dartutils.cc
+1 -2
View File
@@ -1,11 +1,10 @@
// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file
// Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
#include "bin/dartutils.h"
#include "bin/file.h"
#include "platform/globals.h"
const char* DartUtils::kDartScheme = "dart:";
runtime/bin/dartutils.h
+1 -3
View File
@@ -1,4 +1,4 @@
// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file
// Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
@@ -6,9 +6,7 @@
#define BIN_DARTUTILS_H_
#include "bin/builtin.h"
#include "include/dart_api.h"
#include "platform/globals.h"
class CommandLineOptions {
runtime/bin/directory.h
+1 -2
View File
@@ -1,4 +1,4 @@
// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file
// Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
@@ -6,7 +6,6 @@
#define BIN_DIRECTORY_H_
#include "bin/builtin.h"
#include "platform/globals.h"
class Directory {
runtime/bin/fdutils.h
+1 -2
View File
@@ -1,4 +1,4 @@
// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file
// Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
@@ -6,7 +6,6 @@
#define BIN_FDUTILS_H_
#include "bin/builtin.h"
#include "platform/globals.h"
class FDUtils {
runtime/bin/file_test.cc
+1 -3
View File
@@ -1,11 +1,9 @@
// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file
// Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
#include "bin/file.h"
#include "platform/globals.h"
#include "vm/assert.h"
#include "vm/unit_test.h"
runtime/bin/gen_snapshot.cc
+1 -2
View File
@@ -1,4 +1,4 @@
// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file
// Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
@@ -14,7 +14,6 @@
#include "bin/builtin.h"
#include "bin/dartutils.h"
#include "bin/file.h"
#include "platform/globals.h"
// Global state that indicates whether a snapshot is to be created and
runtime/bin/main.cc
+1 -2
View File
@@ -1,4 +1,4 @@
// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file
// Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
@@ -14,7 +14,6 @@
#include "bin/eventhandler.h"
#include "bin/file.h"
#include "bin/platform.h"
#include "platform/globals.h"
// snapshot_buffer points to a snapshot if we link in a snapshot otherwise
runtime/bin/process.h
+1 -2
View File
@@ -1,4 +1,4 @@
// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file
// Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
@@ -6,7 +6,6 @@
#define BIN_PROCESS_H_
#include "bin/builtin.h"
#include "platform/globals.h"
runtime/bin/process_win.cc
+1 -2
View File
@@ -1,4 +1,4 @@
// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file
// Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
@@ -7,7 +7,6 @@
#include "bin/builtin.h"
#include "bin/process.h"
#include "bin/eventhandler.h"
#include "platform/globals.h"
static const int kReadHandle = 0;
runtime/bin/socket.h
+1 -2
View File
@@ -1,4 +1,4 @@
// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file
// Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
@@ -6,7 +6,6 @@
#define BIN_SOCKET_H_
#include "bin/builtin.h"
#include "platform/globals.h"
runtime/bin/thread_pool.h
-1
View File
@@ -6,7 +6,6 @@
#define BIN_THREAD_POOL_H_
#include "bin/builtin.h"
#include "platform/globals.h"
// Declare the OS-specific types ahead of defining the generic classes.
runtime/platform/platform_sources.gypi
+12
View File
@@ -0,0 +1,12 @@
# Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file
# for details. All rights reserved. Use of this source code is governed by a
# BSD-style license that can be found in the LICENSE file.
# This file contains sources shared between the vm and bin components.
{
'sources': [
'globals.h',
'c99_support_win.h',
'inttypes_support_win.h',
],
}
runtime/vm/vm.gypi
+2 -1
View File
@@ -1,4 +1,4 @@
# Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file
# Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file
# for details. All rights reserved. Use of this source code is governed by a
# BSD-style license that can be found in the LICENSE file.
@@ -19,6 +19,7 @@
'type': 'static_library',
'includes': [
'vm_sources.gypi',
'../platform/platform_sources.gypi',
],
'sources/': [
# Exclude all _test.[cc|h] files.
runtime/vm/vm_sources.gypi
+1 -3
View File
@@ -1,4 +1,4 @@
# Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file
# Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file
# for details. All rights reserved. Use of this source code is governed by a
# BSD-style license that can be found in the LICENSE file.
@@ -43,7 +43,6 @@
'bootstrap.h',
'bootstrap_natives.h',
'bootstrap_natives.cc',
'c99_support_win.h',
'class_finalizer.h',
'class_finalizer.cc',
'class_finalizer_test.cc',
@@ -134,7 +133,6 @@
'ic_data.h',
'ic_data.cc',
'ic_data_test.cc',
'inttypes_support_win.h',
'instructions.h',
'instructions_ia32.cc',
'instructions_ia32.h',