Fix tools/format.sh: we were skipping a lot of files. (#252)

* Ignore CMake's ".build"
* Improve CMake formatting while we're here.
* Reformat affected files.

Author: g-easy

.cmake-format.py

@@ -1,3 +1,17 @@
+# Copyright 2018, OpenCensus Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 # Specify structure for custom cmake functions
 additional_commands = {
   "opencensus_lib": {
@@ -7,9 +21,26 @@
     "kwargs": {
       "HEADERS": "*",
       "DEPENDS": "*",
-      "SOURCES": "*"
-    }
-  }
+      "SOURCES": "*",
+    },
+  },
+
+  "externalproject_add": {  # Must be lowercase.
+    "flags": [],
+    "kwargs": {
+      "GIT_REPOSITORY": "+",
+      "GIT_TAG": "+",
+      "SOURCE_DIR": "+",
+      "BINARY_DIR": "+",
+      "UPDATE_COMMAND": "+",
+      "PATCH_COMMAND": "+",
+      "CONFIGURE_COMMAND": "+",
+      "BUILD_COMMAND": "+",
+      "INSTALL_COMMAND": "+",
+      "TEST_COMMAND": "+",
+      "LOG_DOWNLOAD": 1,
+    },
+  },
 }
 
 # If comment markup is enabled, don't reflow the first comment block in

WORKSPACE

