diff --git a/src/build/project.jam b/src/build/project.jam index 929f5bacd..48a61d1a3 100644 --- a/src/build/project.jam +++ b/src/build/project.jam @@ -117,24 +117,6 @@ rule load-parent ( location ) # 'location'. Reports an error if a Jamfile has already been loaded for that # location. # -rule act-as-jamfile ( module : location ) -{ - if [ module-name $(location) ] in $(.jamfile-modules) - { - import errors ; - errors.error "Jamfile was already loaded for '$(location)'" ; - } - # Set up non-default mapping from location to module. - .module.$(location) = $(module) ; - - # Add the location to the list of project locations so that we do not try to - # reload the same Jamfile in the future. - .jamfile-modules += [ module-name $(location) ] ; - - initialize $(module) : $(location) ; -} - - # Returns the project module corresponding to the given project-id or plain # directory name. Returns nothing if such a project can not be found. # diff --git a/src/build/project.py b/src/build/project.py index 7aa483fde..eca39affe 100644 --- a/src/build/project.py +++ b/src/build/project.py @@ -179,24 +179,6 @@ class ProjectRegistry: return self.load(os.path.dirname(found[0])) - def act_as_jamfile(self, module, location): - """Makes the specified 'module' act as if it were a regularly loaded Jamfile - at 'location'. If Jamfile is already located for that location, it's an - error.""" - - if self.module_name(location) in self.jamfile_modules: - self.manager.errors()( - "Jamfile was already loaded for '%s'" % location) - - # Set up non-default mapping from location to module. - self.location2module[location] = module - - # Add the location to the list of project locations so that we do not - # try to reload the same Jamfile in the future. - self.jamfile_modules.append(location) - - self.initialize(module, location) - def find(self, name, current_location): """Given 'name' which can be project-id or plain directory name, return project module corresponding to that id or directory.