From e36dac301c41799d374b6d537129b2be63f05fb2 Mon Sep 17 00:00:00 2001 From: Mikko Rasa Date: Mon, 4 Sep 2006 16:12:59 +0000 Subject: [PATCH] Initialize Component::install to false Don't throw for packages with no installable components Don't create spurious symlinks in bootstrap.sh --- bootstrap.sh | 6 +++--- source/builder.cpp | 6 ++++-- source/component.cpp | 3 ++- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/bootstrap.sh b/bootstrap.sh index 93ee706..cd94382 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -18,12 +18,12 @@ for i in $REQUIRED; do exit 1 fi if [ $i = "core" ]; then - ln -sf $path/source/core include/msp/core - ln -sf $path/source/time include/msp/time + 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 else - ln -sf $path/source include/msp/$i + ln -sfT $path/source include/msp/$i fi sources="$sources `find $path/source -name '*.cpp'`" done diff --git a/source/builder.cpp b/source/builder.cpp index b90f2c4..2c137ca 100644 --- a/source/builder.cpp +++ b/source/builder.cpp @@ -301,6 +301,10 @@ int Builder::create_targets() if(!i->second->get_buildable()) continue; + Path::Path inst_base; + if(i->second->get_config().is_option("prefix")) + inst_base=i->second->get_config().get_option("prefix").value; + const ComponentList &components=i->second->get_components(); for(ComponentList::const_iterator j=components.begin(); j!=components.end(); ++j) { @@ -313,8 +317,6 @@ int Builder::create_targets() files.push_back(*k / *l); } - Path::Path inst_base=i->second->get_config().get_option("prefix").value; - bool build_exe=j->get_type()!=Component::HEADERS; list objs; diff --git a/source/component.cpp b/source/component.cpp index 38f4d6b..1274a75 100644 --- a/source/component.cpp +++ b/source/component.cpp @@ -6,7 +6,8 @@ using namespace std; Component::Component(Package &p, Type t, const string &n): pkg(p), type(t), - name(n) + name(n), + install(false) { } void Component::create_build_info() -- 2.45.2