diff options
| -rw-r--r-- | BUILD.gn | 6 | ||||
| -rw-r--r-- | src/binding.cc (renamed from src/deno.cc) | 4 | ||||
| -rw-r--r-- | src/deno.h (renamed from src/include/deno.h) | 6 | ||||
| -rw-r--r-- | src/from_snapshot.cc | 4 | ||||
| -rw-r--r-- | src/internal.h (renamed from src/deno_internal.h) | 8 | ||||
| -rw-r--r-- | src/main.cc | 2 | ||||
| -rw-r--r-- | src/mock_runtime_test.cc | 2 | ||||
| -rw-r--r-- | src/snapshot_creator.cc | 4 | ||||
| -rwxr-xr-x | tools/format.sh | 2 | ||||
| -rwxr-xr-x | tools/lint.sh | 3 |
10 files changed, 20 insertions, 21 deletions
@@ -68,11 +68,11 @@ static_library("libdeno") { v8_source_set("deno_nosnapshot") { sources = [ - "src/deno.cc", - "src/deno_internal.h", + "src/binding.cc", + "src/internal.h", "src/file_util.cc", "src/file_util.h", - "src/include/deno.h", + "src/deno.h", ] deps = [ "third_party/v8:v8_monolith", diff --git a/src/deno.cc b/src/binding.cc index af8b621cc..cd8c67ef5 100644 --- a/src/deno.cc +++ b/src/binding.cc @@ -28,8 +28,8 @@ IN THE SOFTWARE. #include "third_party/v8/include/v8.h" #include "third_party/v8/src/base/logging.h" -#include "./deno_internal.h" -#include "include/deno.h" +#include "internal.h" +#include "deno.h" namespace deno { diff --git a/src/include/deno.h b/src/deno.h index e6516e427..cd9ade42f 100644 --- a/src/include/deno.h +++ b/src/deno.h @@ -1,7 +1,7 @@ // Copyright 2018 Ryan Dahl <ry@tinyclouds.org> // All rights reserved. MIT License. -#ifndef INCLUDE_DENO_H_ -#define INCLUDE_DENO_H_ +#ifndef DENO_H_ +#define DENO_H_ // Neither Rust nor Go support calling directly into C++ functions, therefore // the public interface to libdeno is done in C. #ifdef __cplusplus @@ -50,4 +50,4 @@ void deno_terminate_execution(Deno* d); #ifdef __cplusplus } // extern "C" #endif -#endif // INCLUDE_DENO_H_ +#endif // DENO_H_ diff --git a/src/from_snapshot.cc b/src/from_snapshot.cc index 8248997e2..5dd32025a 100644 --- a/src/from_snapshot.cc +++ b/src/from_snapshot.cc @@ -8,8 +8,8 @@ #include "third_party/v8/include/v8.h" #include "third_party/v8/src/base/logging.h" -#include "./deno_internal.h" -#include "include/deno.h" +#include "internal.h" +#include "deno.h" #ifdef DENO_MOCK_RUNTIME #include "snapshot_mock_runtime.cc" diff --git a/src/deno_internal.h b/src/internal.h index ad0a6f537..0ec0ea416 100644 --- a/src/deno_internal.h +++ b/src/internal.h @@ -1,10 +1,10 @@ // Copyright 2018 Ryan Dahl <ry@tinyclouds.org> // All rights reserved. MIT License. -#ifndef DENO_INTERNAL_H_ -#define DENO_INTERNAL_H_ +#ifndef INTERNAL_H_ +#define INTERNAL_H_ #include <string> -#include "include/deno.h" +#include "deno.h" #include "third_party/v8/include/v8.h" extern "C" { @@ -41,4 +41,4 @@ void InitializeContext(v8::Isolate* isolate, v8::Local<v8::Context> context, void AddIsolate(Deno* d, v8::Isolate* isolate); } // namespace deno -#endif // DENO_INTERNAL_H_ +#endif // INTERNAL_H_ diff --git a/src/main.cc b/src/main.cc index 40d3d89d2..1f3b4cad8 100644 --- a/src/main.cc +++ b/src/main.cc @@ -11,7 +11,7 @@ #endif #include "flatbuffers/flatbuffers.h" -#include "include/deno.h" +#include "deno.h" #include "src/msg_generated.h" #include "third_party/v8/src/base/logging.h" diff --git a/src/mock_runtime_test.cc b/src/mock_runtime_test.cc index 953210ece..d3d9df2a6 100644 --- a/src/mock_runtime_test.cc +++ b/src/mock_runtime_test.cc @@ -2,7 +2,7 @@ // All rights reserved. MIT License. #include "testing/gtest/include/gtest/gtest.h" -#include "include/deno.h" +#include "deno.h" TEST(MockRuntimeTest, InitializesCorrectly) { Deno* d = deno_new(nullptr, nullptr); diff --git a/src/snapshot_creator.cc b/src/snapshot_creator.cc index a49f656aa..3f4d8c484 100644 --- a/src/snapshot_creator.cc +++ b/src/snapshot_creator.cc @@ -1,9 +1,9 @@ // Copyright 2018 Ryan Dahl <ry@tinyclouds.org> // All rights reserved. MIT License. // Hint: --trace_serializer is a useful debugging flag. -#include "deno_internal.h" +#include "internal.h" #include "file_util.h" -#include "include/deno.h" +#include "deno.h" #include "third_party/v8/include/v8.h" #include "third_party/v8/src/base/logging.h" diff --git a/tools/format.sh b/tools/format.sh index 2845ecd64..f0c7ec0a1 100755 --- a/tools/format.sh +++ b/tools/format.sh @@ -1,7 +1,7 @@ #!/bin/sh set -e cd `dirname "$0"`/.. -clang-format -i -style Google src/*.cc src/*.h src/include/*.h +clang-format -i -style Google src/*.cc src/*.h gn format BUILD.gn gn format deno.gni diff --git a/tools/lint.sh b/tools/lint.sh index 90e79ce89..97dd9d8c9 100755 --- a/tools/lint.sh +++ b/tools/lint.sh @@ -6,7 +6,6 @@ cd `dirname "$0"`/.. --filter=-build/include_subdir \ --repository=src \ src/*.cc \ - src/*.h \ - src/include/*.h + src/*.h node third_party/node_modules/.bin/tslint -p . \ --exclude js/msg_generated.ts |