Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

- single job submission: update the setup script to use the 

current app version directory structure.
This commit is contained in:
David Anderson 2013-02-10 12:07:09 -08:00 committed by Oliver Bock
parent eb79b9e78b
commit c9ce9eeccc
2 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
html/ops/single_job_setup.php
View File

@ -107,7 +107,19 @@ function add_apps_dir() {
}
}
// check for apps/appname/appname_platform_N,
function app_version_dir($app_name, $i, $platform) {
return "apps/$app_name/1.$i/$platform";
}
function make_app_version_dir($app_name, $i, $platform) {
@mkdir("apps/$app_name");
@mkdir("apps/$app_name/1.$i");
@mkdir("apps/$app_name/1.$i/$platform");
return 0;
}
// check for apps/appname/appname/N/platform,
// find the largest such N; see if have new wrapper
// If needed, create new version, copy wrapper
//
@ -119,7 +131,7 @@ function create_app_dir() {
$latest_i = -1;
$have_latest_wrapper = false;
while (1) {
$app_dir = "apps/$app_name/".$app_name."_1.".$i."_$platform";
$app_dir = app_version_dir($app_name, $i, $platform);
if (!file_exists($app_dir)) break;
$latest_i = $i;
$i++;
@ -127,8 +139,8 @@ function create_app_dir() {
if ($latest_i >= 0) {
$i = $latest_i;
$app_dir = "apps/$app_name/".$app_name."_1.".$i."_$platform";
$file = "$app_dir/".$app_name."_1.".$i."_$platform";
$app_dir = app_version_dir($app_name, $i, $platform);
$file = "$app_dir/".$app_name."_1.".$i;
$latest_md5 = md5_file($file);
if ($latest_md5 == $wrapper_md5) {
$have_latest_wrapper = true;
@ -150,11 +162,11 @@ function create_app_dir() {
} else {
echo "Installing current wrapper.\n";
$i = $latest_i + 1;
$app_dir = "apps/$app_name/".$app_name."_1.".$i."_$platform";
$file = "$app_dir/".$app_name."_1.".$i."_$platform";
if (!mkdir($app_dir)) {
error("Couldn't created dir: $app_dir");
$app_dir = app_version_dir($app_name, $i, $platform);
if (make_app_version_dir($app_name, $i, $platform)) {
error("Couldn't create dir: $app_dir");
}
$file = "$app_dir/$app_name"."_1.".$i;
if (!copy($wrapper_filename, $file)) {
error("Couldn't copy $wrapper_filename to $file");
}

11
tools/update_versions
View File

@ -331,11 +331,14 @@ function check_main_program($fds) {
if ($fd->main_program) $n++;
}
if ($n == 0) {
die(" No file was marked as the main program.\n");
echo " No file was marked as the main program - skipping.\n";
return 1;
}
if ($n > 1) {
die(" More than one file was marked as the main program.\n");
echo " More than one file was marked as the main program - skipping.\n";
return 1;
}
return 0;
}
function confirm($fds) {
@ -419,7 +422,9 @@ function process_version($a, $v, $p) {
if (sizeof($fds) == 1) {
$fds[0]->main_program = true;
}
check_main_program($fds);
if (check_main_program($fds)) {
return;
}
$api_version = get_api_version($a, $v, $p, $fds);
if (!confirm($fds)) {