maybe building again, patched references to old core folder.

diff --git a/docs/feisty_meow_dox.config b/docs/feisty_meow_dox.config
index 34995618248f2b78dcc9ee53352bba6936f52a29..7adddc41385371b942e887ffcc3f0c6cc8770a39 100644 (file)
--- a/docs/feisty_meow_dox.config
+++ b/docs/feisty_meow_dox.config
@@ -442,7 +442,7 @@ WARN_LOGFILE           =
 # directories like "/usr/src/myproject". Separate the files or directories 
 # with spaces.
 
-INPUT                  = $(REPOSITORY_DIR)/scripts $(REPOSITORY_DIR)/core $(REPOSITORY_DIR)/octopi $(REPOSITORY_DIR)/graphiq $(PRODUCTION_DIR)/setup_src
+INPUT                  = $(REPOSITORY_DIR)/scripts $(REPOSITORY_DIR)/nucleus $(REPOSITORY_DIR)/octopi $(REPOSITORY_DIR)/graphiq $(PRODUCTION_DIR)/setup_src
 
 # If the value of the INPUT tag contains directories, you can use the 
 # FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 

diff --git a/nucleus/.project b/nucleus/.project
index 6057985b2fc6d4342e0b73d268a45138cbddf989..ed4e525746c5888c9dd51f9a37fc2b9d707c2e4e 100644 (file)
--- a/nucleus/.project
+++ b/nucleus/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-       <name>hoople_core</name>
+       <name>nucleus</name>
        <comment></comment>
        <projects>
        </projects>
@@ -31,7 +31,7 @@
                                </dictionary>
                                <dictionary>
                                        <key>org.eclipse.cdt.make.core.buildLocation</key>
-                                       <value>${workspace_loc:/hoople_core/Debug}</value>
+                                       <value>${workspace_loc:/nucleus/Debug}</value>
                                </dictionary>
                                <dictionary>
                                        <key>org.eclipse.cdt.make.core.cleanBuildTarget</key>

diff --git a/nucleus/tools/clam_tools/write_build_config.cpp b/nucleus/tools/clam_tools/write_build_config.cpp
index 53cfa0a4d43a597961df28f87df95c8c79f8da94..42914ebe6848fb84c24a9b599da778211852dc9c 100644 (file)
--- a/nucleus/tools/clam_tools/write_build_config.cpp
+++ b/nucleus/tools/clam_tools/write_build_config.cpp
@@ -245,19 +245,10 @@ int write_build_config::execute()
   // find our storage area for the build headers.  we know a couple build
   // configurations by now, but this should really be coming out of a config
   // file instead.
-  astring library_directory = repodir + "/source/lib_src/library";
+  astring library_directory = repodir + "/nucleus/library";
   if (!filename(library_directory).good()) {
-    library_directory = repodir + "/source/core/library";
-    if (!filename(library_directory).good()) {
-      library_directory = repodir + "/libraries/library";
-      if (!filename(library_directory).good()) {
-        library_directory = repodir + "/../../libraries/library";
-        if (!filename(library_directory).good()) {
-          non_continuable_error(static_class_name(), func,
-              astring("failed to locate the library folder storing the generated files."));
-        }
-      }
-    }
+    non_continuable_error(static_class_name(), func,
+        astring("failed to locate the library folder storing the generated files."));
   }
 
   // these are very specific paths, but they really are where we expect to

diff --git a/production/setup_src/bundle_example/example_manifest.txt b/production/setup_src/bundle_example/example_manifest.txt
index d1f29bdfd293641de7e21794de9e7ed841525641..7ee1568930cb3968e657f4e1229b2da91d303c21 100644 (file)
--- a/production/setup_src/bundle_example/example_manifest.txt
+++ b/production/setup_src/bundle_example/example_manifest.txt
@@ -100,7 +100,7 @@ exec_source=true
 
 [copy_fortunes_to_tempdir]
 source=$UNIX_BIN/cp
-parms="$REPOSITORY_DIR/core/applications/nechung/example.txt" "$SOURCE_TEMP/example.txt"
+parms="$REPOSITORY_DIR/nucleus/applications/nechung/example.txt" "$SOURCE_TEMP/example.txt"
 no_pack=true
 exec_source=true
 
@@ -125,19 +125,19 @@ target=/tmp/spoonbender/nechung$EXE_END
 ; simple file copy to an absolute path.
 
 [wildcard_congelio]
