refactor(libflux): into workspace (#2209)

Author: jlapacik

.gitignore

@@ -1,5 +1,6 @@
 bin
 vendor
+target
 /dist
 .DS_Store
 .netrc
@@ -8,7 +9,6 @@ vendor
 .tern-project
 .idea
 /coverage.txt
-/libflux/target
 /libflux/pkg
 /libflux/site/node_modules
 /libflux/.cache

Makefile

@@ -39,22 +39,22 @@ GENERATED_TARGETS = \
 	internal/scanner/scanner.gen.go \
 	stdlib/packages.go \
 	semantic/internal/fbsemantic \
-	libflux/src/ast/flatbuffers/ast_generated.rs \
-	libflux/src/semantic/flatbuffers/semantic_generated.rs \
+	libflux/src/libflux/ast/flatbuffers/ast_generated.rs \
+	libflux/src/libflux/semantic/flatbuffers/semantic_generated.rs \
 	libflux/scanner.c \
 	libflux/go/libflux/flux.h
 
 generate: $(GENERATED_TARGETS)
 
 ast/internal/fbast: ast/ast.fbs
 	$(GO_GENERATE) ./ast
-libflux/src/ast/flatbuffers/ast_generated.rs: ast/ast.fbs
-	flatc --rust -o libflux/src/ast/flatbuffers ast/ast.fbs
+libflux/src/libflux/ast/flatbuffers/ast_generated.rs: ast/ast.fbs
+	flatc --rust -o libflux/src/libflux/ast/flatbuffers ast/ast.fbs
 
 semantic/internal/fbsemantic: semantic/semantic.fbs
 	$(GO_GENERATE) ./semantic
-libflux/src/semantic/flatbuffers/semantic_generated.rs: semantic/semantic.fbs
-	flatc --rust -o libflux/src/semantic/flatbuffers semantic/semantic.fbs
+libflux/src/libflux/semantic/flatbuffers/semantic_generated.rs: semantic/semantic.fbs
+	flatc --rust -o libflux/src/libflux/semantic/flatbuffers semantic/semantic.fbs
 
 # Force a second expansion to happen so the call to go_deps works correctly.
 .SECONDEXPANSION:
@@ -76,7 +76,7 @@ libflux: libflux/target/debug/libflux.a
 # The unix sed, which is on darwin machines, has a different
 # command line interface than the gnu equivalent.
 libflux/target/debug/libflux.a:
-	cd libflux && $(CARGO) build $(CARGO_ARGS)
+	cd libflux/src/libflux && $(CARGO) build $(CARGO_ARGS)
 
 libflux/go/libflux/flux.h: libflux/include/influxdata/flux.h
 	$(GO_GENERATE) ./libflux/go/libflux
@@ -161,11 +161,11 @@ bench:
 release:
 	./release.sh
 
-libflux/scanner.c: libflux/src/scanner/scanner.rl
-	ragel -C -o libflux/scanner.c libflux/src/scanner/scanner.rl
+libflux/scanner.c: libflux/src/libflux/scanner/scanner.rl
+	ragel -C -o libflux/scanner.c libflux/src/libflux/scanner/scanner.rl
 
 libflux-wasm:
-	cd libflux && CC=clang AR=llvm-ar wasm-pack build --scope influxdata --dev
+	cd libflux/src/libflux && CC=clang AR=llvm-ar wasm-pack build --scope influxdata --dev
 
 .PHONY: generate \
 	clean \