Further fixes to deployment packaging

Author: FUDCo

Build/Makefile

@@ -189,7 +189,7 @@ EXAMPLE_DIR = ../Example
 
 # Gather the SDK package contents
 do-sdk: do-sdk-deploy javadoc
-	cp LICENSE.txt $(PKG_DIR)
+	cp ../LICENSE.md $(PKG_DIR)
 	mkdir $(PKG_DIR)/Doc
 	cp $(DOC_FILES:%=$(DOC_DIR)/%) $(PKG_DIR)/Doc
 	cp -rf $(JAVADOC_DIR) $(PKG_DIR)/Doc/javadoc
@@ -279,7 +279,6 @@ do-core-deploy: do-build db
 
 # Run environments for organization internal use only
 RUN_ENVS_PRIVATE = \
-    run.chipdev \
     run.full_production
 
 # Gather the deployment package contents that are strictly internal

Build/Scripts/dbpurge.sh

@@ -106,6 +106,8 @@ if [ $ANSWER != "yes" ]; then
    exit
 fi
 
+mkdir -p $IDIR
+
 if [ ! -e $ISOURCE ]; then
     IARCHIVE=$ISOURCE.tar.gz
     if [ -e $IARCHIVE ]; then
@@ -164,14 +166,14 @@ if [ $DO_DB = "yes" ]; then
     ./dbinit.sh
 fi
 
-cd $IRUN
+cd ../Run
 shopt -s nullglob
 for SETUP in run.*/setup; do
     cd `dirname $SETUP`
-    echo "running setup in $pwd"
+    echo "running setup in $PWD"
     ./setup
     mv setup setup.done
     cd ..
 done
 
-chmod a+rwx $ITARGET/Run/run.*/control
+chmod a+rwx run.*/control

Build/install

@@ -0,0 +1 @@
+built

Example/.gitignore

@@ -90,6 +90,9 @@ CLASS_BUILD_MARKER = $(BUILT_DIR)/classbuildmarker
 
 all: base-build finish
 
+installable:
+	@echo
+
 javadoc: do-javadoc finish
 
 dist-terse: all
@@ -144,6 +147,6 @@ clean:
 $(CLA_DIR)/%.class: $(JAV_DIR)/%.java
 	touchp $@
 
-.PHONY: all javadoc dist generated finish do-javadoc base-build clean
+.PHONY: all javadoc dist generated finish do-javadoc base-build clean installable
 
 -include $(ALL_DEP)

Example/build/Makefile

@@ -5,13 +5,20 @@ of database for containing the persistent state of users, contexts, and items
 (hence its use as the repository for the metadata that allows these objects to
 be read into the server's memory).
 
-The shell script dbinit.sh (in the Scripts directory) will connect to the local
-MongoDB instance, initialize a database named 'elko', and populate it with
-the essential configuration data as well as a selection of default user,
+The shell script dbinit.sh (in the Build/Scripts directory) will connect to the
+local MongoDB instance, initialize a database named 'elko', and populate it
+with the essential configuration data as well as a selection of default user,
 context, and item objects to get you started.  As distributed, this script will
 connnect to the standard default MongoDB host and port (localhost, port 27017);
 if your MongoDB runs someplace else, you should modify this script accordingly.
 
+The dbinit.sh script is not included directly in the distribution, but gets
+built according to instructions in the Build/Makefile via the command 'make
+db'.  The resulting script will populate the database with objects described by
+JSON files found in the various component directories.
+
+---
+
 The file mongohelper.js contains an assortment of useful functions to be used
 within the MongoDB client shell to manipulate the database in accordance with
 various conventions we use repeatedly. We recommend you define a shell alias:
@@ -20,13 +27,9 @@ various conventions we use repeatedly. We recommend you define a shell alias:
 
 ---
 
-mongo.jar (2.4) is unmodified open source software and is provided here for
-convenience.
-
-It is strongly suggested that you go to http://mongodb.org to get the latest
-Java driver software version and replace this file with it.
-
-It is subject to the terms at http://mongodb.org.
+To run with MongoDB, you will need to have some version of the MongoDB Java
+"driver" on your class path.  These can be obtained at
+https://docs.mongodb.com/ecosystem/drivers/java
 
 ---
 

Run/mongosupport/mongodbnotes.txt

@@ -90,7 +90,7 @@ function egetu(uref) {
 }
 
 function emod(obj, mtype) {
-    for each (var mod in obj.mods) {
+    for (var mod in obj.mods) {
         if (mod.type == mtype) {
             return mod;
         }
@@ -184,7 +184,7 @@ function iholders(iref) {
 
 function idrop(iref) {
     var holders = iholders(iref);
-    for each (var uref in holders) {
+    for (var uref in holders) {
         var user = egetu(uref);
         for (var i = 0; i < user.ref$contents.length; ++i) {
             if (user.ref$contents[i] == iref) {

Run/mongosupport/mongohelper.js

@@ -122,13 +122,12 @@ DB_FILES = ../run/db/mongo.jar \
 
 copy-core:
 	cp $(JAR_FILES) $(TEMP_DIR)
-	cp License.txt $(TEMP_DIR)
-	cp ../run/start.* $(TEMP_DIR)
-	cp ../run/*.example $(TEMP_DIR)
-	cp ../run/setenvvars $(TEMP_DIR)
+	#cp ../run/start.* $(TEMP_DIR)
+	#cp ../run/*.example $(TEMP_DIR)
+	#cp ../run/setenvvars $(TEMP_DIR)
 	echo "echo '#Replace this file with your customized version of setlocvars.example'; return 1" >$(TEMP_DIR)/setlocvars
 	mkdir -p $(TEMP_DIR)/db
-	cp -r $(DB_FILES) $(TEMP_DIR)/db
+	#cp -r $(DB_FILES) $(TEMP_DIR)/db
 
 copy-docs:
 	cp -rf $(JAVADOC_DIR) $(TEMP_DIR)