fixations continue on upgrader

found it can fix old application shell constructor calls.

diff --git a/nucleus/library/tests_filesystem/test_dirtree_fcopy.cpp b/nucleus/library/tests_filesystem/test_dirtree_fcopy.cpp
index 74e3dd35ecdb2d452f6507dd725b852555638dd9..744b446d06ef7c86d28aea121c9f6f6c5445df9f 100644 (file)
--- a/nucleus/library/tests_filesystem/test_dirtree_fcopy.cpp
+++ b/nucleus/library/tests_filesystem/test_dirtree_fcopy.cpp
@@ -42,12 +42,12 @@ int test_fcopy::execute()
 {
   FUNCDEF("execute");
 
-  if (__argc < 3)
+  if (application::_global_argc < 3)
     non_continuable_error(class_name(), "command line", "this program needs two "
           "parameters:\na directory for the source and one for the target.");
 
-  astring source_dir = __argv[1];
-  astring target_dir = __argv[2];
+  astring source_dir = application::_global_argv[1];
+  astring target_dir = application::_global_argv[2];
 
   // read the source location.
   log(astring("Scanning source tree at \"") + source_dir + "\"");
@@ -75,10 +75,10 @@ int test_fcopy::execute()
 
   astring source_start;
   astring target_start;
-  if (__argc > 3)
-    source_start = __argv[3];
-  if (__argc > 4)
-    target_start = __argv[4];
+  if (application::_global_argc > 3)
+    source_start = application::_global_argv[3];
+  if (application::_global_argc > 4)
+    target_start = application::_global_argv[4];
 
   LOG("comparing the two trees.");
   filename_list diffs;

diff --git a/scripts/buildor/upgrade_hoople_to_feistymeow.sh b/scripts/buildor/upgrade_hoople_to_feistymeow.sh
index 6c9159f2fb43d6eb9fe88d8610b5917cb44fcf50..899974c8bab2c7a4225905e7634fd46aa8ae130c 100644 (file)
--- a/scripts/buildor/upgrade_hoople_to_feistymeow.sh
+++ b/scripts/buildor/upgrade_hoople_to_feistymeow.sh
@@ -150,6 +150,7 @@ standards and usages."
     | sed -e 's/\([^_]\)tokenizer/\1variable_tokenizer/g' \
     | sed -e 's/__argv/application::_global_argv/g' \
     | sed -e 's/__argc/application::_global_argc/g' \
+    | sed -e 's/application_shell(static_class_name())/application_shell()/g' \
     | sed -e 's/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/[\/]*/\/\/\/\/\/\/\/\/\/\/\/\/\/\//g' \
     >"$tempfile"