From 567f3ce3668cc050498387b5e221b7ea4bf1badd Mon Sep 17 00:00:00 2001 From: Chris Koeritz Date: Fri, 23 Sep 2016 22:48:46 -0400 Subject: [PATCH] minor updates for naming. --- nucleus/library/tests_filesystem/test_directory_tree.cpp | 2 +- scripts/clam/cpp/rebuild_oldies.sh | 2 +- scripts/clam/cpp/rules.def | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nucleus/library/tests_filesystem/test_directory_tree.cpp b/nucleus/library/tests_filesystem/test_directory_tree.cpp index d6136bec..4a5f588d 100644 --- a/nucleus/library/tests_filesystem/test_directory_tree.cpp +++ b/nucleus/library/tests_filesystem/test_directory_tree.cpp @@ -216,7 +216,7 @@ LOG("what happened with that? did it work?"); //hmmm: plug in real recursive delete here instead. basis::un_int kid; -launch_process::run("/usr/bin/rm", astring("-rf ") + tmpdir.raw(), launch_process::AWAIT_APP_EXIT, kid); +launch_process::run("/bin/rm", astring("-rf ") + tmpdir.raw(), launch_process::AWAIT_APP_EXIT, kid); ASSERT_FALSE(kid, "removing temporary files after test"); } diff --git a/scripts/clam/cpp/rebuild_oldies.sh b/scripts/clam/cpp/rebuild_oldies.sh index 02d33535..fa3b4003 100755 --- a/scripts/clam/cpp/rebuild_oldies.sh +++ b/scripts/clam/cpp/rebuild_oldies.sh @@ -1,6 +1,6 @@ #!/bin/bash if [ -f "$BUILD_LIST_FILE" ]; then - echo Compiling [$(cat $BUILD_LIST_FILE | while read input_text; do echo $(basename $input_text); done )] + echo Compiling Objects [$(cat $BUILD_LIST_FILE | while read input_text; do echo $(basename $input_text); done )] rm -f $(cat $BUILD_WHACK_FILE) #echo got line to run: $* eval "${@}" diff --git a/scripts/clam/cpp/rules.def b/scripts/clam/cpp/rules.def index 4221047d..ad4c4a2f 100644 --- a/scripts/clam/cpp/rules.def +++ b/scripts/clam/cpp/rules.def @@ -430,7 +430,7 @@ endif $(OBJECT_DIR)/%.obj: $(CURRENT_DIR)/%.cpp ifeq "$(NO_COMPILE)" "" ifneq "$(COMPILER)" "VISUAL_CPP" - @echo Compiling [$(notdir $@)] + @echo Compiling Object [$(notdir $@)] $(HIDESH)-c 'if [ ! -d $(@D) ]; then mkdir $(@D); fi' $(CATCHER)$(CC) $(COMPILER_FLAGS) -c $< $(OBJECT_NAME_FLAG)$@ else @@ -447,7 +447,7 @@ endif $(OBJECT_DIR)/%.obj: $(CURRENT_DIR)/%.c ifeq "$(NO_COMPILE)" "" ifneq "$(COMPILER)" "VISUAL_CPP" - @echo Compiling [$(notdir $@)] + @echo Compiling Object [$(notdir $@)] $(HIDESH)-c 'if [ ! -d $(@D) ]; then mkdir $(@D); fi' $(CATCHER)$(CC) $(COMPILER_FLAGS) -c $< $(OBJECT_NAME_FLAG)$@ else -- 2.34.1