Updating version, ChangeLog and copying the most recent configure from ./org.glite...

diff --git a/org.glite.lb.server/configure b/org.glite.lb.server/configure
index f2880c2..3d43cdb 100755 (executable)
--- a/org.glite.lb.server/configure
+++ b/org.glite.lb.server/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.server/project/ChangeLog b/org.glite.lb.server/project/ChangeLog
index 62fc7a2..b927b09 100644 (file)
--- a/org.glite.lb.server/project/ChangeLog
+++ b/org.glite.lb.server/project/ChangeLog
@@ -444,3 +444,25 @@
 - Fixed default location for html-header.html file
 - Better handling of c-ares error codes
 
+2.4.6-1
+- Job connections -- explicitly created and deactivated by event, implicitly deactivated by job done/canceled/aborted status, purged with job
+- 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
+- New parameter to indicate the type of credentials to acquire
+- Using enum naming arrays where applicable
+- Unused function clear_history() provisionally removed
+- Job history colation code moved from notif_match to jobstat
+- History flag is now observed in job status queries
+- Job history is displayed in HTML Job Detail if present
+- edg_wll_FreeAcl() prevented from crashing on NULL
+- Information added to HTML and text output:
+  - Job type
+  - Job type-specific status info
+  - User Tags
+  - ACLs
+- Listing HTML header file path in server configuration
+- Major consolidation and refactoring of HTML and text output generating code
+- Using ?flags=... query string in URL for flags
+- Statistics type definitions separated from declarations to suppress compiler warnings
+

diff --git a/org.glite.lb.server/project/version.properties b/org.glite.lb.server/project/version.properties
index 67e6626..25fc056 100644 (file)
--- a/org.glite.lb.server/project/version.properties
+++ b/org.glite.lb.server/project/version.properties
@@ -1,3 +1,3 @@
 # : /cvs/jra1mw/org.glite.lb.server/project/version.properties,v 1.185 2008/06/25 13:12:58 akrenek Exp $
-module.version=2.4.5
+module.version=2.4.6
 module.age=1