more changes, to remove the repository dir variable.
authorChris Koeritz <fred@gruntose.com>
Sat, 28 Jan 2012 21:30:15 +0000 (16:30 -0500)
committerChris Koeritz <fred@gruntose.com>
Sat, 28 Jan 2012 21:30:15 +0000 (16:30 -0500)
27 files changed:
docs/clam_manual/clam_docs.html
docs/feisty_meow_dox.config
nucleus/tools/clam_tools/value_tagger.cpp
nucleus/tools/clam_tools/vsts_version_fixer.cpp
nucleus/tools/clam_tools/write_build_config.cpp
nucleus/tools/solution_solvers/find_output_pathers.sh
production/codescan.ini
production/setup_src/autotesting_tools/autotesting_manifest.txt
production/setup_src/autotesting_tools/create_autotesting_bundle.sh
production/setup_src/bundle_example/example_manifest.txt
production/setup_src/bundle_example/makefile
production/setup_src/whole_build_package/whole_build_manifest.txt
scripts/buildor/buildor_writable_code.sh
scripts/buildor/fix_project_references.py
scripts/buildor/synch_to_build.sh
scripts/clam/cpp/variables.def
scripts/clam/dotnet/preconditions.sh
scripts/clam/dotnet/variables.def
scripts/clam/variables.def
scripts/core/variables.sh
scripts/examples/feisty_meow_startup/bashrc_user_windoz
scripts/generator/bootstrap_build.sh
scripts/generator/build_variables.sh
scripts/generator/next_version.sh
scripts/generator/whack_build.sh
scripts/text/diff_lib.pl
scripts/winders/find_64bit_bins.sh

index 7e052a2c63c74c04178c76053c9b63f6bbd806b3..2d2ec39a4ce69be66c6e35b9710bdc464f1a7234 100644 (file)
@@ -1132,7 +1132,7 @@ and other unusual punctuation characters are discouraged.&nbsp; All of
 the project's temporary directories will be created based on this
 variable.
 </big>
-<h4><big>REPOSITORY_DIR</big></h4>
+<h4><big>FEISTY_MEOW_DIR</big></h4>
 <big>&nbsp;&nbsp;&nbsp; &nbsp;Specifies the root directory
 for compilation or other&nbsp; building activities. &nbsp; The
 repository
@@ -1181,7 +1181,7 @@ a generated variable called ACTUAL_TARGETS is used.<br>
 <big>&nbsp;&nbsp;&nbsp;&nbsp; This folder is where all generated
 files are
 to
-be stored. &nbsp;It is usually identical to REPOSITORY_DIR but can be
+be stored. &nbsp;It is usually identical to FEISTY_MEOW_DIR but can be
 overridden
 when the targets should be stored elsewhere.<br>
 </big>
@@ -1341,7 +1341,7 @@ directives can be included so that they do not have to be passed on the
 command
 line.&nbsp; For C++ compilation, this is usually an INI file
 stored in the
-REPOSITORY_DIR under the build folder.&nbsp;
+FEISTY_MEOW_DIR under the build folder.&nbsp;
 Here is a sample parameter file:
 </big>
 <blockquote><big><tt><font size="-1"><big>#\</big></font></tt> <br>
index 7adddc41385371b942e887ffcc3f0c6cc8770a39..0a041967ccf3b9f86ff47826876ca092d725e7a1 100644 (file)
@@ -442,7 +442,7 @@ WARN_LOGFILE           =
 # directories like "/usr/src/myproject". Separate the files or directories 
 # with spaces.
 
