diff options
| -rw-r--r-- | deno2/BUILD.gn | 24 | ||||
| -rw-r--r-- | deno2/deno.cc | 2 | ||||
| -rw-r--r-- | deno2/deno_test.cc | 2 | ||||
| -rw-r--r-- | deno2/include/deno.h (renamed from deno2/deno.h) | 6 | ||||
| -rw-r--r-- | deno2/main.cc | 2 | ||||
| -rw-r--r-- | deno2/snapshot_creator.cc | 2 | ||||
| -rwxr-xr-x | deno2/tools/lint.sh | 2 |
7 files changed, 22 insertions, 18 deletions
diff --git a/deno2/BUILD.gn b/deno2/BUILD.gn index 777a29902..e044b29a0 100644 --- a/deno2/BUILD.gn +++ b/deno2/BUILD.gn @@ -88,31 +88,34 @@ create_snapshot("deno") { v8_executable("snapshot_creator") { sources = [ - "deno.cc", - "deno.h", "snapshot_creator.cc", ] configs = [ "v8:libplatform_config" ] deps = [ - "v8:v8", - "v8:v8_libbase", - "v8:v8_libplatform", - "v8:v8_libsampler", - "//build/config:exe_and_shlib_deps", - "//build/win:default_exe_manifest", + ":libdeno", ] } v8_executable("deno") { sources = [ - "deno.cc", - "deno.h", "main.cc", ] include_dirs = [ target_gen_dir ] configs = [ "v8:libplatform_config" ] deps = [ ":create_snapshot_deno", + ":libdeno", + ] +} + +v8_component("libdeno") { + sources = [ + "deno.cc", + "include/deno.h", + ] + include_dirs = [ "include/" ] + configs = [ "v8:libplatform_config" ] + deps = [ ":msg_proto", "v8:v8", "v8:v8_libbase", @@ -129,6 +132,7 @@ executable("deno_test") { "deno_test.cc", ] deps = [ + ":libdeno", "//testing/gtest:gtest", ] } diff --git a/deno2/deno.cc b/deno2/deno.cc index bf5dcc89f..4618b5480 100644 --- a/deno2/deno.cc +++ b/deno2/deno.cc @@ -28,7 +28,7 @@ IN THE SOFTWARE. #include "v8/include/libplatform/libplatform.h" #include "v8/include/v8.h" -#include "./deno.h" +#include "include/deno.h" #define CHECK(x) assert(x) // TODO(ry) use V8's CHECK. diff --git a/deno2/deno_test.cc b/deno2/deno_test.cc index 3656e1d1f..4d3d20d94 100644 --- a/deno2/deno_test.cc +++ b/deno2/deno_test.cc @@ -2,7 +2,7 @@ // All rights reserved. MIT License. #include "testing/gtest/include/gtest/gtest.h" -#include "./deno.h" +#include "include/deno.h" TEST(SnapshotTest, InitializesCorrectly) { EXPECT_TRUE(true); diff --git a/deno2/deno.h b/deno2/include/deno.h index 007c70884..9c6a22d2e 100644 --- a/deno2/deno.h +++ b/deno2/include/deno.h @@ -1,7 +1,7 @@ // Copyright 2018 Ryan Dahl <ry@tinyclouds.org> // All rights reserved. MIT License. -#ifndef DENO_H_ -#define DENO_H_ +#ifndef INCLUDE_DENO_H_ +#define INCLUDE_DENO_H_ #include <string> #include "v8/include/v8.h" @@ -48,4 +48,4 @@ void deno_terminate_execution(Deno* d); } // namespace deno -#endif // DENO_H_ +#endif // INCLUDE_DENO_H_ diff --git a/deno2/main.cc b/deno2/main.cc index 5d8263d28..5139e01be 100644 --- a/deno2/main.cc +++ b/deno2/main.cc @@ -5,7 +5,7 @@ #include "v8/include/v8.h" -#include "./deno.h" +#include "include/deno.h" #include "natives_deno.cc" #include "snapshot_deno.cc" diff --git a/deno2/snapshot_creator.cc b/deno2/snapshot_creator.cc index 9ecfff11c..f1bbfb0ed 100644 --- a/deno2/snapshot_creator.cc +++ b/deno2/snapshot_creator.cc @@ -9,7 +9,7 @@ #include "v8/include/v8.h" -#include "./deno.h" +#include "include/deno.h" class StartupDataCppWriter { public: diff --git a/deno2/tools/lint.sh b/deno2/tools/lint.sh index c307d67d0..ed7831e29 100755 --- a/deno2/tools/lint.sh +++ b/deno2/tools/lint.sh @@ -1,4 +1,4 @@ #!/bin/sh cd `dirname "$0"`/.. set -e -v -cpplint --repository=. *.cc *.h +cpplint --repository=. *.cc *.h include/*.h |