@@ -64,7 +64,7 @@ bind(
 # Used by prometheus-cpp.
 local_repository(
     name = "net_zlib_zlib",
-    path = "tools/zlib"
+    path = "tools/zlib",
 )
 
 # Prometheus client library - used by Prometheus exporter.

cmake/abseil.CMakeLists.txt

@@ -17,16 +17,15 @@ cmake_minimum_required(VERSION 3.5)
 project(abseil-download NONE)
 
 include(ExternalProject)
-ExternalProject_Add(abseil_project
-	GIT_REPOSITORY https://github.com/abseil/abseil-cpp
-	GIT_TAG "master"
-	SOURCE_DIR "${CMAKE_BINARY_DIR}/abseil-src"
-	BINARY_DIR "${CMAKE_BINARY_DIR}/abseil-build"
-	UPDATE_COMMAND ""
-	PATCH_COMMAND ""
-	CONFIGURE_COMMAND ""
-	BUILD_COMMAND ""
-	INSTALL_COMMAND ""
-	TEST_COMMAND ""
-	LOG_DOWNLOAD ON
-)
+externalproject_add(abseil_project
+                    GIT_REPOSITORY https://github.com/abseil/abseil-cpp
+                    GIT_TAG "master"
+                    SOURCE_DIR "${CMAKE_BINARY_DIR}/abseil-src"
+                    BINARY_DIR "${CMAKE_BINARY_DIR}/abseil-build"
+                    UPDATE_COMMAND ""
+                    PATCH_COMMAND ""
+                    CONFIGURE_COMMAND ""
+                    BUILD_COMMAND ""
+                    INSTALL_COMMAND ""
+                    TEST_COMMAND ""
+                    LOG_DOWNLOAD ON)

cmake/googletest.CMakeLists.txt

@@ -17,16 +17,15 @@ cmake_minimum_required(VERSION 3.5)
 project(googletest-download NONE)
 
 include(ExternalProject)
-ExternalProject_Add(googletest_project
-	GIT_REPOSITORY https://github.com/abseil/googletest
-	GIT_TAG "master"
-	SOURCE_DIR "${CMAKE_BINARY_DIR}/googletest-src"
-	BINARY_DIR "${CMAKE_BINARY_DIR}/googletest-build"
-	UPDATE_COMMAND ""
-	PATCH_COMMAND ""
-	CONFIGURE_COMMAND ""
-	BUILD_COMMAND ""
-	INSTALL_COMMAND ""
-	TEST_COMMAND ""
-	LOG_DOWNLOAD ON
-)
+externalproject_add(googletest_project
+                    GIT_REPOSITORY https://github.com/abseil/googletest
+                    GIT_TAG "master"
+                    SOURCE_DIR "${CMAKE_BINARY_DIR}/googletest-src"
+                    BINARY_DIR "${CMAKE_BINARY_DIR}/googletest-build"
+                    UPDATE_COMMAND ""
+                    PATCH_COMMAND ""
+                    CONFIGURE_COMMAND ""
+                    BUILD_COMMAND ""
+                    INSTALL_COMMAND ""
+                    TEST_COMMAND ""
+                    LOG_DOWNLOAD ON)

cmake/prometheus-cpp.CMakeLists.txt

@@ -17,16 +17,15 @@ cmake_minimum_required(VERSION 3.5)
 project(prometheus-cpp-download NONE)
 
 include(ExternalProject)
-ExternalProject_Add(prometheus_cpp_project
-	GIT_REPOSITORY https://github.com/jupp0r/prometheus-cpp
-	GIT_TAG "master"
-	SOURCE_DIR "${CMAKE_BINARY_DIR}/prometheus-src"
-	BINARY_DIR "${CMAKE_BINARY_DIR}/prometheus-build"
-	UPDATE_COMMAND ""
-	PATCH_COMMAND ""
-	CONFIGURE_COMMAND ""
-	BUILD_COMMAND ""
-	INSTALL_COMMAND ""
-	TEST_COMMAND ""
-	LOG_DOWNLOAD ON
-)
+externalproject_add(prometheus_cpp_project
+                    GIT_REPOSITORY https://github.com/jupp0r/prometheus-cpp
+                    GIT_TAG "master"
+                    SOURCE_DIR "${CMAKE_BINARY_DIR}/prometheus-src"
+                    BINARY_DIR "${CMAKE_BINARY_DIR}/prometheus-build"
+                    UPDATE_COMMAND ""
+                    PATCH_COMMAND ""
+                    CONFIGURE_COMMAND ""
+                    BUILD_COMMAND ""
+                    INSTALL_COMMAND ""
+                    TEST_COMMAND ""
+                    LOG_DOWNLOAD ON)

tools/format.sh

@@ -20,7 +20,7 @@ if [[ ! -e tools/format.sh ]]; then
 fi
 set -e
 # Correct common miscapitalizations.
-FIND="find . -name .git -prune -o -name build -prune -o"
+FIND="find . -name .git -prune -o -name .build -prune -o"
 sed -i 's/Open[c]ensus/OpenCensus/g' $($FIND -type f -print)
 sed -i 's/Stack[D]river/Stackdriver/g' $($FIND -type f -print)
 # No trailing spaces.
@@ -29,17 +29,19 @@ sed -i 's/ \+$//' $($FIND -type f -print)
 CMD=clang-format
 $CMD -version
 $CMD -i -style=Google \
-  $($FIND -name '*.cc' -o -name '*.h' -print)
+  $($FIND -name '*.cc' -print -o -name '*.h' -print)
 if which buildifier >/dev/null; then
   echo "Running buildifier."
-  buildifier $($FIND -name WORKSPACE -o -name BUILD -o -name '*.bzl' -print)
+  buildifier $($FIND -name WORKSPACE -print -o -name BUILD -print -o \
+    -name '*.bzl' -print)
 else
   echo "Can't find buildifier. It can be installed with:"
   echo "  go get github.com/bazelbuild/buildtools/buildifier"
 fi
 if which cmake-format >/dev/null; then
   echo "Running cmake-format $(cmake-format --version 2>&1)."
-  cmake-format -i $($FIND -name '*CMakeLists.txt' -o -name '*.cmake' -print)
+  cmake-format -i $($FIND -name '*CMakeLists.txt' -print -o \
+    -name '*.cmake' -print)
 else
   echo "Can't find cmake-format. It can be installed with:"
   echo "  pip install --user cmake_format"

tools/zlib/BUILD

@@ -16,6 +16,6 @@
 
 cc_library(
     name = "z",
-    deps = ["@com_github_madler_zlib//:z"],
     visibility = ["//visibility:public"],
+    deps = ["@com_github_madler_zlib//:z"],
 )