diff --git a/checkin_notes b/checkin_notes index d5b6bfff6b..778d447355 100755 --- a/checkin_notes +++ b/checkin_notes @@ -9838,3 +9838,16 @@ David 6 Sept 2006 clientgui/ AccountInfoPage.cpp + +David 6 Sept 2006 + - Renamed html/user/get_project_config.php to sample_get_project_config.php + this avoids overwriting a project-modified version. + - Fixed the "parse_config" script. + + html/user/ + get_project_config.php + sample_get_project_config.php + py/Boinc/ + setup_project.py + tools/ + parse_config diff --git a/doc/project_config.php b/doc/project_config.php index 4e7abde4f6..b13f0ce8ee 100644 --- a/doc/project_config.php +++ b/doc/project_config.php @@ -1,12 +1,17 @@ http://PROJECT_URL/get_project_config.php +This file is created by make_project, +and in most cases you don't have to change it. + +
This document has the structure
".html_text("
Contents
+
+
+Project configuration
+Each BOINC project exports some configuration items relevant
+to attaching and creating accounts.
+This RPC is documented
+here.
+
Create account
";
diff --git a/html/user/get_project_config.php b/html/user/sample_get_project_config.php
similarity index 100%
rename from html/user/get_project_config.php
rename to html/user/sample_get_project_config.php
diff --git a/py/Boinc/setup_project.py b/py/Boinc/setup_project.py
index 9a3f03f3a2..98f04303af 100644
--- a/py/Boinc/setup_project.py
+++ b/py/Boinc/setup_project.py
@@ -312,7 +312,7 @@ def create_project_dirs(dest_dir):
def install_boinc_files(dest_dir):
"""Copy files from source dir to project dir.
- Used by the upgrade script, so don't overwrite sample files."""
+ Used by the upgrade script, so don't copy sample files to real name."""
def dir(*dirs):
return apply(os.path.join,(dest_dir,)+dirs)
@@ -461,9 +461,11 @@ class Project:
install_boinc_files(self.dir())
- # copy sample web files
+ # copy sample web files to final names
install(srcdir('html/user/sample_index.php'),
self.dir('html/user/index.php'))
+ install(srcdir('html/user/sample_get_project_config.php'),
+ self.dir('html/user/get_project_config.php'))
install(srcdir('html/project.sample/project.inc'),
self.dir('html/project/project.inc'))
install(srcdir('html/project.sample/project_specific_prefs.inc'),
diff --git a/tools/parse_config b/tools/parse_config
index 7bc0778460..2befef89b1 100755
--- a/tools/parse_config
+++ b/tools/parse_config
@@ -2,39 +2,17 @@
# -*- mode: python; python-indent: 4; -*-
-
-
## $Id$
-
-
'''
-
-
-
A program to pass config file settings to calling programs via stdout
-
-
'''
-
-
-import boinc_path_config
-from Boinc import configxml
-
+import configxml
import sys, os
-
-
program_path = os.path.realpath(os.path.dirname(sys.argv[0]))
-
config_filename = os.path.realpath(os.path.join(program_path, '../config.xml'))
-
-
-
config = configxml.ConfigFile(config_filename).read()
-
-
print config.config.__dict__.get(sys.argv[1])
-