-INPUT                  = $(REPOSITORY_DIR)/scripts $(REPOSITORY_DIR)/nucleus $(REPOSITORY_DIR)/octopi $(REPOSITORY_DIR)/graphiq $(PRODUCTION_DIR)/setup_src
+INPUT                  = $(FEISTY_MEOW_DIR)/scripts $(FEISTY_MEOW_DIR)/nucleus $(FEISTY_MEOW_DIR)/octopi $(FEISTY_MEOW_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 
index df1724a4521e7b7a8011ef22638e8ecaf301be21..0975186e5e54f1e46fa0637415fa8f5570a5f6f0 100644 (file)
@@ -327,17 +327,17 @@ int value_tagger::execute()
 
   log(time_stamp::notarize(true) + "value_tagger started.", basis::ALWAYS_PRINT);
 
-  astring test_repository = environment::get("REPOSITORY_DIR");
+  astring test_repository = environment::get("FEISTY_MEOW_DIR");
   if (!test_repository) {
     astring msg = "\
 There is a problem with a required build precondition.  The following\r\n\
 variables must be set before the build is run:\r\n\
 \r\n\
-  REPOSITORY_DIR    This should point at the root of the build tree.\r\n\
+  FEISTY_MEOW_DIR    This should point at the root of the build tree.\r\n\
 \r\n\
 There are also a few variables only required for CLAM-based compilation:\r\n\
 \r\n\
-  MAKEFLAGS         This should be set to \"-I $REPOSITORY_DIR/clam\".\r\n\
+  MAKEFLAGS         This should be set to \"-I $FEISTY_MEOW_DIR/clam\".\r\n\
 \r\n\
 Note that on Win32 platforms, these should be set in the System or User\r\n\
 variables before running a build.\r\n";
@@ -380,7 +380,7 @@ variables before running a build.\r\n";
   LOG(astring("Directories to scan..."));
   LOG(_dirs.text_form());
 
-  astring rdir = environment::get("REPOSITORY_DIR");
+  astring rdir = environment::get("FEISTY_MEOW_DIR");
   astring fname;
   astring parmfile = environment::get("BUILD_PARAMETER_FILE");
   if (parmfile.t()) fname = parmfile;
@@ -482,7 +482,7 @@ variables before running a build.\r\n";
   byte_filer build_file(fname, "r");
   if (!build_file.good()) {
     non_continuable_error(class_name(), build_file.filename(),
-        "Could not find the build configuration; is REPOSITORY_DIR set?");
+        "Could not find the build configuration; is FEISTY_MEOW_DIR set?");
   }
   byte_array full_config;
   build_file.read(full_config, 100000);  // a good chance to be big enough.
index 8fc8d3cd3115fe97117851a58281c2e5fae4f3ef..f43ce64fd23fb75dcede61a792a163066e722667 100644 (file)
@@ -254,18 +254,18 @@ void vsts_version_fixer::remove_confusing_files()
   source_dir_whacks += "Release";
   source_dir_whacks += "bin";
   source_dir_whacks += "temp_build";
-  directory repo_source(environment::get("REPOSITORY_DIR") + "/source");
+  directory repo_source(environment::get("FEISTY_MEOW_DIR") + "/source");
   whack_in_subdirs(repo_source, source_file_whacks, source_dir_whacks);
-  directory libra_src(environment::get("REPOSITORY_DIR") + "/libraries");
+  directory libra_src(environment::get("FEISTY_MEOW_DIR") + "/libraries");
   whack_in_subdirs(libra_src, source_file_whacks, source_dir_whacks);
-  directory produ_src(environment::get("REPOSITORY_DIR") + "/products");
+  directory produ_src(environment::get("FEISTY_MEOW_DIR") + "/products");
   whack_in_subdirs(produ_src, source_file_whacks, source_dir_whacks);
 
 /* this never helped.
   // clean out a variety of bad files in the objects hierarchy.
   // currently this is just the generated RES files which we have seen cause
   // vsts to think apps and dlls are up to date when they are actually not.
-  directory repo_objects(environment::get("REPOSITORY_DIR"));
+  directory repo_objects(environment::get("FEISTY_MEOW_DIR"));
   string_array objects_file_whacks;
   objects_file_whacks += ".res";
   string_array objects_dir_whacks;  // none right now.
@@ -281,7 +281,7 @@ int vsts_version_fixer::execute()
 
   remove_confusing_files();
 
-  astring repo_dir = environment::get("REPOSITORY_DIR");
+  astring repo_dir = environment::get("FEISTY_MEOW_DIR");
 
   // figure out which build parameter file to use.
   global_build_ini = "";
index 42914ebe6848fb84c24a9b599da778211852dc9c..6f46328469f94b1d4a69823d9c7ef78c56801f1e 100644 (file)
@@ -226,7 +226,7 @@ int write_build_config::execute()
   SETUP_CONSOLE_LOGGER;  // override the file_logger from app_shell.
 
   // find our build ini file.
-  astring repodir = environment::get("REPOSITORY_DIR");
+  astring repodir = environment::get("FEISTY_MEOW_DIR");
 
   // the below code should never be needed for a properly configured build.
 #ifdef __WIN32__
index 204fd327d387b7fc18d62555abb928b303e1b293..134f0597e58a2beaa826331ae6843e034839029a 100644 (file)
@@ -6,4 +6,4 @@
 
 # only works when repo dir is at the top of the full builds area.
 # we need like a top dir of some sort.
-find $REPOSITORY_DIR -iname "*proj" -exec grep -l OutputPath {} ';' >~/outputpath_mentioners.txt
+find $FEISTY_MEOW_DIR -iname "*proj" -exec grep -l OutputPath {} ';' >~/outputpath_mentioners.txt
index f27a57e70966257d791ec2d8ba3a0b4a86427557..960395b1f09f12b335024b059042d0740b0846b2 100644 (file)
@@ -8,19 +8,19 @@ DEFINE_EVENT=1
 DEFINE_API_OUTCOME=1
 
 [directories]
-$REPOSITORY_DIR/source/core/library/basis
-$REPOSITORY_DIR/source/octopi/library/sockets
-$REPOSITORY_DIR/source/octopi/library/cromp
-# $REPOSITORY_DIR/source/lib_src/library/mechanisms
-$REPOSITORY_DIR/source/core/library/nodes
-$REPOSITORY_DIR/source/core/library/filesystem
-# $REPOSITORY_DIR/source/lib_src/library/post_office
-$REPOSITORY_DIR/source/core/library/processes
-# $REPOSITORY_DIR/source/lib_src/library/scheduling
-$REPOSITORY_DIR/source/core/library
-$REPOSITORY_DIR/source/octopi/library
-$REPOSITORY_DIR/source/graphiq/library
-$REPOSITORY_DIR/source
+$FEISTY_MEOW_DIR/source/core/library/basis
+$FEISTY_MEOW_DIR/source/octopi/library/sockets
+$FEISTY_MEOW_DIR/source/octopi/library/cromp
+# $FEISTY_MEOW_DIR/source/lib_src/library/mechanisms
+$FEISTY_MEOW_DIR/source/core/library/nodes
+$FEISTY_MEOW_DIR/source/core/library/filesystem
+# $FEISTY_MEOW_DIR/source/lib_src/library/post_office
+$FEISTY_MEOW_DIR/source/core/library/processes
+# $FEISTY_MEOW_DIR/source/lib_src/library/scheduling
+$FEISTY_MEOW_DIR/source/core/library
+$FEISTY_MEOW_DIR/source/octopi/library
+$FEISTY_MEOW_DIR/source/graphiq/library
+$FEISTY_MEOW_DIR/source
 
 [DEFINE_OUTCOME]
 first=0
index dfcc0977667e0d81df2ef6561159c5daafd1d410..d3ca2f06505531cff8a0caca92bb227ac57073eb 100644 (file)
@@ -51,98 +51,98 @@ variable=LOGDIR=$TARGET/logs
 ; main payload of installer.
 
 [msys_etc]
-source=$REPOSITORY_DIR/build/msys/etc/*
+source=$FEISTY_MEOW_DIR/build/msys/etc/*
 target=$TARGET/etc
 
 [msys_bin]
-source=$REPOSITORY_DIR/build/msys/bin/*
+source=$FEISTY_MEOW_DIR/build/msys/bin/*
 target=$TARGET/bin
 
 [echo]
-source=$REPOSITORY_DIR/binaries/echo$EXE_END
+source=$FEISTY_MEOW_DIR/binaries/echo$EXE_END
 target=$TARGET/echo$EXE_END
 
 [pwd]
-source=$REPOSITORY_DIR/binaries/pwd$EXE_END
+source=$FEISTY_MEOW_DIR/binaries/pwd$EXE_END
 target=$TARGET/pwd$EXE_END
 
 [await_app]
-source=$REPOSITORY_DIR/binaries/await_app_exit$EXE_END
+source=$FEISTY_MEOW_DIR/binaries/await_app_exit$EXE_END
 target=$TARGET/await_app_exit$EXE_END
 
 [bytedump]
-source=$REPOSITORY_DIR/binaries/bytedump$EXE_END
+source=$FEISTY_MEOW_DIR/binaries/bytedump$EXE_END
 target=$TARGET/bytedump$EXE_END
 
 [check_addr]
-source=$REPOSITORY_DIR/binaries/check_address$EXE_END
+source=$FEISTY_MEOW_DIR/binaries/check_address$EXE_END
 target=$TARGET/check_address$EXE_END
 
 [fdate]
-source=$REPOSITORY_DIR/binaries/fdate$EXE_END
+source=$FEISTY_MEOW_DIR/binaries/fdate$EXE_END
 target=$TARGET/fdate$EXE_END
 
 [gui_message]
-source=$REPOSITORY_DIR/binaries/gui_message$EXE_END
+source=$FEISTY_MEOW_DIR/binaries/gui_message$EXE_END
 target=$TARGET/gui_message$EXE_END
 
 [ini_edit]
-source=$REPOSITORY_DIR/binaries/ini_edit$EXE_END
+source=$FEISTY_MEOW_DIR/binaries/ini_edit$EXE_END
 target=$TARGET/ini_edit$EXE_END
 
 [invis]
-source=$REPOSITORY_DIR/binaries/invisilaunch$EXE_END
+source=$FEISTY_MEOW_DIR/binaries/invisilaunch$EXE_END
 target=$TARGET/invisilaunch$EXE_END
 
 [mdate]
-source=$REPOSITORY_DIR/binaries/mdate$EXE_END
+source=$FEISTY_MEOW_DIR/binaries/mdate$EXE_END
 target=$TARGET/mdate$EXE_END
 
 [merge_inis]
-source=$REPOSITORY_DIR/binaries/merge_inis$EXE_END
+source=$FEISTY_MEOW_DIR/binaries/merge_inis$EXE_END
 target=$TARGET/merge_inis$EXE_END
 
 [query_text]
-source=$REPOSITORY_DIR/binaries/query_text$EXE_END
+source=$FEISTY_MEOW_DIR/binaries/query_text$EXE_END
 target=$TARGET/query_text$EXE_END
 
 [run_as_service]
-source=$REPOSITORY_DIR/binaries/run_as_service$EXE_END
+source=$FEISTY_MEOW_DIR/binaries/run_as_service$EXE_END
 target=$TARGET/run_as_service$EXE_END
 
 [service_controller]
-source=$REPOSITORY_DIR/binaries/service_controller$EXE_END
+source=$FEISTY_MEOW_DIR/binaries/service_controller$EXE_END
 target=$TARGET/service_controller$EXE_END
 
 [sleep_ms]
-source=$REPOSITORY_DIR/binaries/sleep_ms$EXE_END
+source=$FEISTY_MEOW_DIR/binaries/sleep_ms$EXE_END
 target=$TARGET/sleep_ms$EXE_END
 
 [show_versions]
-source=$REPOSITORY_DIR/binaries/show_versions$EXE_END
+source=$FEISTY_MEOW_DIR/binaries/show_versions$EXE_END
 target=$TARGET/show_versions$EXE_END
 
 [unzip]
-source=$REPOSITORY_DIR/build/msys/bin/unzip.exe
+source=$FEISTY_MEOW_DIR/build/msys/bin/unzip.exe
 target=$TARGET/unzip.exe
 
 [winvis]
-source=$REPOSITORY_DIR/binaries/winvisilaunch$EXE_END
+source=$FEISTY_MEOW_DIR/binaries/winvisilaunch$EXE_END
 target=$TARGET/winvisilaunch$EXE_END
 
 [zap_process]
-source=$REPOSITORY_DIR/binaries/zap_process$EXE_END
+source=$FEISTY_MEOW_DIR/binaries/zap_process$EXE_END
 target=$TARGET/zap_process$EXE_END
 
 [zip]
-source=$REPOSITORY_DIR/build/msys/bin/zip.exe
+source=$FEISTY_MEOW_DIR/build/msys/bin/zip.exe
 target=$TARGET/zip.exe
 
 [dcomperm]
-source=$REPOSITORY_DIR/binaries/dcomperm$EXE_END
+source=$FEISTY_MEOW_DIR/binaries/dcomperm$EXE_END
 target=$TARGET/dcomperm$EXE_END
 
 [reg]
-source=$REPOSITORY_DIR/packages/support/microsoft/apps/reg.exe
+source=$FEISTY_MEOW_DIR/packages/support/microsoft/apps/reg.exe
 target=$TARGET/reg.exe
 
index 00cd84cc93e330329d44b74e5304feb88ca68660..88c9830c011350aaba9a222c1238856fa92aa0fb 100644 (file)
@@ -3,12 +3,12 @@
 # Creates a bundle of tools for testing to improve our capabilities in
 # scripting.
 
-INSTDIR=$REPOSITORY_DIR/install/Tests
+INSTDIR=$FEISTY_MEOW_DIR/install/Tests
 if [ ! -d "$INSTDIR" ]; then mkdir -p "$INSTDIR"; fi
 TOOL_PACK=$INSTDIR/autotesting_tools.exe
 rm -f "$TOOL_PACK"
 
-$REPOSITORY_DIR/binaries/bundle_creator -o "$TOOL_PACK" -m ./autotesting_manifest.txt
+$FEISTY_MEOW_DIR/binaries/bundle_creator -o "$TOOL_PACK" -m ./autotesting_manifest.txt
 if [ "$?" != "0" ]; then
   echo Failure during creation of autotest package.
   exit 23
index 7ee1568930cb3968e657f4e1229b2da91d303c21..855a2aa583f215b50cf3aabe173d4c9021c27bf0 100644 (file)
@@ -100,7 +100,7 @@ exec_source=true
 
 [copy_fortunes_to_tempdir]
 source=$UNIX_BIN/cp
-parms="$REPOSITORY_DIR/nucleus/applications/nechung/example.txt" "$SOURCE_TEMP/example.txt"
+parms="$FEISTY_MEOW_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/nucleus/library/test_basis/*
+source=$FEISTY_MEOW_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/nucleus/library/basis/*.h
+source=$FEISTY_MEOW_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/nucleus
+source=$FEISTY_MEOW_DIR/nucleus
 target=$TARGET/srcpack/doodle_src
 recurse=1
 ; this shows a recursive copy of the directory "core" into a new directory
index 36fc3dcc4f2fe4db47530e74ce5fe3a3d726359b..46bc6f2c0ec28801e91612f63e7e2e8864e63282 100644 (file)
@@ -3,7 +3,7 @@ include cpp/variables.def
 PROJECT = example_bundle
 TYPE = hierarchy
 FIRST_TARGETS = build_bundle
-CLEANUPS = $(REPOSITORY_DIR)/install/example_bundle$(EXE_END)
+CLEANUPS = $(FEISTY_MEOW_DIR)/install/example_bundle$(EXE_END)
 export UNIX_BIN = /bin
 ifeq "$(OP_SYSTEM)" "WIN32"
   export UNIX_BIN = $(BUILDING_HIERARCHY)/msys/bin
index 8d0261e51a8467d76b97e777634eb2dcec19cf2e..104b42cba39964eac26e9d3282ba82ce61ef8140 100644 (file)
@@ -33,33 +33,33 @@ keyword=sources
 ; this section is included in both types of package.
 
 [top_inis]
-source=$REPOSITORY_DIR/*.ini
+source=$FEISTY_MEOW_DIR/*.ini
 target=$TARGET
 keyword=sources
 
 [text_files]
-source=$REPOSITORY_DIR/*.txt
+source=$FEISTY_MEOW_DIR/*.txt
 target=$TARGET
 keyword=sources
 
 [docs]
-source=$REPOSITORY_DIR/docs/*
+source=$FEISTY_MEOW_DIR/docs/*
 target=$TARGET/docs
 keyword=sources
 
 [makefile]
-source=$REPOSITORY_DIR/makefile
+source=$FEISTY_MEOW_DIR/makefile
 target=$TARGET/makefile
 keyword=sources
 
 [build]
-source=$REPOSITORY_DIR/build
+source=$FEISTY_MEOW_DIR/build
 target=$TARGET/build
 recurse=1
 keyword=sources
 
 [source]
-source=$REPOSITORY_DIR/source
+source=$FEISTY_MEOW_DIR/source
 target=$TARGET/source
 recurse=1
 keyword=sources
@@ -67,22 +67,22 @@ keyword=sources
 ; this section is only included in the full package (not in sources).
 
 [3rdparty]
-source=$REPOSITORY_DIR/3rdparty
+source=$FEISTY_MEOW_DIR/3rdparty
 target=$TARGET/3rdparty
 recurse=1
 
 [binaries]
-source=$REPOSITORY_DIR/binaries
+source=$FEISTY_MEOW_DIR/binaries
 target=$TARGET/binaries
 recurse=1
 
 [fonts]
-source=$REPOSITORY_DIR/fonts
+source=$FEISTY_MEOW_DIR/fonts
 target=$TARGET/fonts
 recurse=1
 
 [packages]
-source=$REPOSITORY_DIR/packages
+source=$FEISTY_MEOW_DIR/packages
 target=$TARGET/packages
 recurse=1
 
index de92db09d8a3cb36b1a29d3f16142272ceb5f748..57a25c9193c3d3dc8364377b6f2c1e61d2f46d3c 100644 (file)
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-source $REPOSITORY_DIR/bin/seek_all_source.sh
+source $FEISTY_MEOW_DIR/bin/seek_all_source.sh
 
 function strip_file {
   file=$1
index c6200a40d0c259b8a87442fa617ec77a626df1e4..58af91e287b18ebbe858eba582b2af4a8cd0d5e6 100644 (file)
@@ -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") + "/nucleus/applications/nechung/nechung.vcxproj"
+    if test_file == "": test_file = os.getenv("FEISTY_MEOW_DIR") + "/nucleus/applications/nechung/nechung.vcxproj"
     print("test file is: " + test_file)
 
     guid = self.extract_guid_from_project_file(test_file)
index 8d8182c7061c9529bb38135d4ebc2382cb7f04be..36e76550fcf8900314a0cb924b92d0dd2dfdbe90 100644 (file)
@@ -12,8 +12,8 @@ exval=0
 
 for curr_file in "$instdir"/*.dll; do 
   base=$(basename "$curr_file")
-  if [ -f "$REPOSITORY_DIR/dll/$base" ]; then
-    cp -f "$REPOSITORY_DIR/dll/$base" "$curr_file"
+  if [ -f "$FEISTY_MEOW_DIR/dll/$base" ]; then
+    cp -f "$FEISTY_MEOW_DIR/dll/$base" "$curr_file"
     if [ $? -ne 0 ]; then
       echo "** Error copying $base to $instdir"
       exval=1
@@ -22,8 +22,8 @@ for curr_file in "$instdir"/*.dll; do
 done
 for curr_file in "$instdir"/*.exe; do 
   base=$(basename "$curr_file")
-  if [ -f "$REPOSITORY_DIR/exe/$base" ]; then
-    cp -f "$REPOSITORY_DIR/exe/$base" "$curr_file"
+  if [ -f "$FEISTY_MEOW_DIR/exe/$base" ]; then
+    cp -f "$FEISTY_MEOW_DIR/exe/$base" "$curr_file"
     if [ $? -ne 0 ]; then
       echo "** Error copying $base to $instdir"
       exval=1
index 97f96fbabc5c2e1dfa590d450101acc0f8c644f3..56073eecb1508c80c9353d9d1f539945eca23a15 100644 (file)
@@ -11,7 +11,7 @@ ifneq "$(BUILD_PARAMETER_FILE)" ""
 endif
 ifeq "$(PARAMETER_FILE)" ""
   # last ditch attempt to get one that will work.
-  export PARAMETER_FILE = $(REPOSITORY_DIR)/build.ini
+  export PARAMETER_FILE = $(FEISTY_MEOW_DIR)/build.ini
 endif
 
 ###############################################################################
@@ -22,12 +22,12 @@ include variables.def
 ###############################################################################
 
 #no # set the repository directory if it's still set to the base version.
-#ifeq "$(REPOSITORY_DIR)" ""
+#ifeq "$(FEISTY_MEOW_DIR)" ""
 #  ifeq "$(OP_SYSTEM)" "UNIX"
-#    export REPOSITORY_DIR = $(HOME)/hoople
+#    export FEISTY_MEOW_DIR = $(HOME)/hoople
 #  endif
 #  ifeq "$(OP_SYSTEM)" "WIN32"
-#    export REPOSITORY_DIR = l:
+#    export FEISTY_MEOW_DIR = l:
 #  endif
 #endif
 
@@ -209,7 +209,7 @@ export BASE_OUTPUT_PATH = $(OUTPUT_ROOT)/$(CPU_BUILD_DIR)
 
 # special case when doing arm-linux builds
 ifeq "$(COMPILER)" "GNU_ARM_LINUX"
-  export TARGETS_DIR = $(REPOSITORY_DIR)/$(CPU_BUILD_DIR)
+  export TARGETS_DIR = $(FEISTY_MEOW_DIR)/$(CPU_BUILD_DIR)
   # special output directory for firmware doesn't include CPU name because
   #  the repository already include the CPU name
   BASE_OUTPUT_PATH = $(OUTPUT_ROOT)
@@ -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)/nucleus" ]; then \
-      echo "$(REPOSITORY_DIR)/nucleus" "$(REPOSITORY_DIR)/octopi" "$(REPOSITORY_DIR)/graphiq" ; \
+    if [ -d "$(FEISTY_MEOW_DIR)/nucleus" ]; then \
+      echo "$(FEISTY_MEOW_DIR)/nucleus" "$(FEISTY_MEOW_DIR)/octopi" "$(FEISTY_MEOW_DIR)/graphiq" ; \
     else \
       echo ""; \
     fi | sed -e "s/\([a-zA-Z]\):\/\(.*\)/\/\1\/\2/" ')
index 792631903d900e190c44d5e2d35fbe6b84b4dabd..2fe3e79bca0bf0b8a83b3c4241dcc2e021391b64 100644 (file)
@@ -2,7 +2,7 @@
 # prepares the project for compilation by creating the appropriate directories.
 
 # make sure the top-level repository exists.
-if [ ! -d $REPOSITORY_DIR ]; then mkdir $REPOSITORY_DIR; fi
+if [ ! -d $FEISTY_MEOW_DIR ]; then mkdir $FEISTY_MEOW_DIR; fi
 # make sure our temp directory is there.
 if [ ! -d $CLAM_TMP ]; then mkdir $CLAM_TMP; fi
 # make sure the generated files have a home.
index da6e49af7be07ba9b4f63e74bfa1a5a187c8fb06..8068feb232428665aad8a471e3aa37b41bbe08ba 100644 (file)
@@ -17,11 +17,11 @@ ifneq "$(BUILD_PARAMETER_FILE)" ""
   # define our version of the build parameter file.  this should be set
   # beforehand so we override the default parameter file for clam.
   export PARAMETER_FILE = $(BUILD_PARAMETER_FILE)
-###no: $(REPOSITORY_DIR)/build/identity.ini
+###no: $(FEISTY_MEOW_DIR)/build/identity.ini
 endif
 ifeq "$(PARAMETER_FILE)" ""
   # last ditch attempt to get one that will work.
-  export PARAMETER_FILE = $(REPOSITORY_DIR)/build.ini
+  export PARAMETER_FILE = $(FEISTY_MEOW_DIR)/build.ini
 endif
 
 ###############################################################################
@@ -110,7 +110,7 @@ ifeq "$(OP_SYSTEM)" "UNIX"
   export THIRD_PARTY_DIR
 endif
 ifeq "$(OP_SYSTEM)" "WIN32"
-  export THIRD_PARTY_DIR = $(REPOSITORY_DIR)/3rdparty
+  export THIRD_PARTY_DIR = $(FEISTY_MEOW_DIR)/3rdparty
 endif
 
 # "OUTPUT_ROOT" is the root of all output directories for objects and other
@@ -152,7 +152,7 @@ export TESTS_DIR = $(TARGETS_DIR)/tests
 #HEADER_SEARCH_PATH =
 
 # "HOOPLE_HEADERS" are locations where the HOOPLE headers can be found.
-HOOPLE_HEADERS := $(shell $(FIND) $(REPOSITORY_DIR)/source/lib_src $(REPOSITORY_DIR)/libraries -mindepth 1 -maxdepth 1 -type d)
+HOOPLE_HEADERS := $(shell $(FIND) $(FEISTY_MEOW_DIR)/source/lib_src $(FEISTY_MEOW_DIR)/libraries -mindepth 1 -maxdepth 1 -type d)
 
 # "LOCAL_HEADERS" are overrides that go first in the header search path.
 #LOCAL_HEADERS =
index 96f4f91f3989b381495e67a326eeda94e9cb64c0..0157bec88d18b9b3326fb8ee3f313bda0002a449 100644 (file)
@@ -61,13 +61,13 @@ endif
 
 ###############################################################################
 
-# "REPOSITORY_DIR" is the root of the "build" for our compilation oriented
+# "FEISTY_MEOW_DIR" is the root of the "build" for our compilation oriented
 # features.  All source code and build helper files are usually found there.
 # The build targets to be built are usually stored there also, although the
 # targets can be located elsewhere if desired.  see TARGETS_DIR below.
-export REPOSITORY_DIR
-ifeq "$(REPOSITORY_DIR)" ""
-#  REPOSITORY_DIR = 
+export FEISTY_MEOW_DIR
+ifeq "$(FEISTY_MEOW_DIR)" ""
+#  FEISTY_MEOW_DIR = 
 #uhhh, use the current location?
 endif
 
@@ -85,7 +85,7 @@ export TARGETS_DIR
 ifeq "$(TARGETS_DIR)" ""
   # the default is to generate files into subdirectories that are at the
   # top-level of the repository.
-  TARGETS_DIR = $(REPOSITORY_DIR)
+  TARGETS_DIR = $(FEISTY_MEOW_DIR)
 endif
 
 # "CLAM_BIN" points at the location for helper binaries and shell scripts.
@@ -152,7 +152,7 @@ export MAKEFILE_NAME = makefile
 # to make sure we don't accidentally run that inferior one.
 export FIND = find
 #ifeq "$(OP_SYSTEM)" "WIN32"
-#  export FIND = $(REPOSITORY_DIR)/msys/bin/find
+#  export FIND = $(FEISTY_MEOW_DIR)/msys/bin/find
 #endif
 
 # "PARAMETER_FILE" is the location of our version stamps (if defined) and
index 65c896f6548691457908ad2eaeef7fe5dffae68c..e3dcb0f0af6ccc8ff1a22005bd7a4591236f2153 100644 (file)
@@ -113,31 +113,31 @@ if [ -z "$SVN_EDITOR" ]; then
 fi
 
 # include variables needed for compiling hoople and using its scripts.
-if [ -z "$REPOSITORY_DIR" ]; then
+if [ -z "$FEISTY_MEOW_DIR" ]; then
   if [ -d "$HOME/feisty_meow" ]; then
-    export REPOSITORY_DIR="$HOME/feisty_meow"
+    export FEISTY_MEOW_DIR="$HOME/feisty_meow"
   fi
 fi
 
 # initialize the build variables, if possible.
 found_build_vars=0
-if [ ! -z "$REPOSITORY_DIR" ]; then
+if [ ! -z "$FEISTY_MEOW_DIR" ]; then
   # first guess at using the old school bin directory.
-  bv="$REPOSITORY_DIR/bin/build_variables.sh"
+  bv="$FEISTY_MEOW_DIR/bin/build_variables.sh"
   if [ -f "$bv" ]; then
     # the old bin directory is present, so let's use its build vars.
     source "$bv" "$bv"
     found_build_vars=1
   else
     # try again with the new school location for the file.
-    bv="$REPOSITORY_DIR/scripts/generator/build_variables.sh"
+    bv="$FEISTY_MEOW_DIR/scripts/generator/build_variables.sh"
     if [ -f "$bv" ]; then
       # yep, that one looks good, so pull in the build defs.
       source "$bv" "$bv"
       found_build_vars=1
     else
       # try once more with new school and assume we're deep.
-      bv="$REPOSITORY_DIR/../../scripts/generator/build_variables.sh"
+      bv="$FEISTY_MEOW_DIR/../../scripts/generator/build_variables.sh"
       if [ -f "$bv" ]; then
         # sweet, there is something there.
         source "$bv" "$bv"
@@ -156,7 +156,7 @@ if [ $found_build_vars == 1 ]; then
   # the binaries, but now we don't ship them with yeti any more as pre-built items.  this reduces
   # the size of the code package a lot and shortens up our possible exposure to compromised
   # binaries.  people can bootstrap up their own set from hoople now instead.
-  export BINDIR=$REPOSITORY_DIR/production/binaries
+  export BINDIR=$FEISTY_MEOW_DIR/production/binaries
 
   # add binaries created within build to the path.
   export PATH="$(dos_to_msys_path $BUILD_TOP/build/bin):$PATH"
index ee0654bec797a0b572058a08a15aa62a2bd79a70..07a3bb37ff236d96ba7130c298a21c746a0d269e 100644 (file)
@@ -15,7 +15,7 @@
 # add in some useful paths for the local machine.
 export PATH=/bin:$PATH:/c/utilities/emacs-23.2/bin:/c/tools/cvsnt:/c/utilities/Vim/vim71:/c/system/Perl/site/bin:/c/system/Perl/bin:/c/tools/doxygen/bin:/c/tools/graphviz/Graphviz/bin
 
-#export REPOSITORY_DIR="$HOME/feisty_meow"
+#export FEISTY_MEOW_DIR="$HOME/feisty_meow"
 
 # sets up the feisty_meow scripts, using the default locations for all scripts.
 source $HOME/feisty_meow/scripts/core/profile.sh
index 48245eae58ea5f2272a502544364e9fe5cb8610a..2cfa914755a4ed3726354dcd81424d80e99e21b0 100644 (file)
@@ -34,7 +34,7 @@ echo build script after: $BUILD_SCRIPTS_DIR
 # load in feisty meow basic scripts, if not already loaded.
 source "$BUILD_SCRIPTS_DIR/../core/profile.sh"
 # drop any previous version of the repository variable.
-unset REPOSITORY_DIR
+unset FEISTY_MEOW_DIR
 source "$BUILD_SCRIPTS_DIR/build_variables.sh" "$BUILD_SCRIPTS_DIR/build_variables.sh"
 
 ##############
@@ -248,7 +248,7 @@ if [ -z "$JUST_BOOTSTRAP_APPS" ]; then
   mkdir -p "$LOGS_DIR"
 
   echo Now starting a normal build of the repository source code.
-  pushd "$REPOSITORY_DIR" &>/dev/null
+  pushd "$FEISTY_MEOW_DIR" &>/dev/null
   unset BUILD_DEFAULTS
   declare -a BUILD_DEFAULTS=( "BOOT_STRAPPING=" "OPTIMIZE=t" "DEBUG=t" "REBUILD=t" )
   make_code
index bed96829bf742c87b46eff8713e7d850fbb1f9ac..bd98e0abe328f2b4b9fff5707ad44d18651f98b0 100644 (file)
@@ -120,29 +120,29 @@ if [ ! -z "$SHELL_DEBUG" ]; then
   echo "[OS is \"$OPERATING_SYSTEM\"]"
 fi
 
-# we create the variable REPOSITORY_DIR, but we keep the dos form of
+# we create the variable FEISTY_MEOW_DIR, but we keep the dos form of
 # the path, because otherwise lots of bad things happens when passing the
 # folders around to visual studio commands that don't allow a space after them.
 if [ -d "$BUILDING_HIERARCHY/source" ]; then
   # old style repository is same height as building hierarchy.
-  export REPOSITORY_DIR="$BUILDING_HIERARCHY"
+  export FEISTY_MEOW_DIR="$BUILDING_HIERARCHY"
 else
   # new style repository is a level above the build hierarchy.
-  export REPOSITORY_DIR="$(echo "$BUILDING_HIERARCHY" | sed -e 's/\(.*\)\/[^\/]*/\1/')"
+  export FEISTY_MEOW_DIR="$(echo "$BUILDING_HIERARCHY" | sed -e 's/\(.*\)\/[^\/]*/\1/')"
 fi
 
 if [ "$OPERATING_SYSTEM" = "WIN32" ]; then
   # make sure repository dir looks right on windoze.
-  export REPOSITORY_DIR="$(msys_to_dos_path "$REPOSITORY_DIR")"
+  export FEISTY_MEOW_DIR="$(msys_to_dos_path "$FEISTY_MEOW_DIR")"
 fi
 
 if [ ! -z "$SHELL_DEBUG" ]; then
-  echo "[REPOSITORY_DIR is $REPOSITORY_DIR]"
+  echo "[FEISTY_MEOW_DIR is $FEISTY_MEOW_DIR]"
 fi
 
 # new BUILD_TOP variable points at the utter top-most level of any files
 # in the building hierarchy.
-export BUILD_TOP="$REPOSITORY_DIR"
+export BUILD_TOP="$FEISTY_MEOW_DIR"
 
 # this variable points at a folder where we store most of the generated products
 # of the build.  these tend to be the things that will be used for packaging into
@@ -168,7 +168,7 @@ function make()
 #echo scripts: $BUILD_SCRIPTS_DIR
 #echo build tools hier: $BUILDING_HIERARCHY
 #echo this tool: $THIS_TOOL_NAME
-#echo repository: $REPOSITORY_DIR
+#echo repository: $FEISTY_MEOW_DIR
 #echo clam: $CLAM_DIR
 #echo makeflags: $MAKEFLAGS
 
@@ -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/nucleus/tools"
+export TOOL_SOURCES="$FEISTY_MEOW_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"
index 805745b0ca58bec71e0bb1e05cf93fc3a411ed7e..3b34b5a253461a43829c40b118f8d33bc6db519f 100644 (file)
@@ -12,7 +12,7 @@ if [ ! -z "$BUILD_PARAMETER_FILE" ]; then
 fi
 if [ -z "$PARAMETER_FILE" ]; then
   # last ditch attempt to get one that will work.
-  PARAMETER_FILE="$REPOSITORY_DIR/build.ini"
+  PARAMETER_FILE="$FEISTY_MEOW_DIR/build.ini"
 fi
 
 chmod u+w "$PARAMETER_FILE"
index fc391248f2c5885a0af0052dfc185ef101716102..a9dc095ffa41e17b9cd4892d2e307439a09ea131 100644 (file)
@@ -35,7 +35,7 @@ function whack_single_build_area()
 
   # kerzap.
   rm -rf \
-    "$REPOSITORY_DIR/generatedJUnitFiles" \
+    "$FEISTY_MEOW_DIR/generatedJUnitFiles" \
     "$CLEANING_TOP/binaries" \
     "$CLEANING_TOP/install" \
     "$CLEANING_TOP/logs" \
@@ -49,7 +49,7 @@ function whack_single_build_area()
 
   if [ "$clean_src" == "clean" -o "$clean_src" == "CLEAN"  ]; then
     echo $(date): "    ** Aggressive cleaning activated..."
-    perl "$REPOSITORY_DIR/scripts/files/zapdirs.pl" "$CLEANING_TOP" >>"$CRUDFILE"
+    perl "$FEISTY_MEOW_DIR/scripts/files/zapdirs.pl" "$CLEANING_TOP" >>"$CRUDFILE"
   fi
 
   echo $(date): "Cleaned [$choprepo]."
@@ -61,5 +61,5 @@ function whack_single_build_area()
 
 # clean all known hierarchies of build products...
 
-whack_single_build_area "$REPOSITORY_DIR"
+whack_single_build_area "$FEISTY_MEOW_DIR"
 
index 4642946dca4036eb7a5d227145c8c55507569741..c0ffaf7a1e88dec7c6c4e864eb4a1cb734b3a2b7 100644 (file)
@@ -191,7 +191,7 @@ synch_build:
 This program needs one directory name to be passed on the command line.
 This directory is where the installation's executable files live.  Any files
 that are in the installation bin directory will be compared against the files
-in the build repository (specified by an environment variable REPOSITORY_DIR).
+in the build repository (specified by an environment variable FEISTY_MEOW_DIR).
 If files differ, they will be copied from the repository into the installation
 directory.
 ";
@@ -490,12 +490,12 @@ sub synchronize_against_build
   }
 
 #  print "install=$install_directory\n";
