From e861df4ba204dea920ee0509acd9afd06cf88507 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Wed, 18 May 2011 16:59:15 +0000 Subject: [PATCH] - update_versions: make work svn path=/trunk/boinc/; revision=23559 --- checkin_notes | 16 +++++++++++----- tools/update_versions | 10 ++++++++++ 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/checkin_notes b/checkin_notes index d24b8ea167..113ad7e497 100644 --- a/checkin_notes +++ b/checkin_notes @@ -3011,13 +3011,13 @@ David 16 May 2011 lib/ Makefile.am -David 18 May 2011 +David 17 May 2011 - update_versions: fix bug in version number parsing (from Kevin) tools/ update_versions -David 18 May 2011 +David 17 May 2011 - scheduler: if an in-progress limit is given in config_aux.xml, and is not specified, default it to false. - scheduler: add some log messages @@ -3028,7 +3028,7 @@ David 18 May 2011 sched_send.cpp sched_main.cpp -David 18 May 2011 +David 17 May 2011 - scheduler: add config option. If set, and a WU has nonzero batch, it is interpreted as a user ID, @@ -3053,8 +3053,14 @@ Rom 17 May 2011 clientgui/ WizardAttach.cpp -Charlie 16 May 2011 +Charlie 18 May 2011 - MGR: Fix welcome message in Account Manager Wizard completion page. clientgui/ - CompletionPage.cpp \ No newline at end of file + CompletionPage.cpp + +David 18 May 2011 + - update_versions: make work + + tools/ + update_versions diff --git a/tools/update_versions b/tools/update_versions index fc0902e8fc..edb03954be 100755 --- a/tools/update_versions +++ b/tools/update_versions @@ -87,6 +87,9 @@ function file_ref_xml($fd) { if (isset($fd->logical_name) && strlen($fd->logical_name)) { $xml .= " $fd->logical_name\n"; } + if ($fd->copy_file) { + $xml .= " \n"; + } if ($fd->main_program) { $xml .= " \n"; } @@ -216,6 +219,9 @@ function process_file($a, $v, $p, $name, $fds) { if (!isset($fd->main_program)) { $fd->main_program = false; } + if (!isset($fd->copy_file)) { + $fd->copy_file = false; + } $fd->present = true; $fds = update_file($fds, $fd); @@ -327,6 +333,10 @@ function convert_simplexml($x) { $s = (string) $x; 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); $fds[] = $fd;