From: Zdeněk Šustr <sustr4@cesnet.cz>
Date: Tue, 28 Aug 2012 07:51:15 +0000 (+0000)
Subject: Updating version, ChangeLog and copying the most recent configure from ./org.glite... 
X-Git-Tag: glite-lb-state-machine_R_1_4_2_1~1
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=6461387b12d7f4b19cf79a4d98693f37065cad08;p=jra1mw.git

Updating version, ChangeLog and copying the most recent configure from ./org.glite.lb for v. 1.4.2-1
---

diff --git a/org.glite.lb.state-machine/configure b/org.glite.lb.state-machine/configure
index f2880c2..3d43cdb 100755
--- a/org.glite.lb.state-machine/configure
+++ b/org.glite.lb.state-machine/configure
@@ -1712,8 +1712,11 @@ sub mode_etics {
 	top_srcdir = ..
 	$flags
 	EOF";
-			$cmd{default}{compile} = "make prefix=\${prefix}$project{local_prefix} libdir=\${libdir}";
-			$cmd{default}{install} = "make prefix=\${prefix}$project{local_prefix} libdir=\${libdir} install";
+			# no stage builds since EMI-3
+			if ($project ne 'emi' or $project_version <= 2) {
+				$cmd{default}{compile} = "make prefix=\${prefix}$project{local_prefix} libdir=\${libdir}";
+				$cmd{default}{install} = "make prefix=\${prefix}$project{local_prefix} libdir=\${libdir} install";
+			}
 			mode_etics_packaging($fmod, \%cmd,
 				"make prefix=\${prefix}$project{local_prefix} rpm-prepare
 	cp gridsite.spec ../\n\t",
@@ -1757,12 +1760,15 @@ sub mode_etics {
 	}
 	else {
 		$cmd{default}{configure} = "/usr/bin/perl $confdir/configure $project{flavours} --root=\${prefix} --prefix=$project{local_prefix} --stage=\${stageDir} --sysroot=\${package.prefix} --libdir=\${libdir} --project=\${projectName} --module $subsys.$module @copts";
-		$cmd{default}{compile} = 'make';
-		$cmd{default}{test} = 'make check';
-		$cmd{default}{install} = 'make install';
-		if ($subsys eq 'lb' and $module eq 'client') {
-			$cmd{default}{compile} = "make rpath=$project{local_prefix}/\${libdir}";
-			$cmd{default}{install} = "make install post-install rpath=$project{local_prefix}/\${libdir}";
+		# no stage builds since EMI-3
+		if ($project ne 'emi' or $project_version <= 2) {
+			$cmd{default}{compile} = 'make';
+			$cmd{default}{test} = 'make check';
+			$cmd{default}{install} = 'make install';
+			if ($subsys eq 'lb' and $module eq 'client') {
+				$cmd{default}{compile} = "make rpath=$project{local_prefix}/\${libdir}";
+				$cmd{default}{install} = "make install post-install rpath=$project{local_prefix}/\${libdir}";
+			}
 		}
 		mode_etics_packaging($fmod, \%cmd, "make dist\n\t", "make dist\n\t");
 	}
diff --git a/org.glite.lb.state-machine/project/ChangeLog b/org.glite.lb.state-machine/project/ChangeLog
index 930e7c8..8211429 100644
--- a/org.glite.lb.state-machine/project/ChangeLog
+++ b/org.glite.lb.state-machine/project/ChangeLog
@@ -136,3 +136,9 @@
 - Simplified source tarball and packages distribution
 - Basic state machine for VM
 
+1.4.2-1
+- Job connections -- explicitly created and deactivated by event
+- New events: running/shutdown from machine, VM manager and cloud manager for better state computation
+- VM manager name in create event and usage in shutdown event
+- VM states mapped to gLite states
+
diff --git a/org.glite.lb.state-machine/project/version.properties b/org.glite.lb.state-machine/project/version.properties
index 228fa9c..b54194c 100644
--- a/org.glite.lb.state-machine/project/version.properties
+++ b/org.glite.lb.state-machine/project/version.properties
@@ -1,3 +1,3 @@
 # $Header$
-module.version=1.4.1
+module.version=1.4.2
 module.age=1