Separate jsonnet fmt into its own executable.

Author: sparkprime

.gitignore

@@ -11,6 +11,7 @@
 *.dSYM
 
 jsonnet
+jsonnetfmt
 _jsonnet.so
 libjsonnet.so
 libjsonnet++.so

CMakeLists.txt

@@ -5,6 +5,7 @@ include(GNUInstallDirs)
 
 # User-configurable options.
 option(BUILD_JSONNET "Build jsonnet command-line tool." ON)
+option(BUILD_JSONNETFMT "Build jsonnetfmt command-line tool." ON)
 option(BUILD_TESTS "Build and run jsonnet tests." ON)
 option(USE_SYSTEM_GTEST "Use system-provided gtest library" OFF)
 set(GLOBAL_OUTPUT_PATH_SUFFIX "" CACHE STRING

Makefile

@@ -63,6 +63,7 @@ LIB_CPP_OBJ = $(LIB_OBJ) $(LIB_CPP_SRC:.cpp=.o)
 
 ALL = \
 	jsonnet \
+	jsonnetfmt \
 	libjsonnet.so \
 	libjsonnet++.so \
 	libjsonnet_test_snippet \
@@ -89,11 +90,11 @@ ALL_HEADERS = \
 	third_party/md5/md5.h \
 	third_party/json/json.hpp
 
-default: jsonnet
+default: jsonnet jsonnetfmt
 
 all: $(ALL)
 
-test: jsonnet libjsonnet.so libjsonnet_test_snippet libjsonnet_test_file
+test: jsonnet jsonnetfmt libjsonnet.so libjsonnet_test_snippet libjsonnet_test_file
 	./tests.sh
 
 reformat:
@@ -104,6 +105,7 @@ test-formatting:
 
 MAKEDEPEND_SRCS = \
 	cmd/jsonnet.cpp \
+	cmd/jsonnetfmt.cpp \
 	core/libjsonnet_test_snippet.c \
 	core/libjsonnet_test_file.c
 
@@ -118,8 +120,12 @@ core/desugarer.cpp: core/std.jsonnet.h
 	$(CXX) -c $(CXXFLAGS) $< -o $@
 
 # Commandline executable.
-jsonnet: cmd/jsonnet.cpp $(LIB_OBJ)
-	$(CXX) $(CXXFLAGS) $(LDFLAGS) $< $(LIB_SRC:.cpp=.o) -o $@
+jsonnet: cmd/jsonnet.cpp cmd/utils.cpp $(LIB_OBJ)
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) $< cmd/utils.cpp $(LIB_SRC:.cpp=.o) -o $@
+
+# Commandline executable (reformatter).
+jsonnetfmt: cmd/jsonnetfmt.cpp cmd/utils.cpp $(LIB_OBJ)
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) $< cmd/utils.cpp $(LIB_SRC:.cpp=.o) -o $@
 
 # C binding.
 libjsonnet.so: $(LIB_OBJ)

README.md

@@ -33,31 +33,38 @@ To run the output binary, run:
 ./jsonnet
 ```
 
+To run the reformatter, run:
+
+```
+./jsonnetfmt
+```
+
 ### Bazel
 
 Bazel builds are also supported.
 Install [Bazel](https://www.bazel.io/versions/master/docs/install.html) if it is
 not installed already. Then, run the following command to build with GCC:
 
 ```
-bazel build -c opt //cmd:jsonnet
+bazel build -c opt //cmd:all
 ```
 
 To build with Clang, use one of these two options:
 
 ```
-env CC=clang CXX=clang++ bazel build -c opt //cmd:jsonnet
+env CC=clang CXX=clang++ bazel build -c opt //cmd:all
 
 # OR
 
-bazel build -c opt --action_env=CC=clang --action_env=CXX=clang++ //cmd:jsonnet
+bazel build -c opt --action_env=CC=clang --action_env=CXX=clang++ //cmd:all
 ```
 
-This builds the `jsonnet` target defined in [`cmd/BUILD`](./cmd/BUILD). To
-launch the output binary, run:
+This builds the `jsonnet` and `jsonnetfmt` targets defined in [`cmd/BUILD`](./cmd/BUILD). To launch
+the output binaries, run:
 
 ```
 bazel-bin/cmd/jsonnet
+bazel-bin/cmd/jsonnetfmt
 ```
 
 

cmd/BUILD

@@ -1,7 +1,26 @@
 package(default_visibility = ["//visibility:public"])
 
+cc_library(
+    name = "utils",
+    srcs = ["utils.cpp"],
+    hdrs = ["utils.h"],
+    includes = ["."],
+)
+
 cc_binary(
     name = "jsonnet",
     srcs = ["jsonnet.cpp"],
-    deps = ["//core:libjsonnet"],
+    deps = [
+        ":utils",
+        "//core:libjsonnet",
+    ],
+)
+
+cc_binary(
+    name = "jsonnetfmt",
+    srcs = ["jsonnetfmt.cpp"],
+    deps = [
+        ":utils",
+        "//core:libjsonnet",
+    ],
 )

cmd/CMakeLists.txt

@@ -1,9 +1,17 @@
 # Jsonnet command-line tool.
 
 if (BUILD_JSONNET OR BUILD_TESTS)
-    add_executable(jsonnet ${LIBJSONNET_SOURCE} jsonnet.cpp)
+    add_executable(jsonnet ${LIBJSONNET_SOURCE} jsonnet.cpp utils.cpp)
     add_dependencies(jsonnet libjsonnet_static)
     target_link_libraries(jsonnet libjsonnet_static)
 
 	install(TARGETS jsonnet DESTINATION "${CMAKE_INSTALL_BINDIR}")
 endif()
+
+if (BUILD_JSONNETFMT OR BUILD_TESTS)
+    add_executable(jsonnetfmt ${LIBJSONNET_SOURCE} jsonnetfmt.cpp utils.cpp)
+    add_dependencies(jsonnet libjsonnet_static)
+    target_link_libraries(jsonnet libjsonnet_static)
+
+	install(TARGETS jsonnetfmt DESTINATION "${CMAKE_INSTALL_BINDIR}")
+endif()