[refactor] Use common naming convention.

NINJA_subgraph.py and NINJA-steps.sh.

build/native-steps.sh → build/NINJA-steps.sh

@@ -5,7 +5,7 @@
 # Also some non-Ninja wrappers.
 #
 # Usage:
-#   build/native-steps.sh <function name>
+#   build/NINJA-steps.sh <function name>
 
 set -o nounset
 set -o errexit
@@ -225,6 +225,6 @@ strip_() {
 }
 
 # test/cpp-unit.sh sources this
-if test $(basename $0) = 'native-steps.sh'; then
+if test $(basename $0) = 'NINJA-steps.sh'; then
   "$@"
 fi

build/NINJA_config.py

@@ -133,39 +133,39 @@ def NinjaGraph(n, u):
   # Preprocess one translation unit
   n.rule('preprocess',
          # compile_one detects the _build/preprocessed path
-         command='build/native-steps.sh compile_one $compiler $variant $in $out',
+         command='build/NINJA-steps.sh compile_one $compiler $variant $in $out',
          description='compile_one $compiler $variant $in $out')
   n.newline()
 
   # Preprocess one translation unit
   n.rule('line_count',
-         command='build/native-steps.sh line_count $out $in',
+         command='build/NINJA-steps.sh line_count $out $in',
          description='line_count $out $in')
   n.newline()
 
   # 'together' build
   n.rule('compile_and_link',
          # multiple outputs
-         command='build/native-steps.sh compile_and_link $compiler $variant $out $in',
+         command='build/NINJA-steps.sh compile_and_link $compiler $variant $out $in',
          description='compile_and_link $compiler $variant $out $in')
   n.newline()
 
   # Compile one translation unit
   n.rule('compile_one',
-         command='build/native-steps.sh compile_one $compiler $variant $in $out $out.d',
+         command='build/NINJA-steps.sh compile_one $compiler $variant $in $out $out.d',
          depfile='$out.d',
          description='compile_one $compiler $variant $in $out')
   n.newline()
 
   # Link objects together
   n.rule('link',
-         command='build/native-steps.sh link $compiler $variant $out $in',
+         command='build/NINJA-steps.sh link $compiler $variant $out $in',
          description='link $compiler $variant $out $in')
   n.newline()
 
   # 1 input and 2 outputs
   n.rule('strip',
-         command='build/native-steps.sh strip_ $in $out',
+         command='build/NINJA-steps.sh strip_ $in $out',
          description='strip $in $out')
   n.newline()
 
@@ -281,7 +281,7 @@ def ShellFunctions(f, argv0):
 # Could run with /bin/sh, but use bash for now, bceause dash has bad errors messages!
 #!/bin/sh
 
