Skip to content

Commit

Permalink
Add clawapps repository support, fix missing error
Browse files Browse the repository at this point in the history
This commit removes the exception that the clawapps environment has not
been implemented and now sets an environment variable called CLAWAPPS
that points to the appropriate path.  It also fixes a bug related to
printing out missing project dependencies.
  • Loading branch information
mandli committed Feb 3, 2012
1 parent f8abe4d commit 055b203
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions src/python/setenv.py
Original file line number Diff line number Diff line change
Expand Up @@ -166,8 +166,7 @@ def write_env_files(claw_path,verbose=True,outfile_base="setenv",
missing_projects = check_repos_dependencies(project,available_projects.keys())
if missing_projects is not None:
error_msg = "The project %s depends on the following missing projects:" % project_name
for project in missing_projects:
error_msg += "\n %s" % project
error_msg += ("\n %s" % name for name in missing_projects)

# =========================================================================
# Write out out_file_base.csh and out_file_base.sh
Expand Down Expand Up @@ -217,8 +216,9 @@ def write_env_files(claw_path,verbose=True,outfile_base="setenv",
write_environment_variable(csh_file,bash_file,"PYCLAW",available_projects["pyclaw"])

if "clawapps" in available_projects:
raise NotImplementedError("Environment settings not implemented for clawapps!")

print " CLAWAPPS = %s" % available_projects["clawapps"]
write_environment_variable(csh_file,bash_file,"CLAWAPPS",available_projects["clawapps"])

if "doc" in available_projects:
pass

Expand All @@ -239,8 +239,7 @@ def write_env_files(claw_path,verbose=True,outfile_base="setenv",
write_environment_variable(csh_file,bash_file,"SHARPCLAW",available_projects["sharpclaw"])

if "clawpack-4.x" in available_projects:
# python_path
# = ":".join((os.path.join(available_projects["clawpack-4.x"],"python"),python_path))
# python_path = ":".join((os.path.join(available_projects["clawpack-4.x"],"python"),python_path))
print " CLAW_4 = %s" % available_projects["clawpack-4.x"]
write_environment_variable(csh_file,bash_file,"CLAW_4",available_projects["clawpack-4.x"])

Expand Down

0 comments on commit 055b203

Please sign in to comment.