diff options
| author | Oskari Timperi <oskari.timperi@iki.fi> | 2018-04-12 19:56:31 +0300 |
|---|---|---|
| committer | Oskari Timperi <oskari.timperi@iki.fi> | 2018-04-12 19:57:06 +0300 |
| commit | a43b55229d99090709ddd68a8f6eb27b80830cec (patch) | |
| tree | 2ab03dceea816b6ee98903682128dec6ea97d213 | |
| parent | 9b1c182fe2b40e69861cfd76bc7358963dced248 (diff) | |
| download | nimpb-a43b55229d99090709ddd68a8f6eb27b80830cec.tar.gz nimpb-a43b55229d99090709ddd68a8f6eb27b80830cec.zip | |
Move descriptor_pb.nim to nimpb/wkt
| -rw-r--r-- | nimpb.nimble | 6 | ||||
| -rw-r--r-- | nimpb/compiler/generator.nim | 2 | ||||
| -rw-r--r-- | nimpb/wkt/descriptor_pb.nim (renamed from nimpb/compiler/descriptor_pb.nim) | 0 |
3 files changed, 1 insertions, 7 deletions
diff --git a/nimpb.nimble b/nimpb.nimble index 22bc7a9..fbde8ea 100644 --- a/nimpb.nimble +++ b/nimpb.nimble @@ -26,12 +26,6 @@ task run_conformance_tests, "Run the conformance test suite": exec &"nimble c {testDir}/conformance_nim.nim" exec &"{testRunner} {testDir}/conformance_nim" -task gen_descriptor, "Re-generate nimpb/compiler/descriptor_pb.nim": - var incdir = "../nimpb_protoc/src/nimpb_protocpkg/protobuf/include/google/protobuf" - var descriptor = incdir / "descriptor.proto" - var outdir = "nimpb/compiler" - exec &"./nimpb/compiler/nimpb_build -I{incdir} --out={outdir} {descriptor}" - task gen_wkt, "Re-generate WKT's": var incdir = "../nimpb_protoc/src/nimpb_protocpkg/protobuf/include/google/protobuf" var outdir = "nimpb/wkt" diff --git a/nimpb/compiler/generator.nim b/nimpb/compiler/generator.nim index 235cec7..fd820dd 100644 --- a/nimpb/compiler/generator.nim +++ b/nimpb/compiler/generator.nim @@ -7,7 +7,7 @@ import strformat import strutils import tables -import descriptor_pb +import nimpb/wkt/descriptor_pb import ../nimpb diff --git a/nimpb/compiler/descriptor_pb.nim b/nimpb/wkt/descriptor_pb.nim index 5273add..5273add 100644 --- a/nimpb/compiler/descriptor_pb.nim +++ b/nimpb/wkt/descriptor_pb.nim |