-. build/native-steps.sh
+. build/NINJA-steps.sh
 
 main() {
   ### Compile oil-native into _bin/$compiler-$variant-sh/ (not with ninja)

mycpp/build-steps.sh → mycpp/NINJA-steps.sh

@@ -3,11 +3,7 @@
 # Build steps invoked by Ninja.
 #
 # Usage:
-#   ./build-steps.sh <function name>
-#
-# TODO: build/actions.sh should be renamed build/build-steps.sh?  "actions"
-# implies a side effect, where as "steps" largely know their outputs an outputs
-# largely
+#   mycpp/NINJA-steps.sh <function name>
 
 set -o nounset
 set -o pipefail
@@ -129,7 +125,7 @@ compile() {
   # Note: needed -lstdc++ for 'operator new', which we're no longer using.  But
   # probably exceptions too.
 
-  set -x
+  #set -x
   $CXX -o $out $flags -I $REPO_ROOT "$@" -lstdc++
 }
 

mycpp/NINJA_subgraph.py

@@ -1,14 +1,14 @@
 #!/usr/bin/env python2
 """
-mycpp/build_graph.py
+mycpp/NINJA_subgraph.py
 
 This is a library invoked by build/native_graph.py.
 
 Code Layout:
 
   mycpp/
-    build_graph.py  # This file describes dependencies programmatically
-    build-steps.sh  # Invoked by Ninja rules
+    NINJA_subgraph.py  # This file describes dependencies programmatically
+    NINJA-steps.sh     # Invoked by Ninja rules
 
     build.sh        # wrappers invoked by the Toil and devtools/release.sh
 
@@ -185,46 +185,46 @@ def NinjaGraph(n, u):
          description='touch $out')
   n.newline()
   n.rule('asdl-mypy',
-         command='mycpp/build-steps.sh asdl-mypy $in $out',
+         command='mycpp/NINJA-steps.sh asdl-mypy $in $out',
          description='asdl-mypy $in $out')
   n.newline()
   n.rule('asdl-cpp',
-         command='mycpp/build-steps.sh asdl-cpp $in $out_prefix',
+         command='mycpp/NINJA-steps.sh asdl-cpp $in $out_prefix',
          description='asdl-cpp $in $out_prefix')
   n.newline()
   n.rule('translate',
-         command='mycpp/build-steps.sh translate $out $in',
+         command='mycpp/NINJA-steps.sh translate $out $in',
          description='translate $out $in')
   n.newline()
   n.rule('wrap-cc',
-         command='mycpp/build-steps.sh wrap-cc $name $in $preamble_path $out',
+         command='mycpp/NINJA-steps.sh wrap-cc $name $in $preamble_path $out',
          description='wrap-cc $name $in $preamble_path $out')
   n.newline()
   n.rule('compile',
          # note: $in can be MULTIPLE files, shell-quoted
-         command='mycpp/build-steps.sh compile $variant $out $more_cxx_flags $in',
+         command='mycpp/NINJA-steps.sh compile $variant $out $more_cxx_flags $in',
          description='compile $variant $out $more_cxx_flags $in')
   n.newline()
   n.rule('task',
          # note: $out can be MULTIPLE FILES, shell-quoted
-         command='mycpp/build-steps.sh task $in $out',
+         command='mycpp/NINJA-steps.sh task $in $out',
          description='task $in $out')
   n.newline()
   n.rule('example-task',
          # note: $out can be MULTIPLE FILES, shell-quoted
-         command='mycpp/build-steps.sh example-task $name $impl $bin $out',
+         command='mycpp/NINJA-steps.sh example-task $name $impl $bin $out',
          description='example-task $name $impl $bin $out')
   n.newline()
   n.rule('typecheck',
-         command='mycpp/build-steps.sh typecheck $main_py $out $skip_imports',
+         command='mycpp/NINJA-steps.sh typecheck $main_py $out $skip_imports',
          description='typecheck $main_py $out $skip_imports')
   n.newline()
   n.rule('logs-equal',
-         command='mycpp/build-steps.sh logs-equal $out $in',
+         command='mycpp/NINJA-steps.sh logs-equal $out $in',
          description='logs-equal $out $in')
   n.newline()
   n.rule('benchmark-table',
-         command='mycpp/build-steps.sh benchmark-table $out $in',
+         command='mycpp/NINJA-steps.sh benchmark-table $out $in',
          description='benchmark-table $out $in')
   n.newline()
 

mycpp/examples.sh

@@ -1,7 +1,7 @@
 # examples.sh: Hooks for specific files
 
 # COPIED FROM DEFUNCT run.sh.  Because some examples require it.  NOT
-# TESTED.  TODO: Fold this into Ninja's build-steps.sh.
+# TESTED.  TODO: Delete after it runs under Ninja.
 
 # -I with ASDL files.
 compile-with-asdl() {

test/cpp-unit.sh

@@ -9,7 +9,7 @@ set -o nounset
 set -o pipefail
 set -o errexit
 
-source build/native-steps.sh  # for compile_and_link function
+source build/NINJA-steps.sh  # for compile_and_link function
 
 # https://github.com/google/sanitizers/wiki/AddressSanitizerLeakSanitizer
 export ASAN_OPTIONS='detect_leaks=0'
@@ -28,7 +28,11 @@ readonly UNIT_TESTS_SRC=(
     mycpp/mylib.cc  # TODO: port to mylib2!
 )
 
-# TODO: fold these two variants into Ninja
+# Note: It would be nice to fold these 2 variants into Ninja, but we don't have
+# fine-grained dependencies for say _build/cpp/arg_types.cc and
+# cpp/frontend_flag_spec.cc.
+#
+# Ditto with the tests in asdl/test.sh.
 
 cpp-unit-tests-asan() {
   ### Run unit tests in the cpp/ dir
@@ -51,8 +55,6 @@ cpp-unit-tests() {
     "${UNIT_TESTS_SRC[@]}" \
     cpp/dumb_alloc.cc
 
-  #gdb --args $bin "$@"
-
   $bin "$@"
 }