Minor garden cleanups

bazel.rc

@@ -11,13 +11,10 @@ build --force_pic
 build --strip=never
 build --strict_system_includes
 build --workspace_status_command=./bazel/workspace/workspace-status.bash
-build --define enable_ifaddrs=true
 
 build --fission=dbg
 build --features=per_object_debug_info
 
-test --define enable_ifaddrs=true
-
 # -- Options for explicitly using GCC.
 common:gcc --repo_env=CC=gcc
 common:gcc --repo_env=CXX=g++

example/bazel.repos

@@ -22,7 +22,7 @@ repositories:
   msgs:
     type: git
     url: https://github.com/gazebosim/gz-msgs
-    version: gz-msgs9
+    version: mjcarroll/garden_bazel
   physics:
     type: git
     url: https://github.com/gazebosim/gz-physics

skylark/cmake_configure_file.bzl

@@ -38,7 +38,7 @@ _cmake_configure_file_gen = rule(
         "undefines": attr.string_list(),
         "cmakelists": attr.label_list(allow_files = True),
         "cmake_configure_file_py": attr.label(
-            cfg = "host",
+            cfg = "exec",
             executable = True,
             default = Label("@gz//bazel/skylark:cmake_configure_file"),
         ),

skylark/gz_configure_file.bzl

@@ -42,7 +42,7 @@ _gz_configure_file_gen = rule(
         "undefines": attr.string_list(),
         "cmakelists": attr.label_list(allow_files = True),
         "gz_configure_file_py": attr.label(
-            cfg = "host",
+            cfg = "exec",
             executable = True,
             default = Label("@gz//bazel/skylark:gz_configure_file"),
         ),

skylark/gz_configure_file.py

@@ -39,18 +39,19 @@ def _transform(line, definitions):
         blank, maybe01, var, rest, newline = match.groups()
         defined = definitions.get(var) is not None
         if maybe01:
-            return blank + '#define ' + var + [' 0', ' 1'][defined] + newline
+            return blank + '#define ' + str(var) + [' 0', ' 1'][defined] + newline
         elif defined:
-            line = blank + '#define ' + var + rest + newline
+            line = blank + '#define ' + str(var) + rest + newline
         else:
-            return blank + '/* #undef ' + var + ' */' + newline
+            return blank + '/* #undef ' + str(var) + ' */' + newline
 
     # Replace variable substitutions.
     while True:
         match = _varsubst.match(line)
         if not match:
             break
         before, xvarx, after, newline = match.groups()
+        var = ''
         if xvarx[0] == '$':
             assert len(xvarx) >= 4
             assert xvarx[1] == '{'
@@ -60,14 +61,15 @@ def _transform(line, definitions):
             assert len(xvarx) >= 3
             assert xvarx[-1] == '@'
             var = xvarx[1:-1]
-        assert len(var) > 0
+        assert var
 
         if var not in definitions:
             raise KeyError('Missing definition for ' + var)
         value = definitions.get(var)
+
         if value is None:
             value = ''
-        line = before + value + after + newline
+        line = before + str(value) + after + newline
 
     return line
 
@@ -189,4 +191,3 @@ def main():
 
 if __name__ == "__main__":
     main()
-

workspace/workspace-status.bash

@@ -12,9 +12,12 @@ LIBS=(
   plugin
   rendering
   sensors
+  sim
+  tools
   transport
   utils
-  sdformat)
+  sdformat
+)
 
 for LIB in "${LIBS[@]}"
 do