From: Thomas Walker Lynch <eknp9n@reasoningtechnology.com>
Date: Mon, 9 Dec 2024 10:52:48 +0000 (+0000)
Subject: pencil updates for developer module
X-Git-Url: https://git.reasoningtechnology.com/style/static/git-logo.png?a=commitdiff_plain;h=35a6e8b934df719e58d094c482e3d7b5f0da8d30;p=Mosaic

pencil updates for developer module
---

diff --git a/developer/shell/Mosaic b/developer/shell/Mosaic
new file mode 100755
index 0000000..ba5b241
--- /dev/null
+++ b/developer/shell/Mosaic
@@ -0,0 +1,2 @@
+#!/bin/bash
+java com.ReasoningTechnology."Mosaic".Mosaic
diff --git "a/developer/tool\360\237\226\211/bash_wrapper_list" "b/developer/tool\360\237\226\211/bash_wrapper_list"
new file mode 100755
index 0000000..7f07215
--- /dev/null
+++ "b/developer/tool\360\237\226\211/bash_wrapper_list"
@@ -0,0 +1,15 @@
+#!/bin/env bash
+script_afp=$(realpath "${BASH_SOURCE[0]}")
+
+# input guards
+
+  env_must_be="developer/tool🖉/env"
+  if [ "$ENV" != "$env_must_be" ]; then
+    echo "$(script_fp):: error: must be run in the $env_must_be environment"
+    exit 1
+  fi
+
+  cd "$REPO_HOME"/developer
+
+# list of classes that have main calls and get bash wrappers
+echo Mosaic
diff --git "a/developer/tool\360\237\226\211/clean_build_directories" "b/developer/tool\360\237\226\211/clean_build_directories"
index b03a6a9..a32578f 100755
--- "a/developer/tool\360\237\226\211/clean_build_directories"
+++ "b/developer/tool\360\237\226\211/clean_build_directories"
@@ -2,9 +2,9 @@
 script_afp=$(realpath "${BASH_SOURCE[0]}")
 
 # Removes all files found in the build directories. It asks no questions as to
-# how or why the files got there. Be especially careful with the 'shell'
-# directory if you have authored scripts for release, add a `shell-leaf`
-# directory instead of putting them in `shell`.
+# how or why the files got there. Be especially careful with the 'bash'
+# directory if you have authored scripts for release, add a `bash🖉`
+# directory instead of putting them in `bash`.
 
 # input guards
   env_must_be="developer/tool🖉/env"
@@ -16,9 +16,12 @@ script_afp=$(realpath "${BASH_SOURCE[0]}")
 # remove files
   set -x
   cd "$REPO_HOME"/developer
