const PackageList &pkg_reqs = package.get_required_packages();
PackageList direct_reqs = requires;
direct_reqs.insert(direct_reqs.end(), pkg_reqs.begin(), pkg_reqs.end());
const PackageList &pkg_reqs = package.get_required_packages();
PackageList direct_reqs = requires;
direct_reqs.insert(direct_reqs.end(), pkg_reqs.begin(), pkg_reqs.end());
BuildInfo::UpdateLevel level = BuildInfo::CHAINED;
if(find(direct_reqs.begin(), direct_reqs.end(), *i)!=direct_reqs.end())
level = BuildInfo::DEPENDENCY;
BuildInfo::UpdateLevel level = BuildInfo::CHAINED;
if(find(direct_reqs.begin(), direct_reqs.end(), *i)!=direct_reqs.end())
level = BuildInfo::DEPENDENCY;
const PackageList &reqs = (*i)->get_required_packages();
for(PackageList::const_iterator j=reqs.begin(); j!=reqs.end(); ++j)
const PackageList &reqs = (*i)->get_required_packages();
for(PackageList::const_iterator j=reqs.begin(); j!=reqs.end(); ++j)
for(BuildInfo::PathList::iterator i=build_info.incpath.begin(); i!=build_info.incpath.end(); ++i)
*i = (package.get_source_directory() / *i).str();
for(BuildInfo::PathList::iterator i=build_info.libpath.begin(); i!=build_info.libpath.end(); ++i)
*i = (package.get_source_directory() / *i).str();
for(BuildInfo::PathList::iterator i=build_info.incpath.begin(); i!=build_info.incpath.end(); ++i)
*i = (package.get_source_directory() / *i).str();
for(BuildInfo::PathList::iterator i=build_info.libpath.begin(); i!=build_info.libpath.end(); ++i)
*i = (package.get_source_directory() / *i).str();
if(type==LIBRARY || type==MODULE)
if(build_info.libmode<BuildInfo::DYNAMIC)
build_info.libmode = BuildInfo::DYNAMIC;
if(type==LIBRARY || type==MODULE)
if(build_info.libmode<BuildInfo::DYNAMIC)
build_info.libmode = BuildInfo::DYNAMIC;
- //const Tool &tar = toolchain.get_tool("TAR");
-
- string tarname = name;
- if(name=="@src")
- {
- tarname = package.get_name()+"-"+package.get_version();
- source_filenames.push_back(package.get_source_directory()/"Build");
- }
+ const Tool &tar = toolchain.get_tool("TAR");
list<Target *> files;
for(PathList::const_iterator i=source_filenames.begin(); i!=source_filenames.end(); ++i)
{
FileTarget *file = builder.get_vfs().get_target(*i);
if(!file)
list<Target *> files;
for(PathList::const_iterator i=source_filenames.begin(); i!=source_filenames.end(); ++i)
{
FileTarget *file = builder.get_vfs().get_target(*i);
if(!file)
const Builder::TargetMap &targets = builder.get_targets();
for(Builder::TargetMap::const_iterator i=targets.begin(); i!=targets.end(); ++i)
if(i->second->get_package()==&package && !i->second->is_buildable())
const Builder::TargetMap &targets = builder.get_targets();
for(Builder::TargetMap::const_iterator i=targets.begin(); i!=targets.end(); ++i)
if(i->second->get_package()==&package && !i->second->is_buildable())
- /* XXX The source files don't have a package at the moment, so we can't
- create the tarball target until things get fixed up a bit */
- /*Target *result = tar.create_target(files, tarname);
+ Target *result = tar.create_target(files, tarname);
source = new File(builder, package, source_filenames.front());
Target *result = dcomp.create_target(*source);
source = new File(builder, package, source_filenames.front());
Target *result = dcomp.create_target(*source);