mirror of https://github.com/BOINC/boinc.git
- update_versions: make <copy_file> work
svn path=/trunk/boinc/; revision=23559
This commit is contained in:
parent
015d2537fd
commit
e861df4ba2
|
@ -3011,13 +3011,13 @@ David 16 May 2011
|
||||||
lib/
|
lib/
|
||||||
Makefile.am
|
Makefile.am
|
||||||
|
|
||||||
David 18 May 2011
|
David 17 May 2011
|
||||||
- update_versions: fix bug in version number parsing (from Kevin)
|
- update_versions: fix bug in version number parsing (from Kevin)
|
||||||
|
|
||||||
tools/
|
tools/
|
||||||
update_versions
|
update_versions
|
||||||
|
|
||||||
David 18 May 2011
|
David 17 May 2011
|
||||||
- scheduler: if an in-progress limit is given in config_aux.xml,
|
- scheduler: if an in-progress limit is given in config_aux.xml,
|
||||||
and <per_proc> is not specified, default it to false.
|
and <per_proc> is not specified, default it to false.
|
||||||
- scheduler: add some log messages
|
- scheduler: add some log messages
|
||||||
|
@ -3028,7 +3028,7 @@ David 18 May 2011
|
||||||
sched_send.cpp
|
sched_send.cpp
|
||||||
sched_main.cpp
|
sched_main.cpp
|
||||||
|
|
||||||
David 18 May 2011
|
David 17 May 2011
|
||||||
- scheduler: add <user_filter> config option.
|
- scheduler: add <user_filter> config option.
|
||||||
If set, and a WU has nonzero batch,
|
If set, and a WU has nonzero batch,
|
||||||
it is interpreted as a user ID,
|
it is interpreted as a user ID,
|
||||||
|
@ -3053,8 +3053,14 @@ Rom 17 May 2011
|
||||||
clientgui/
|
clientgui/
|
||||||
WizardAttach.cpp
|
WizardAttach.cpp
|
||||||
|
|
||||||
Charlie 16 May 2011
|
Charlie 18 May 2011
|
||||||
- MGR: Fix welcome message in Account Manager Wizard completion page.
|
- MGR: Fix welcome message in Account Manager Wizard completion page.
|
||||||
|
|
||||||
clientgui/
|
clientgui/
|
||||||
CompletionPage.cpp
|
CompletionPage.cpp
|
||||||
|
|
||||||
|
David 18 May 2011
|
||||||
|
- update_versions: make <copy_file> work
|
||||||
|
|
||||||
|
tools/
|
||||||
|
update_versions
|
||||||
|
|
|
@ -87,6 +87,9 @@ function file_ref_xml($fd) {
|
||||||
if (isset($fd->logical_name) && strlen($fd->logical_name)) {
|
if (isset($fd->logical_name) && strlen($fd->logical_name)) {
|
||||||
$xml .= " <open_name>$fd->logical_name</open_name>\n";
|
$xml .= " <open_name>$fd->logical_name</open_name>\n";
|
||||||
}
|
}
|
||||||
|
if ($fd->copy_file) {
|
||||||
|
$xml .= " <copy_file/>\n";
|
||||||
|
}
|
||||||
if ($fd->main_program) {
|
if ($fd->main_program) {
|
||||||
$xml .= " <main_program/>\n";
|
$xml .= " <main_program/>\n";
|
||||||
}
|
}
|
||||||
|
@ -216,6 +219,9 @@ function process_file($a, $v, $p, $name, $fds) {
|
||||||
if (!isset($fd->main_program)) {
|
if (!isset($fd->main_program)) {
|
||||||
$fd->main_program = false;
|
$fd->main_program = false;
|
||||||
}
|
}
|
||||||
|
if (!isset($fd->copy_file)) {
|
||||||
|
$fd->copy_file = false;
|
||||||
|
}
|
||||||
|
|
||||||
$fd->present = true;
|
$fd->present = true;
|
||||||
$fds = update_file($fds, $fd);
|
$fds = update_file($fds, $fd);
|
||||||
|
@ -327,6 +333,10 @@ function convert_simplexml($x) {
|
||||||
$s = (string) $x;
|
$s = (string) $x;
|
||||||
if ($s == "" || int($s)>0) $fd->main_program = true;
|
if ($s == "" || int($s)>0) $fd->main_program = true;
|
||||||
}
|
}
|
||||||
|
foreach($fx->xpath('copy_file') as $x) {
|
||||||
|
$s = (string) $x;
|
||||||
|
if ($s == "" || int($s)>0) $fd->copy_file = true;
|
||||||
|
}
|
||||||
|
|
||||||
//echo "fd: "; print_r($fd);
|
//echo "fd: "; print_r($fd);
|
||||||
$fds[] = $fd;
|
$fds[] = $fd;
|
||||||
|
|
Loading…
Reference in New Issue