-  rm_na -r scratchpad/*
+
+  # rm_na currently does not handle links correctly 
+  rm -r scratchpad/*
+
   rm_na jvm/*
-  rm_na shell/*
+  rm_na bash/*
   set +x
 
 echo "$(script_fn) done."
diff --git "a/developer/tool\360\237\226\211/clean_javac_output" "b/developer/tool\360\237\226\211/clean_javac_output"
index 5ebeb51..82835c7 100755
--- "a/developer/tool\360\237\226\211/clean_javac_output"
+++ "b/developer/tool\360\237\226\211/clean_javac_output"
@@ -3,7 +3,7 @@ script_afp=$(realpath "${BASH_SOURCE[0]}")
 # remove  all files created by make's call to `javac`
 
 # input guards
-  env_must_be="developer/tool/env"
+  env_must_be="developer/tool🖉/env"
   if [ "$ENV" != "$env_must_be" ]; then
     echo "$(script_fp):: error: must be run in the $env_must_be environment"
     exit 1
diff --git "a/developer/tool\360\237\226\211/clean_make_output" "b/developer/tool\360\237\226\211/clean_make_output"
index a7c6ebf..094552b 100755
--- "a/developer/tool\360\237\226\211/clean_make_output"
+++ "b/developer/tool\360\237\226\211/clean_make_output"
@@ -4,7 +4,7 @@ script_afp=$(realpath "${BASH_SOURCE[0]}")
 
 # input guards
 
-  env_must_be="developer/tool/env"
+  env_must_be="developer/tool🖉/env"
   if [ "$ENV" != "$env_must_be" ]; then
     echo "$(script_fp):: error: must be run in the $env_must_be environment"
     exit 1
@@ -12,7 +12,7 @@ script_afp=$(realpath "${BASH_SOURCE[0]}")
 
 # wrappers to clean (this list space separated list will grow)
 
-  wrapper=$(shell_wrapper_list)
+  wrapper=$(bash_wrapper_list)
 
 # remove files
 
@@ -20,7 +20,7 @@ script_afp=$(realpath "${BASH_SOURCE[0]}")
   cd "$REPO_HOME"/developer
   rm -r scratchpad/com/ReasoningTechnology/"$PROJECT"
   rm jvm/"$PROJECT".jar
-  rm shell/{$wrapper}
+  rm bash/{$wrapper}
   set +x
 
 echo "$(script_fn) done."
diff --git "a/developer/tool\360\237\226\211/clean_release" "b/developer/tool\360\237\226\211/clean_release"
index a33f19a..8744730 100755
--- "a/developer/tool\360\237\226\211/clean_release"
+++ "b/developer/tool\360\237\226\211/clean_release"
@@ -4,7 +4,7 @@ script_afp=$(realpath "${BASH_SOURCE[0]}")
 
 # input guards
 
-  env_must_be="developer/tool/env"
+  env_must_be="developer/tool🖉/env"
   if [ "$ENV" != "$env_must_be" ]; then
     echo "$(script_fp):: error: must be run in the $env_must_be environment"
     exit 1
@@ -13,14 +13,14 @@ script_afp=$(realpath "${BASH_SOURCE[0]}")
 # things to clean
 
   release_dir="$REPO_HOME"/release
-  wrapper=$(shell_wrapper_list)
+  wrapper=$(bash_wrapper_list)
 
 # remove files
   set -x
   cd "$REPO_HOME"/developer
   rm -r scratchpad/com/ReasoningTechnology/"$PROJECT"
   rm jvm/"$PROJECT".jar
-  rm shell/{$wrapper}
+  rm bash/{$wrapper}
   rm -f "$release_dir"/"$PROJECT".jar
   rm -f "$release_dir"/{$wrapper}
   set +x
diff --git "a/developer/tool\360\237\226\211/distribute_source" "b/developer/tool\360\237\226\211/distribute_source"
index faf844d..ca5c9eb 100755
--- "a/developer/tool\360\237\226\211/distribute_source"
+++ "b/developer/tool\360\237\226\211/distribute_source"
@@ -5,7 +5,7 @@ script_afp=$(realpath "${BASH_SOURCE[0]}")
 
 # Input guards
 
-  env_must_be="developer/tool/env"
+  env_must_be="developer/tool🖉/env"
   if [ "$ENV" != "$env_must_be" ]; then
     echo "$(script_fp):: error: must be run in the $env_must_be environment"
     exit 1
@@ -20,7 +20,7 @@ script_afp=$(realpath "${BASH_SOURCE[0]}")
   echo "Package: $package_tree"
 
   echo -n "Linking:"
-  for source_file in javac/*.java; do
+  for source_file in javac🖉/*.java; do
     echo -n " $(basename "$source_file")"
     link_target="$package_tree/$(basename "$source_file")"
     if [ ! -L "$link_target" ]; then
diff --git "a/developer/tool\360\237\226\211/make" "b/developer/tool\360\237\226\211/make"
index 9bc03e2..64602b6 100755
--- "a/developer/tool\360\237\226\211/make"
+++ "b/developer/tool\360\237\226\211/make"
@@ -13,7 +13,7 @@ script_afp=$(realpath "${BASH_SOURCE[0]}")
 
 echo "Compiling files..."
   set -x
-  javac -g -d scratchpad javac/*.java
+  javac -g -d scratchpad javac🖉/*.java
   set +x
   if [ $? -ne 0 ]; then
     echo "Compilation failed."
@@ -33,16 +33,16 @@ echo "Creating JAR file..."
     exit 1
   fi
 
-echo "Creating shell wrappers..."
-  mkdir -p shell
+echo "Creating bash wrappers..."
+  mkdir -p bash
   # wrapper is a space separated list
-  wrapper=$(shell_wrapper_list)
+  wrapper=$(bash_wrapper_list)
   for file in $wrapper;do
-    cat > shell/$file << EOL
+    cat > bash/$file << EOL
 #!/bin/bash
 java com.ReasoningTechnology."$PROJECT".$file
 EOL
-    chmod +x shell/$file
+    chmod +x bash/$file
   done
 
 echo "$(script_fp) done."
diff --git "a/developer/tool\360\237\226\211/release" "b/developer/tool\360\237\226\211/release"
index 43d2d9f..81966ad 100755
--- "a/developer/tool\360\237\226\211/release"
+++ "b/developer/tool\360\237\226\211/release"
@@ -17,9 +17,9 @@ script_afp=$(realpath "${BASH_SOURCE[0]}")
 # script local environment
 
   release_dir="$REPO_HOME/release"
-  shell_dir="$REPO_HOME/developer/shell"
+  bash_dir="$REPO_HOME/developer/bash"
   project_jar_fp="$REPO_HOME/developer/jvm/"$PROJECT".jar"
-  wrapper=$(shell_wrapper_list)
+  wrapper=$(bash_wrapper_list)
 
 
   if [ ! -d "$release_dir" ]; then
@@ -54,9 +54,9 @@ script_afp=$(realpath "${BASH_SOURCE[0]}")
   # Install the JAR file
   install_file "$project_jar_fp" "$release_dir" "ug+r"
 
-  # Install shell wrappers
+  # Install bash wrappers
   for wrapper in $wrapper; do
-    install_file "$shell_dir/$wrapper" "$release_dir" "ug+r+x"
+    install_file "$bash_dir/$wrapper" "$release_dir" "ug+r+x"
   done
 
 echo "$(script_fp) done."
diff --git "a/developer/tool\360\237\226\211/shell_wrapper_list" "b/developer/tool\360\237\226\211/shell_wrapper_list"
deleted file mode 100755
index 22e5ed2..0000000
--- "a/developer/tool\360\237\226\211/shell_wrapper_list"
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/env bash
-script_afp=$(realpath "${BASH_SOURCE[0]}")
-
-# input guards
-
-  env_must_be="developer/tool🖉/env"
-  if [ "$ENV" != "$env_must_be" ]; then
-    echo "$(script_fp):: error: must be run in the $env_must_be environment"
-    exit 1
-  fi
-
-  cd "$REPO_HOME"/developer
-
-# list of classes that have main calls and get shell wrappers
-echo Mosaic
diff --git a/release/Mosaic.jar b/release/Mosaic.jar
index a0efc57..098f581 100644
Binary files a/release/Mosaic.jar and b/release/Mosaic.jar differ
diff --git a/tester/jvm/Test_Mosaic.jar b/tester/jvm/Test_Mosaic.jar
new file mode 100644
index 0000000..cc8fcf3
Binary files /dev/null and b/tester/jvm/Test_Mosaic.jar differ
diff --git "a/tool_shared/document\360\237\226\211/install.txt" "b/tool_shared/document\360\237\226\211/install.txt"
index fcc54b2..637e543 100644
--- "a/tool_shared/document\360\237\226\211/install.txt"
+++ "b/tool_shared/document\360\237\226\211/install.txt"
@@ -10,17 +10,28 @@ the project and source the env_administrator environment.
   source env_administrator
 
 ----------------------------------------
-RT-project-share 
+General notes on third party tools
 
-This pulls in documents and commonly used scripts. The project has symbolic links
-into RT-icommon, so this is not optional.
+A project will have paths and/or symbolic links pointing into the third party
+tools, so as to make use of them.  
 
-If the project is installed on you system, perhaps so that it can be shared
-with many projects without duplicating it:
+The contents of the third_party directory is .gititnored, though the upstream
+directory has its own gitignore.
+
+If you already have the project installed, perhaps because you
+are working on it, then a new install is not needed, rather the
+existing install can be linked, for example for RT-project-share:
 
   ln -snf ~/RT-project-share "$REPO_HOME"/tool_shared/third_party
 
-If you want a local install:
+Otherwise, follow the directions below to make a local
+install of the third party tool.
+
+----------------------------------------
+RT-project-share 
+
+This pulls in documents and commonly used scripts. The project has symbolic links
+into RT-icommon, so this is not optional.
 
   cd "$REPO_HOME/tool_shared/third_party/"
   git clone https://github.com/Thomas-Walker-Lynch/RT-project-share.git