Incorporate feedback and cleanups

Michael Carroll · Michael Carroll · commit 18b35a03a604 · 2020-10-23T11:15:13.000-05:00
Signed-off-by: Michael Carroll &lt;michael@openrobotics.org&gt;
diff --git a/BUILD.bazel b/BUILD.bazel
@@ -1,45 +1,45 @@
 load(
-    "//ign_bazel:cmake_configure_file.bzl",
+    "//ign_bazel:build_defs.bzl",
+    "IGNITION_VISIBILITY",
     "cmake_configure_file",
-)
-load(
-    "//ign_bazel:generate_include_header.bzl",
     "generate_include_header",
-)
-load(
-    "//ign_bazel:ign_export_header.bzl",
+    "ign_config_header",
     "ign_export_header",
 )
 
-package(default_visibility = ["//visibility:public"])
+package(
+    default_visibility = IGNITION_VISIBILITY,
+    features = [
+        "-parse_headers",
+        "-layering_check",
+    ],
+)
+
+licenses(["notice"])
+
+exports_files(["LICENSE"])
 
 PROJECT_NAME = "ignition-math"
+
 PROJECT_MAJOR = 6
-PROJECT_MINOR = 4
+
+PROJECT_MINOR = 6
+
 PROJECT_PATCH = 0
 
 # Generates config.hh based on the version numbers in CMake code.
-cmake_configure_file(
+ign_config_header(
     name = "config",
     src = "include/ignition/math/config.hh.in",
-    out = "include/ignition/math/config.hh",
     cmakelists = ["CMakeLists.txt"],
-    defines = [
-        "PROJECT_VERSION_MAJOR=%d" % (PROJECT_MAJOR),
-        "PROJECT_MAJOR_VERSION=%d" % (PROJECT_MAJOR),
-        "PROJECT_MINOR_VERSION=%d" % (PROJECT_MINOR),
-        "PROJECT_PATCH_VERSION=%d" % (PROJECT_PATCH),
-        "PROJECT_VERSION=%d.%d" % (PROJECT_MAJOR, PROJECT_MINOR),
-        "PROJECT_VERSION_FULL=%d.%d.%d" % (PROJECT_MAJOR, PROJECT_MINOR, PROJECT_PATCH),  # noqa
-        "PROJECT_NAME_NO_VERSION=%s" % (PROJECT_NAME),
-    ],
-    visibility = ["//visibility:private"],
+    project_name = "ignition-math",
+    project_version = (PROJECT_MAJOR, PROJECT_MINOR, PROJECT_PATCH),
 )
 
 ign_export_header(
     name = "include/ignition/math/Export.hh",
-    lib_name = "ignition-math",
     export_base = "IGNITION_MATH",
+    lib_name = "ignition-math",
     visibility = ["//visibility:private"],
 )
 
@@ -119,8 +119,8 @@ public_headers = public_headers_no_gen + [
     "include/ignition/math.hh",
 ]
 
-cc_binary(
-    name = "libignition-math6.so",
+cc_library(
+    name = "ign_math",
     srcs = [
         "src/Angle.cc",
         "src/AxisAlignedBox.cc",
@@ -144,27 +144,28 @@ cc_binary(
         "src/Stopwatch.cc",
         "src/Temperature.cc",
         "src/Vector3Stats.cc",
-    ] + private_headers + public_headers,
+    ] + private_headers,
+    hdrs = public_headers,
     includes = ["include"],
-    linkopts = ["-Wl,-soname,libignition-math6.so"],
-    linkshared = True,
-    visibility = [],
 )
 
-cc_library(
-    name = "ign_math",
-    srcs = ["libignition-math6.so"],
-    hdrs = public_headers,
+# use shared library only when absolutely needd
+cc_binary(
+    name = "libignition-math6.so",
     includes = ["include"],
-    visibility = ["//visibility:public"],
+    linkopts = ["-Wl,-soname,libignition-math6.so"],
+    linkshared = True,
+    deps = [
+        ":ign_math",
+    ],
 )
 
 [cc_test(
     name = src.replace("/", "_").replace(".cc", "").replace("src_", ""),
     srcs = [src],
     deps = [
         ":ign_math",
-        "@gtest//:gtest",
+        "@gtest",
         "@gtest//:gtest_main",
     ],
 ) for src in glob(
@@ -173,4 +174,3 @@ cc_library(
         "src/graph/*_TEST.cc",
     ],
 )]
-
diff --git a/eigen3/BUILD.bazel b/eigen3/BUILD.bazel
@@ -1,3 +1,20 @@
+load(
+    "//ign_bazel:build_defs.bzl",
+    "IGNITION_ROOT",
+    "IGNITION_VISIBILITY",
+)
+
+package(
+    default_visibility = IGNITION_VISIBILITY,
+    features = [
+        "-layering_check",
+    ],
+)
+
+licenses(["notice"])
+
+exports_files(["LICENSE"])
+
 public_headers = [
     "include/ignition/math/eigen3/Conversions.hh",
 ]
@@ -6,25 +23,23 @@ cc_library(
     name = "eigen3",
     srcs = public_headers,
     hdrs = public_headers,
+    includes = ["include"],
     deps = [
         "@eigen3",
-        "//ign_math",
+        IGNITION_ROOT + "ign_math",
     ],
-    includes = ["include"],
-    visibility = ["//visibility:public"]
 )
 
 [cc_test(
     name = src.replace("/", "_").replace(".cc", "").replace("src_", ""),
     srcs = [src],
     deps = [
         ":eigen3",
-        "@gtest//:gtest",
+        "@gtest",
         "@gtest//:gtest_main",
     ],
 ) for src in glob(
     [
         "src/*_TEST.cc",
     ],
 )]
-
