Update bootstrap.sh and Readme.txt to reflect the msppath -> mspfs transition

Drop the .cache suffix from certain files
Clean up svn:ignore a bit

diff --git a/Readme.txt b/Readme.txt
index 8c5ed2498d4b648639b015003445540c913c4eaf..eb471a8c1050fb18dcbe3b605e8a742b260b905c 100644 (file)
--- a/Readme.txt
+++ b/Readme.txt
@@ -1,5 +1,5 @@
 Builder
-Copyright © 2006  Mikko Rasa, Mikkosoft Productions
+Copyright © 2006-2008  Mikko Rasa, Mikkosoft Productions
 Version 0.1
 
 
@@ -16,7 +16,7 @@ this problem, there's a script called bootstrap.sh in the Builder main
 directory.  Before running it, make sure you have the following libraries
 available:
 
-MSP libraries: core datafile path strings io
+MSP libraries: core datafile fs strings io
 
 Others: sigc++-2.0
 

diff --git a/bootstrap.sh b/bootstrap.sh
index 6053cea9f3a8572e25827c4a17308170a4ae8994..f0f51a7ea069c8e6b7a13dd4269626711bd4ce8d 100755 (executable)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1,7 +1,9 @@
 #!/bin/sh
 # $Id$
 
-REQUIRED="core datafile path strings io"
+set -e
+
+REQUIRED="core datafile fs strings io"
 CFLAGS="-Iinclude `pkg-config --cflags sigc++-2.0`"
 LIBS="`pkg-config --libs sigc++-2.0` -lpthread -ldl"
 if [ -z "$LIBPATH" ]; then
@@ -21,10 +23,7 @@ for i in $REQUIRED; do
                exit 1
        fi
        if [ $i = "core" ]; then
-               ln -sfT $path/source/core include/msp/core
-               ln -sfT $path/source/time include/msp/time
-       elif [ $i = "misc" ]; then
-               ln -sf $path/source/*.h include/msp
+               ln -sfT $path/source/* -t include/msp
        else
                ln -sfT $path/source include/msp/$i
        fi

diff --git a/source/config.cpp b/source/config.cpp
index fbb36ac3d5cc32b1e3bec7fb63b917cc3879ab03..a83a641a5bcaa66dbfcf2eda1ee477ab13648306 100644 (file)
--- a/source/config.cpp
+++ b/source/config.cpp
@@ -66,7 +66,7 @@ void Config::select_last_profile()
 {
        try
        {
-               IO::File in((package.get_source()/".profile.cache").str());
+               IO::File in((package.get_source()/".profile").str());
                string profile;
                in.getline(profile);
                set_option("profile", profile);
@@ -91,7 +91,7 @@ void Config::select_profile(const string &profile)
 
        if(!package.get_builder().get_dry_run())
        {
-               IO::File out((package.get_source()/".profile.cache").str(), IO::M_WRITE);
+               IO::File out((package.get_source()/".profile").str(), IO::M_WRITE);
                IO::print(out, "%s\n", profile);
        }
 
@@ -207,11 +207,7 @@ bool Config::set_option(const string &opt, const string &val)
 
 void Config::load()
 {
-       FS::Path fn=package.get_source()/".options.cache";
-
-       OptionMap::iterator i=options.find("profile");
-       if(i!=options.end())
-               fn=package.get_source()/(".options."+i->second.value+".cache");
+       FS::Path fn=package.get_source()/(".options."+get_option("profile").value);
 
        try
        {