-#  print "repos=$REPOSITORY_DIR\n";
+#  print "repos=$FEISTY_MEOW_DIR\n";
 
   # iterate over all the files in the source directory.
   opendir CURDIR, $install_directory
       || die("couldn't open $install_directory for reading.\n");
-  $compare_directory = "$REPOSITORY_DIR/dll";
+  $compare_directory = "$FEISTY_MEOW_DIR/dll";
   foreach $filename (readdir CURDIR) {
     if ( ($filename eq ".") || ($filename eq "..") ) { next; }
     if (! ($filename =~ /\.dll$/)) { next; }
@@ -514,7 +514,7 @@ sub synchronize_against_build
   # repeat for the exe directory.
   opendir CURDIR, $install_directory
       || die("couldn't open $install_directory for reading.\n");
-  $compare_directory = "$REPOSITORY_DIR/exe";
+  $compare_directory = "$FEISTY_MEOW_DIR/exe";
   foreach $filename (readdir CURDIR) {
     if ( ($filename eq ".") || ($filename eq "..") ) { next; }
     if (! ($filename =~ /\.exe$/)) { next; }
index 5afec91cf6756d4cbb75d47f658ec4b0adbca1dd..4a6da552a630465c220b147a80c1969f8331785d 100644 (file)
@@ -1 +1 @@
-for i in $REPOSITORY_DIR/binaries/*.exe ; do dumpbin //headers $i | grep -i 8664 ; done
+for i in $FEISTY_MEOW_DIR/binaries/*.exe ; do dumpbin //headers $i | grep -i 8664 ; done