From 2fe2a730bcb6be3b6cc361afb6ac99b699649fd5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zden=C4=9Bk=20=C5=A0ustr?= Date: Thu, 4 Feb 2010 13:47:31 +0000 Subject: [PATCH] * Changes in configuration generating logic - Removed default platform from subsystem configurations (commented out) - Removed the "path" attribute from branch configuirations --- org.glite.lb/configure | 9 +++++---- org.glite.lb/etics-tag-with-subsystems-branch.pl | 6 ++++-- org.glite.lb/etics-tag-with-subsystems.pl | 6 ++++-- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/org.glite.lb/configure b/org.glite.lb/configure index d6cb643..da58e0e 100755 --- a/org.glite.lb/configure +++ b/org.glite.lb/configure @@ -586,10 +586,12 @@ sub mode_etics { if ($branch) { $conf = "glite-${subsys}-${module}_$branch"; - $conftag = $branch; } + $conftag = $branch; + $dwpath = ""; } else { $conf = "glite-$subsys-${module}_R_${major}_${minor}_${rev}_${age}"; - $conftag = $conf; } + $conftag = $conf; + $dwpath = "path = \${projectName}/\${moduleName}/\${version}/\${platformName}/\${packageName}-\${version}-\${age}.tar.gz\n"; } # my $conf = "glite-$subsys-${module}_R_${major}_${minor}_${rev}_${age}"; my $file = $output ? $output : "$conf.ini"; open C,">$file" or die "$file: $!\n"; @@ -610,8 +612,7 @@ age = $age deploymentType = None tag = $conftag version = $major.$minor.$rev -path = \${projectName}/\${moduleName}/\${version}/\${platformName}/\${packageName}-\${version}-\${age}.tar.gz - +$dwpath [Platform-default:VcsCommand] displayName = None description = None diff --git a/org.glite.lb/etics-tag-with-subsystems-branch.pl b/org.glite.lb/etics-tag-with-subsystems-branch.pl index 0ec883a..6322a94 100644 --- a/org.glite.lb/etics-tag-with-subsystems-branch.pl +++ b/org.glite.lb/etics-tag-with-subsystems-branch.pl @@ -119,9 +119,11 @@ usage: $0 -b [-c configuration] subsystem.name printf (NEWCONF "[Configuration-$newconfig]\nprofile = None\nmoduleName = $module\ndisplayName = $newconfig\ndescription = None\nprojectName = org.glite\nage = $current_age\ntag = $branch\nversion = $current_major.$current_minor.$current_revision\npath = None\n\n"); - printf (NEWCONF "[Platform-default:VcsCommand]\ndisplayName = None\ndescription = HEAD CVS commands\ntag = cvs -d \${vcsroot} tag -R \${tag} \${moduleName}\nbranch = None\ncommit = None\ncheckout = cvs -d \${vcsroot} co -r \${tag} \${moduleName}\n\n"); +# printf (NEWCONF "[Platform-default:VcsCommand]\ndisplayName = None\ndescription = HEAD CVS commands\ntag = cvs -d \${vcsroot} tag -R \${tag} \${moduleName}\nbranch = None\ncommit = None\ncheckout = cvs -d \${vcsroot} co -r \${tag} \${moduleName}\n\n"); - printf (NEWCONF "[Platform-default:Environment]\nHOME = \${workspaceDir}\n\n[Hierarchy]\n"); +# printf (NEWCONF "[Platform-default:Environment]\nHOME = \${workspaceDir}"); + + printf (NEWCONF "\n\n[Hierarchy]\n"); foreach $m (@modules) { open MOD, "$m/project/version.properties" or die "$m/project/version.properties: $?\n"; diff --git a/org.glite.lb/etics-tag-with-subsystems.pl b/org.glite.lb/etics-tag-with-subsystems.pl index fd8a331..bd5e113 100755 --- a/org.glite.lb/etics-tag-with-subsystems.pl +++ b/org.glite.lb/etics-tag-with-subsystems.pl @@ -244,9 +244,11 @@ usage: $0 [-c ] module.name printf (NEWCONF "[Configuration-$newconfig]\nprofile = None\nmoduleName = $module\ndisplayName = $newconfig\ndescription = None\nprojectName = org.glite\nage = $age\ntag = $tag\nversion = $major.$minor.$revision\npath = None\n\n"); - printf (NEWCONF "[Platform-default:VcsCommand]\ndisplayName = None\ndescription = HEAD CVS commands\ntag = cvs -d \${vcsroot} tag -R \${tag} \${moduleName}\nbranch = None\ncommit = None\ncheckout = cvs -d \${vcsroot} co -r \${tag} \${moduleName}\n\n"); +# printf (NEWCONF "[Platform-default:VcsCommand]\ndisplayName = None\ndescription = HEAD CVS commands\ntag = cvs -d \${vcsroot} tag -R \${tag} \${moduleName}\nbranch = None\ncommit = None\ncheckout = cvs -d \${vcsroot} co -r \${tag} \${moduleName}\n\n"); - printf (NEWCONF "[Platform-default:Environment]\nHOME = \${workspaceDir}\n\n[Hierarchy]\n"); +# printf (NEWCONF "[Platform-default:Environment]\nHOME = \${workspaceDir}"); + + printf (NEWCONF "\n\n[Hierarchy]\n"); foreach $m (@modules) { open MOD, "$m/project/version.properties" or die "$m/project/version.properties: $?\n"; -- 1.8.2.3