Use arcat instead of jarcat (#22)

Invoke the jarcat tool with its new name, arcat.

Co-authored-by: Chris Novakovic <[email protected]>

Author: samwestmoreland

Diff for: build_defs/cc.build_defs

@@ -164,13 +164,13 @@ def cc_library(name:str, srcs:list=[], hdrs:list=[], private_hdrs:list=[], deps:
             tag = 'a',
             srcs = {'srcs': a_rules},
             outs = [out],
-            cmd = '"$TOOLS_JARCAT" ar --combine && "$TOOLS_AR" s "$OUT"',
+            cmd = '"$TOOLS_ARCAT" ar --combine && "$TOOLS_AR" s "$OUT"',
             building_description = 'Archiving...',
             test_only = test_only,
             labels = labels,
             output_is_complete = True,
             tools = {
-                'jarcat': [CONFIG.JARCAT_TOOL],
+                'arcat': [CONFIG.ARCAT_TOOL],
                 'ar': [CONFIG.CC.AR_TOOL],
             },
         )
@@ -355,7 +355,7 @@ def cc_static_library(name:str, srcs:list=[], hdrs:list=[], compiler_flags:list&
         name = name,
         deps = deps,
         outs = [out],
-        cmd = '"$TOOLS_JARCAT" ar --find && "$TOOLS_AR" s "$OUT"',
+        cmd = '"$TOOLS_ARCAT" ar --find && "$TOOLS_AR" s "$OUT"',
         needs_transitive_deps = True,
         output_is_complete = True,
         visibility = visibility,
@@ -364,7 +364,7 @@ def cc_static_library(name:str, srcs:list=[], hdrs:list=[], compiler_flags:list&
         provides = provides,
         requires = ['cc'],
         tools = {
-            'jarcat': [CONFIG.JARCAT_TOOL],
+            'arcat': [CONFIG.ARCAT_TOOL],
             'ar': [CONFIG.CC.AR_TOOL],
         },
         labels = labels,
@@ -724,7 +724,7 @@ def _library_cmds(c, compiler_flags, pkg_config_libs, pkg_config_cflags, extra_f
     opt_flags = _build_flags(compiler_flags, pkg_config_libs, pkg_config_cflags, c=c)
     cmd_template = '$TOOLS_CC -c -I . ${SRCS_SRCS} %s %s'
     if archive:
-        cmd_template += ' && "$TOOLS_JARCAT" ar -r && "$TOOLS_AR" s "$OUT"'
+        cmd_template += ' && "$TOOLS_ARCAT" ar -r && "$TOOLS_AR" s "$OUT"'
     cmds = {
         'dbg': cmd_template % (dbg_flags, extra_flags),
         'opt': cmd_template % (opt_flags, extra_flags),
@@ -733,7 +733,7 @@ def _library_cmds(c, compiler_flags, pkg_config_libs, pkg_config_cflags, extra_f
         cmds['cover'] = cmd_template % (dbg_flags + _COVERAGE_FLAGS, extra_flags)
     return cmds, {
         'cc': [CONFIG.CC.CC_TOOL if c else CONFIG.CC.CPP_TOOL],
-        'jarcat': [CONFIG.JARCAT_TOOL if archive else None],
+        'arcat': [CONFIG.ARCAT_TOOL if archive else None],
         'ar': [CONFIG.CC.AR_TOOL if archive else None],
     }
 

Diff for: build_defs/cc_embed_binary.build_defs

@@ -50,7 +50,7 @@ def cc_embed_binary(name:str, src:str, deps:list=[], visibility:list=None,
         test_only = test_only,
     )
 
-    tools = {'jarcat': [CONFIG.JARCAT_TOOL], 'ar': [CONFIG.AR_TOOL]}
+    tools = {'arcat': [CONFIG.ARCAT_TOOL], 'ar': [CONFIG.AR_TOOL]}
     if darwin:
         # OSX's ld doesn't support '--format binary', and this is the least fiddly
         # alternative. Requiring an additional tool is a bit suboptimal but probably
@@ -59,12 +59,12 @@ def cc_embed_binary(name:str, src:str, deps:list=[], visibility:list=None,
             'export ENCODED_FILENAME=${SRCS//[\\/\\.]/_}',
             f'echo "{_CC_DARWIN_ASM_CONTENTS}" > embedded.asm',
             '$TOOLS_ASM -fmacho64 embedded.asm -o ${OUTS/.a/.o}',
-            '$TOOLS_JARCAT ar --srcs ${OUTS/.a/.o}',
+            '$TOOLS_ARCAT ar --srcs ${OUTS/.a/.o}',
             '$TOOLS_AR s $OUTS',
         ])
         tools['asm'] = [CONFIG.CC.ASM_TOOL]
     else:
-        cmd = '$TOOLS_LD -r --format binary %s -o ${OUTS/.a/.o} $SRC && $TOOLS_JARCAT ar --srcs ${OUTS/.a/.o} && $TOOLS_AR s $OUTS' % CONFIG.DEFAULT_LDFLAGS
+        cmd = '$TOOLS_LD -r --format binary %s -o ${OUTS/.a/.o} $SRC && $TOOLS_ARCAT ar --srcs ${OUTS/.a/.o} && $TOOLS_AR s $OUTS' % CONFIG.DEFAULT_LDFLAGS
         tools['ld'] = [CONFIG.LD_TOOL]
 
     lib_rule = build_rule(