-source=$REPOSITORY_DIR/core/library/test_basis/*
+source=$REPOSITORY_DIR/nucleus/library/test_basis/*
 target=$TARGET/muse_files
 ; wildcards are supported.  this will put all the files from that directory
 ; "test_basis" into the target in a folder called "muse_files".
 
 [wildcard_specific]
-source=$REPOSITORY_DIR/core/library/basis/*.h
+source=$REPOSITORY_DIR/nucleus/library/basis/*.h
 target=$TARGET/basis_headers
 ; this is a more specific wildcard that tests a pattern on the end, rather
 ; than the "get everything" of a bare asterisk.
 
 [recursing_doodle]
-source=$REPOSITORY_DIR/core
+source=$REPOSITORY_DIR/nucleus
 target=$TARGET/srcpack/doodle_src
 recurse=1
 ; this shows a recursive copy of the directory "core" into a new directory

diff --git a/readme.txt b/readme.txt
index d1e867eb7d7f44f3cff5611413dfbd12d73cb733..d2dc6763d06176332db023a9287e782b35b9db22 100644 (file)
--- a/readme.txt
+++ b/readme.txt
@@ -8,7 +8,7 @@ the CLAM build system, and a variety of other efforts.
 
 Directories and files of interest here...
 
-core/
+nucleus/
     The hierarchies of compiled code for the basic modules of the Feisty Meow hoople2 codebase.
 
 database/

diff --git a/scripts/buildor/fix_project_references.py b/scripts/buildor/fix_project_references.py
index a385f018b0eb8831596703b9081a8a48c9f2bdb5..c6200a40d0c259b8a87442fa617ec77a626df1e4 100644 (file)
--- a/scripts/buildor/fix_project_references.py
+++ b/scripts/buildor/fix_project_references.py
@@ -581,7 +581,7 @@ dealing with the existing buffer.
     test_file = ""
     if len(self.arguments) > 1:
       test_file = self.arguments[1]
-    if test_file == "": test_file = os.getenv("REPOSITORY_DIR") + "/source/core/applications/nechung/nechung.vcxproj"
+    if test_file == "": test_file = os.getenv("REPOSITORY_DIR") + "/nucleus/applications/nechung/nechung.vcxproj"
     print("test file is: " + test_file)
 
     guid = self.extract_guid_from_project_file(test_file)

diff --git a/scripts/clam/cpp/variables.def b/scripts/clam/cpp/variables.def
index a9a4d4b8bbfc98cdc8875410498957e1e5f6103d..97f96fbabc5c2e1dfa590d450101acc0f8c644f3 100644 (file)
--- a/scripts/clam/cpp/variables.def
+++ b/scripts/clam/cpp/variables.def
@@ -235,8 +235,8 @@ export STATIC_LIBRARY_DIR = $(TARGETS_DIR)
 ifeq "$(HOOPLE_HEADERS)" ""
 #seems like some of this is redundant with earlier 3rdparty exploring.
   LOCUS_LIBRARY_HEADERS = $(shell bash -c '\
-    if [ -d "$(REPOSITORY_DIR)/core" ]; then \
-      echo "$(REPOSITORY_DIR)/core" "$(REPOSITORY_DIR)/octopi" "$(REPOSITORY_DIR)/graphiq" ; \
+    if [ -d "$(REPOSITORY_DIR)/nucleus" ]; then \
+      echo "$(REPOSITORY_DIR)/nucleus" "$(REPOSITORY_DIR)/octopi" "$(REPOSITORY_DIR)/graphiq" ; \
     else \
       echo ""; \
     fi | sed -e "s/\([a-zA-Z]\):\/\(.*\)/\/\1\/\2/" ')

diff --git a/scripts/generator/build_variables.sh b/scripts/generator/build_variables.sh
index d9b6a96628b180397db4da8912f7903ce889d8a4..ff710d985a802eeb82e38ba212e6da5cc1f0fb25 100644 (file)
--- a/scripts/generator/build_variables.sh
+++ b/scripts/generator/build_variables.sh
@@ -194,7 +194,7 @@ fi
 
 # now compute some more paths with a bit of "heuristics" for where we can
 # find the source code.
-export TOOL_SOURCES="$REPOSITORY_DIR/core/tools"
+export TOOL_SOURCES="$REPOSITORY_DIR/nucleus/tools"
 if [ ! -d "$TOOL_SOURCES/dependency_tool" -o ! -d "$TOOL_SOURCES/clam_tools" ]; then
   if [ ! -d "$TOOL_SOURCES/dependency_tool" -o ! -d "$TOOL_SOURCES/clam_tools" ]; then
     echo "This script cannot locate the tool source code folder.  This is where the"