diff -ur globus_gram_job_manager-10.59.orig/configuration.dox globus_gram_job_manager-10.59/configuration.dox
--- globus_gram_job_manager-10.59.orig/configuration.dox 2009-09-24 21:09:38.000000000 +0200
+++ globus_gram_job_manager-10.59/configuration.dox 2010-07-17 11:52:01.369553548 +0200
@@ -6,7 +6,7 @@
which may be passed to the GRAM Job Manager in the configuration
file <code>$GLOBUS_LOCATION/etc/globus-job-manager.conf</code>.
-@subsection globus_gram_job_manager_configuration_opts Configuration File Options
+@section globus_gram_job_manager_configuration_opts Configuration File Options
@par -save-logfile always|on-error|never
Create a file to store Job Manager log messages. This file will be created
@@ -102,18 +102,18 @@
hosts. If not present, then the trusted certificate directory
used by the job manager (usually set by the Gatekeeper) will be used
-@para -seg-module MODULE
+@par -seg-module MODULE
Use the named module as a way to interact with the scheduler instead of polling
for job status.
-@para -audit-directory DIRECTORY
+@par -audit-directory DIRECTORY
Store job auditing records in DIRECTORY. This directory should be sticky and group
writable but not group readable. Audit records can be uploaded to a database by
using the globus-gram-audit command.
-@para -globus-toolkit-version VERSION-STRING
+@par -globus-toolkit-version VERSION-STRING
Use the string VERSION-STRING as the toolkit version in audit records.
-@para -single
+@par -single
Use the single job manager per user/jobmanager type feature
*/
diff -ur globus_gram_job_manager-10.59.orig/globus_gram_job_manager.c globus_gram_job_manager-10.59/globus_gram_job_manager.c
--- globus_gram_job_manager-10.59.orig/globus_gram_job_manager.c 2010-07-01 21:18:09.000000000 +0200
+++ globus_gram_job_manager-10.59/globus_gram_job_manager.c 2010-07-17 11:52:01.370553534 +0200
@@ -2101,7 +2101,8 @@
{
state_dir_path = globus_common_create_string(
"%s/tmp/gram_job_state/",
- manager->config->globus_location);
+ manager->config->globus_location ?
+ manager->config->globus_location : "");
}
else
{
diff -ur globus_gram_job_manager-10.59.orig/globus_gram_job_manager_config.c globus_gram_job_manager-10.59/globus_gram_job_manager_config.c
--- globus_gram_job_manager-10.59.orig/globus_gram_job_manager_config.c 2010-06-10 14:49:14.000000000 +0200
+++ globus_gram_job_manager-10.59/globus_gram_job_manager_config.c 2010-07-17 11:52:01.370553534 +0200
@@ -468,17 +468,6 @@
goto out;
}
}
- if (config->target_globus_location == NULL)
- {
- config->target_globus_location = strdup(
- config->globus_location);
- if (config->target_globus_location == NULL)
- {
- rc = GLOBUS_GRAM_PROTOCOL_ERROR_MALLOC_FAILED;
-
- goto out;
- }
- }
if (config->scratch_dir_base == NULL)
{
config->scratch_dir_base = strdup(
diff -ur globus_gram_job_manager-10.59.orig/globus_gram_job_manager_request.c globus_gram_job_manager-10.59/globus_gram_job_manager_request.c
--- globus_gram_job_manager-10.59.orig/globus_gram_job_manager_request.c 2010-06-10 14:49:15.000000000 +0200
+++ globus_gram_job_manager-10.59/globus_gram_job_manager_request.c 2010-07-17 11:52:01.371553590 +0200
@@ -2321,13 +2321,16 @@
goto add_gram_job_contact_failed;
}
- rc = globus_l_gram_add_environment(
- request->rsl,
- "GLOBUS_LOCATION",
- request->config->target_globus_location);
- if (rc != GLOBUS_SUCCESS)
+ if (request->config->target_globus_location)
{
- goto add_globus_location_failed;
+ rc = globus_l_gram_add_environment(
+ request->rsl,
+ "GLOBUS_LOCATION",
+ request->config->target_globus_location);
+ if (rc != GLOBUS_SUCCESS)
+ {
+ goto add_globus_location_failed;
+ }
}
if (request->config->tcp_port_range)
diff -ur globus_gram_job_manager-10.59.orig/globus_gram_job_manager_script.c globus_gram_job_manager-10.59/globus_gram_job_manager_script.c
--- globus_gram_job_manager-10.59.orig/globus_gram_job_manager_script.c 2010-06-10 14:49:15.000000000 +0200
+++ globus_gram_job_manager-10.59/globus_gram_job_manager_script.c 2010-07-17 11:52:01.372554834 +0200
@@ -737,7 +737,6 @@
char * job_contact_match = 0;
if( ! request ||
- ! request->config->globus_location ||
!request->job_contact)
{
goto FAST_POLL_EXIT_FAILURE;
@@ -756,7 +755,8 @@
*/
grid_monitor_files[0] = globus_common_create_string(
"%s%s%d",
- request->config->globus_location,
+ request->config->globus_location ?
+ request->config->globus_location : "",
GRID_MONITOR_LOCATION_1,
(int)this_uid);
if( ! grid_monitor_files[0])
@@ -766,7 +766,8 @@
grid_monitor_files[1] = globus_common_create_string(
"%s%s%d",
- request->config->globus_location,
+ request->config->globus_location ?
+ request->config->globus_location : "",
GRID_MONITOR_LOCATION_2,
(int)this_uid);
if( ! grid_monitor_files[1])
@@ -1856,9 +1857,18 @@
*/
/*---------------- job manager script -----------------*/
- sprintf(script_path,
- "%s/libexec/globus-job-manager-script.pl",
- request->config->globus_location);
+ sprintf(script_path,
+ "%s/share/globus/globus-job-manager-script.pl",
+ request->config->globus_location ?
+ request->config->globus_location : "/usr");
+
+ if (stat(script_path, &statbuf) != 0)
+ {
+ sprintf(script_path,
+ "%s/libexec/globus-job-manager-script.pl",
+ request->config->globus_location ?
+ request->config->globus_location : "/usr");
+ }
if (stat(script_path, &statbuf) != 0)
{
@@ -1870,14 +1880,14 @@
"event=gram.request_validate.end "
"level=ERROR "
"gramid=%s "
- "path=\"%s/libexec/globus-job-manager-script.pl\" "
+ "path=\"%s\" "
"msg=\"%s\" "
"status=%d "
"errno=%d "
"reason=\"%s\" "
"\n",
request->job_contact_path,
- request->config->globus_location,
+ script_path,
"Script status failed",
-rc,
errno,
@@ -1896,12 +1906,12 @@
"event=gram.request_validate.end "
"level=ERROR "
"gramid=%s "
- "path=\"%s/libexec/globus-job-manager-script.pl\" "
+ "path=\"%s\" "
"msg=\"%s\" "
"status=%d "
"\n",
request->job_contact_path,
- request->config->globus_location,
+ script_path,
"Script not executable",
-rc);
@@ -1911,6 +1921,11 @@
/*
* Verify existence/executableness of scheduler specific script.
*/
+
+ /* This check will not work when perl modules are installed in the
+ system location. Since the location differs between distributons
+ and perl versions the location can not be hardcoded.
+
sprintf(script_path, "%s/lib/perl/Globus/GRAM/JobManager/%s.pm",
location,
request->config->jobmanager_type);
@@ -1941,6 +1956,7 @@
goto free_location_exit;
}
+ */
globus_gram_job_manager_request_log(
request,
@@ -1953,7 +1969,8 @@
0);
free_location_exit:
- free(location);
+ if(location)
+ free(location);
return rc;
}
/* globus_l_gram_request_validate() */
@@ -2473,10 +2490,23 @@
char * pipe_cmd[6];
char * env[7];
int i;
+ struct stat statbuf;
+ char script_path[512];
- pipe_cmd[0] = globus_common_create_string(
- "%s/libexec/globus-job-manager-script.pl",
- manager->config->globus_location);
+ sprintf(script_path,
+ "%s/share/globus/globus-job-manager-script.pl",
+ manager->config->globus_location ?
+ manager->config->globus_location : "/usr");
+
+ if (stat(script_path, &statbuf) != 0)
+ {
+ sprintf(script_path,
+ "%s/libexec/globus-job-manager-script.pl",
+ manager->config->globus_location ?
+ manager->config->globus_location : "/usr");
+ }
+
+ pipe_cmd[0] = strdup(script_path);
if (pipe_cmd[0] == NULL)
{
rc = GLOBUS_GRAM_PROTOCOL_ERROR_MALLOC_FAILED;
@@ -2496,9 +2526,12 @@
memset(env, 0, sizeof(env));
i = 0;
- env[i++] = globus_common_create_string(
- "GLOBUS_LOCATION=%s",
- manager->config->globus_location);
+ if (manager->config->globus_location)
+ {
+ env[i++] = globus_common_create_string(
+ "GLOBUS_LOCATION=%s",
+ manager->config->globus_location);
+ }
env[i++] = globus_common_create_string(
"GLOBUS_SPOOL_DIR=%s",
manager->config->job_state_file_dir);
diff -ur globus_gram_job_manager-10.59.orig/globus_gram_job_manager_script_interface.dox globus_gram_job_manager-10.59/globus_gram_job_manager_script_interface.dox
--- globus_gram_job_manager-10.59.orig/globus_gram_job_manager_script_interface.dox 2002-08-08 22:57:18.000000000 +0200
+++ globus_gram_job_manager-10.59/globus_gram_job_manager_script_interface.dox 2010-07-17 11:52:01.373554331 +0200
@@ -7,9 +7,7 @@
Manager. These are:
<dl>
<dt>
- <b>
- <a href="../../perl/Globus/GRAM/Error.html">Globus::GRAM::Error</a>
- </b>
+ Globus::GRAM::Error
</dt>
<dd>
This module implements the GRAM error results as objects. Methods
@@ -19,11 +17,7 @@
errors to the Job Manager program.
</dd>
<dt>
- <b>
- <a href="../../perl/Globus/GRAM/JobState.html">
- Globus::GRAM::JobState
- </a>
- </b>
+ Globus::GRAM::JobState
</dt>
<dd>
This module defines the GRAM job state constants. A scheduler-specific
@@ -31,11 +25,7 @@
to indicate the managed job's current state.
</dd>
<dt>
- <b>
- <a href="../../perl/Globus/GRAM/JobSignal.html">
- Globus::GRAM::JobSignal
- </a>
- </b>
+ Globus::GRAM::JobSignal
</dt>
<dd>
This module defines the GRAM job signal constant values. The Job
@@ -43,11 +33,7 @@
invoked in the manager's signal method.
</dd>
<dt>
- <b>
- <a href="../../perl/Globus/GRAM/JobManager.html">
- Globus::GRAM::JobManager
- </a>
- </b>
+ Globus::GRAM::JobManager
</dt>
<dd>
This module defines the actual implementatoin of the Job Manager
@@ -56,11 +42,7 @@
default implementation's methods.
</dd>
<dt>
- <b>
- <a href="../../perl/Globus/GRAM/JobDescription.html">
- Globus::GRAM::JobDescription
- </a>
- </b>
+ Globus::GRAM::JobDescription
</dt>
<dd>
This module mimics the RSL job description using perl syntax. The job
@@ -71,7 +53,7 @@
name (example: <code>$description->gram_my_job()</code>). Method names
are handled as if they were based on the canonical RSL representation
of the attribute name. For example, the <b>gram_my_job</b> may be
- equivalently referrred to as <b>GramMyJob</b>, <b>grammyjob</b>, or
+ equivalently referred to as <b>GramMyJob</b>, <b>grammyjob</b>, or
<b>GRAM_My_Job</b>.
</dd>
</dl>
diff -ur globus_gram_job_manager-10.59.orig/globus_gram_job_manager_script_tutorial.dox globus_gram_job_manager-10.59/globus_gram_job_manager_script_tutorial.dox
--- globus_gram_job_manager-10.59.orig/globus_gram_job_manager_script_tutorial.dox 2008-08-15 11:33:05.000000000 +0200
+++ globus_gram_job_manager-10.59/globus_gram_job_manager_script_tutorial.dox 2010-07-17 11:52:01.373554331 +0200
@@ -63,7 +63,7 @@
}
@endcode
-The values surrounded by the at-sign (such as <code>@MPIRUN@</code>)
+The values surrounded by the at-sign (such as <code>\@MPIRUN\@</code>)
will be replaced by with the path to the named programs by
the <code>find-lsf-tools</code> script described
@ref system_specific_configuration "below".
@@ -686,7 +686,7 @@
what needs to be installed into which directory, and what source files
need to be put inot our source distribution. For the LSF package, we
need to list the <code>lsf.in</code>, <code>find-lsf-tools</code>, and
-code>setup-globus-job-manager-lsf.pl</code> scripts as files to be
+<code>setup-globus-job-manager-lsf.pl</code> scripts as files to be
installed into the setup directory. We need to add those files plus our
documentation source file to the EXTRA_LIST variable so that they
will be included in source distributions. The rest of the lines in the
diff -ur globus_gram_job_manager-10.59.orig/globus_gram_job_manager_state_file.c globus_gram_job_manager-10.59/globus_gram_job_manager_state_file.c
--- globus_gram_job_manager-10.59.orig/globus_gram_job_manager_state_file.c 2010-07-07 22:59:07.000000000 +0200
+++ globus_gram_job_manager-10.59/globus_gram_job_manager_state_file.c 2010-07-17 11:52:01.374553410 +0200
@@ -50,7 +50,8 @@
{
*state_file = globus_common_create_string(
"%s/tmp/gram_job_state/%s.%s.%s",
- request->config->globus_location,
+ request->config->globus_location ?
+ request->config->globus_location : "",
request->config->logname,
request->config->hostname,
request->uniq_id);
diff -ur globus_gram_job_manager-10.59.orig/globus_gram_job_manager_validate.c globus_gram_job_manager-10.59/globus_gram_job_manager_validate.c
--- globus_gram_job_manager-10.59.orig/globus_gram_job_manager_validate.c 2010-06-03 19:45:57.000000000 +0200
+++ globus_gram_job_manager-10.59/globus_gram_job_manager_validate.c 2010-07-17 11:52:01.375553815 +0200
@@ -134,7 +134,8 @@
validation_filename = globus_common_create_string(
"%s/share/globus_gram_job_manager/%s.rvf",
- manager->config->globus_location,
+ manager->config->globus_location ?
+ manager->config->globus_location : "",
"globus-gram-job-manager");
if(validation_filename == NULL)
@@ -144,7 +145,8 @@
}
scheduler_validation_filename = globus_common_create_string(
"%s/share/globus_gram_job_manager/%s.rvf",
- manager->config->globus_location,
+ manager->config->globus_location ?
+ manager->config->globus_location : "",
manager->config->jobmanager_type);
if(scheduler_validation_filename == NULL)
{
diff -ur globus_gram_job_manager-10.59.orig/globus_gram_streamer.c globus_gram_job_manager-10.59/globus_gram_streamer.c
--- globus_gram_job_manager-10.59.orig/globus_gram_streamer.c 2010-06-10 14:49:15.000000000 +0200
+++ globus_gram_job_manager-10.59/globus_gram_streamer.c 2010-07-17 12:00:25.632553798 +0200
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-/**
+/*
* @file globus_gram_streamer.c GRAM File Streamer Application
*
* @details
diff -ur globus_gram_job_manager-10.59.orig/globus_job_manager_rsl_validation.dox globus_gram_job_manager-10.59/globus_job_manager_rsl_validation.dox
--- globus_gram_job_manager-10.59.orig/globus_job_manager_rsl_validation.dox 2002-08-08 22:57:20.000000000 +0200
+++ globus_gram_job_manager-10.59/globus_job_manager_rsl_validation.dox 2010-07-17 11:52:01.375553815 +0200
@@ -9,9 +9,6 @@
attribute may be used, it's default value, and the format of the attribute's
value.
-The validation file used by the job manager is located in the
-@ref validation_file_example section of the manual.
-
@section validation_file_format File Format
@subsection validation_comments Comments
@@ -51,8 +48,8 @@
@code
Attribute: directory
-Description: "Specifies the path of the directory the jobmanager will use as
- the default directory for the requested job."
+Description: "Specifies the path of the directory the jobmanager will
+ use as the default directory for the requested job."
@endcode
@subsection rsl_validation_record_types Defined PropertyNames
@@ -68,13 +65,11 @@
A textual description of what the RSL parameter means.
@par Default
-
The default value of the RSL parameter if it is not found in the
RSL. The default value is only used if the DefaultWhen value matches
the current validation mode.
@par Values
-
A string containing whitespace-separated list of enumerated values
which are valid for this RSL attribute. For example, for the "dryrun"
parameter, this may be <b>"yes no"</b>.
@@ -89,7 +84,6 @@
attribute is not present in the RSL.
@par ValidWhen
-
Some subset of the "when strings" (@ref when_strings "see below")
indicating when then RSL attribute may be used.
@@ -98,20 +92,11 @@
The set of when strings understood by the RSL validation file parser are
@par GLOBUS_GRAM_JOB_SUBMIT
-
The RSL attribute pertains to job submission.
@par GLOBUS_GRAM_JOB_MANAGER_RESTART
-
The RSL attribute pertains to job manager restart.
@par GLOBUS_GRAM_JOB_MANAGER_STDIO_UPDATE
-
The RSL attribute pertains to the STDIO_UPDATE signal.
*/
-
-/** @page validation_file_example Job Manager RSL Validation File
-
-@verbinclude "globus-gram-job-manager.rvf"
-
-*/
diff -ur globus_gram_job_manager-10.59.orig/globus-personal-gatekeeper globus_gram_job_manager-10.59/globus-personal-gatekeeper
--- globus_gram_job_manager-10.59.orig/globus-personal-gatekeeper 2010-06-10 14:49:14.000000000 +0200
+++ globus_gram_job_manager-10.59/globus-personal-gatekeeper 2010-07-17 11:52:56.486560906 +0200
@@ -16,14 +16,6 @@
# limitations under the License.
#
-if test -z "${GLOBUS_LOCATION}"; then
- echo ""
- echo "ERROR: Please set GLOBUS_LOCATION to the Globus installation directory before"
- echo "running this script"
- echo ""
- exit 1
-fi
-
if [ -x /bin/true ]; then
TRUE=/bin/true
elif [ -x /usr/bin/true ]; then
@@ -32,17 +24,18 @@
TRUE="sh -c \"true\""
fi
-DELIM=
-if [ -n "$LD_LIBRARY_PATH" ]; then
- DELIM=:
+if test -f ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer; then
+ . ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer
+elif test -f ${GLOBUS_LOCATION:-/usr}/libexec/globus-script-initializer; then
+ . ${GLOBUS_LOCATION:-/usr}/libexec/globus-script-initializer
+else
+ echo "ERROR: Please set GLOBUS_LOCATION to the Globus installation directory before" 1>&2
+ echo "running this script" 1>&2
+ exit 1
fi
-
-LD_LIBRARY_PATH="$GLOBUS_LOCATION/lib$DELIM$LD_LIBRARY_PATH"
-
-. ${GLOBUS_LOCATION}/libexec/globus-script-initializer
globus_source ${libexecdir}/globus-sh-tools.sh
-. ${GLOBUS_LOCATION}/libexec/globus-personal-gatekeeper-version.sh
+. ${libexecdir}/globus-personal-gatekeeper-version.sh
short_usage="globus-personal-gatekeeper [-help] [-start] [-list] [-killall] ..."
@@ -107,10 +100,6 @@
hours=""
${debug} "verifying setup..."
- bindir="${GLOBUS_LOCATION}/bin"
- sbindir="${GLOBUS_LOCATION}/sbin"
- libexecdir="${GLOBUS_LOCATION}/libexec"
-
if test "$1" != 'kill'; then
hours="-hours 1"
fi
@@ -448,18 +437,17 @@
exit 1
fi
${GLOBUS_SH_CAT-cat} > ${scratch}/jobmanager <<EOF
-stderr_log,local_cred - $valgrind valgrind --leak-check=full --leak-resolution=high --show-reachable=yes --log-file=${HOME}/valgrind.%p.log ${libexecdir}/globus-job-manager -conf ${scratch}/jobmanager.conf
+stderr_log,local_cred - $valgrind valgrind --leak-check=full --leak-resolution=high --show-reachable=yes --log-file=${HOME}/valgrind.%p.log ${sbindir}/globus-job-manager -conf ${scratch}/jobmanager.conf
EOF
else
${GLOBUS_SH_CAT-cat} > ${scratch}/jobmanager <<EOF
-stderr_log,local_cred - ${libexecdir}/globus-job-manager globus-job-manager -conf ${scratch}/jobmanager.conf
+stderr_log,local_cred - ${sbindir}/globus-job-manager globus-job-manager -conf ${scratch}/jobmanager.conf
EOF
fi
${GLOBUS_SH_CAT-cat} > ${scratch}/gatekeeper.conf <<EOF
-gridmap ${scratch}/gridmap
--home ${GLOBUS_LOCATION}
--e libexec
+-e ${sbindir}
-logfile ${scratch}/gatekeeper.log
-grid_services ${scratch}
-d
@@ -474,7 +462,7 @@
fi
-host_info=`${sbindir}/config.guess`
+host_info=`${libexecdir}/config.guess`
host_cputype=`echo $host_info | ${GLOBUS_SH_AWK-awk} -F'-' '{print $1}'`
host_manufacturer=`echo $host_info | ${GLOBUS_SH_AWK-awk} -F'-' '{print $2}'`
host_osname=`${GLOBUS_SH_UNAME-uname} -s`
@@ -485,7 +473,6 @@
fi
${GLOBUS_SH_CAT-cat} > ${scratch}/jobmanager.conf <<EOF
--home ${GLOBUS_LOCATION}
-type ${jmtype}
-globus-gatekeeper-subject "${subject}"
-globus-host-cputype ${host_cputype}
@@ -503,8 +490,8 @@
if [ ! -z "${auditdir}" ]; then
- if [ -x "${GLOBUS_LOCATION}/bin/globus-version" ]; then
- globus_toolkit_version=`${GLOBUS_LOCATION}/bin/globus-version`
+ if [ -x "${bindir}/globus-version" ]; then
+ globus_toolkit_version=`${bindir}/globus-version`
else
globus_toolkit_version="Unknown"
fi
diff -ur globus_gram_job_manager-10.59.orig/job_execution_environment.dox globus_gram_job_manager-10.59/job_execution_environment.dox
--- globus_gram_job_manager-10.59.orig/job_execution_environment.dox 2009-09-24 21:09:39.000000000 +0200
+++ globus_gram_job_manager-10.59/job_execution_environment.dox 2010-07-17 11:52:01.376552823 +0200
@@ -1,7 +1,7 @@
/**
@page globus_gram_job_manager_job_execution_environment Job Execution Environment
-@subsection globus_gram_job_manager_env_vars Environment Variables
+@section globus_gram_job_manager_env_vars Environment Variables
The GRAM Job Manager provides a minimal environment for user's jobs. The
following environment variables will be set by the job manager. Variables
@@ -44,7 +44,7 @@
Disables GSI in Nexus's TCP protocol, for compatibility with Nexus 4.6 and
earlier.
-@subsection globus_gram_job_manager_rsl_subs RSL Substitions
+@section globus_gram_job_manager_rsl_subs RSL Substitions
In addition to the environment variables described above, a number of RSL
substitutions are made available by the job manager. These substitions
diff -ur globus_gram_job_manager-10.59.orig/main.dox globus_gram_job_manager-10.59/main.dox
--- globus_gram_job_manager-10.59.orig/main.dox 2002-08-08 22:57:21.000000000 +0200
+++ globus_gram_job_manager-10.59/main.dox 2010-07-17 11:52:01.376552823 +0200
@@ -10,6 +10,6 @@
- @ref globus_gram_job_manager_configuration
- @ref globus_gram_job_manager_rsl_validation_file
- @ref globus_gram_job_manager_job_execution_environment
-- @ref globus_job_manager_rsl
+- @ref globus_gram_job_manager_rsl
- @ref globus_gram_job_manager_script_interface
*/
diff -ur globus_gram_job_manager-10.59.orig/Makefile.am globus_gram_job_manager-10.59/Makefile.am
--- globus_gram_job_manager-10.59.orig/Makefile.am 2010-06-10 14:49:14.000000000 +0200
+++ globus_gram_job_manager-10.59/Makefile.am 2010-07-17 17:17:39.650560578 +0200
@@ -8,7 +8,7 @@
# Where targets are installed
noinst_LTLIBRARIES = libglobus_gram_job_manager_$(GLOBUS_FLAVOR_NAME).la
-libexec_PROGRAMS = globus-job-manager globus-gram-streamer globus-job-manager-lock-test
+sbin_PROGRAMS = globus-job-manager globus-gram-streamer globus-job-manager-lock-test
libexec_SCRIPTS = globus-personal-gatekeeper-version.sh
bin_SCRIPTS = globus-personal-gatekeeper
@@ -49,7 +49,7 @@
globus_gram_streamer_LDFLAGS = $(GPT_LDFLAGS)
globus_gram_streamer_LDADD = \
- ./libglobus_gram_job_manager_$(GLOBUS_FLAVOR_NAME).la -lglobus_gass_transfer_$(GLOBUS_FLAVOR_NAME) $(GPT_PGM_LINKS)
+ ./libglobus_gram_job_manager_$(GLOBUS_FLAVOR_NAME).la $(GPT_PGM_LINKS)
man1datadir=$(mandir)/man1
man1data_DATA = globus-personal-gatekeeper.1
diff -ur globus_gram_job_manager-10.59.orig/pkgdata/MyFilelists.pm globus_gram_job_manager-10.59/pkgdata/MyFilelists.pm
--- globus_gram_job_manager-10.59.orig/pkgdata/MyFilelists.pm 2002-08-08 22:57:23.000000000 +0200
+++ globus_gram_job_manager-10.59/pkgdata/MyFilelists.pm 2010-07-17 11:52:01.377553508 +0200
@@ -20,13 +20,19 @@
sub rtl_files {
my $self = shift;
my $result = [];
- $self->{'filelist'}->flavored_files();
+ $self->{'filelist'}->flavored_files() if defined $self->{'mangling'};
$self->{'filelist'}->extract_dynamic_libs();
$self->{'filelist'}->add_package_metadata_files('rtl');
my $list = $self->{'filelist'}->get_list();
push @$result, @$list;
$self->{'filelist'}->reset();
+ $self->{'filelist'}->flavored_files() if defined $self->{'mangling'};
+ $self->{'filelist'}->extract_libtool_libs();
+ $list = $self->{'filelist'}->get_list();
+ push @$result, @$list;
+ $self->{'filelist'}->reset();
+
return $result;
}
@@ -34,14 +40,14 @@
sub data_files {
my $self = shift;
my $result = [];
+
$self->{'filelist'}->extract_perl_modules();
$self->{'filelist'}->add_package_metadata_files('data', 'noflavor');
-
my $list = $self->{'filelist'}->get_list();
push @$result, @$list;
$self->{'filelist'}->reset();
- $self->{filelist}->extract_data();
+ $self->{'filelist'}->extract_data();
$list = $self->{'filelist'}->get_list();
push @$result, @$list;
$self->{'filelist'}->reset();
diff -ur globus_gram_job_manager-10.59.orig/scripts/create_rsl_documentation.pl globus_gram_job_manager-10.59/scripts/create_rsl_documentation.pl
--- globus_gram_job_manager-10.59.orig/scripts/create_rsl_documentation.pl 2009-11-04 20:53:19.000000000 +0100
+++ globus_gram_job_manager-10.59/scripts/create_rsl_documentation.pl 2010-07-17 11:52:01.377553508 +0200
@@ -18,7 +18,7 @@
/* this page was automatically generated by $0 */
/**
-\@page globus_job_manager_rsl RSL Attributes
+\@page globus_gram_job_manager_rsl RSL Attributes
This page contains a list of all RSL attributes which are supported
by the GRAM Job Manager.
@@ -160,6 +160,17 @@
$value =~ s/"$//;
}
$value =~ s/^\s*//;
+ if($in_multiline)
+ {
+ if($value =~ m/[^\\]"/)
+ {
+ $value =~ s/\s+/ /g;
+ $in_multiline = 0;
+ $value =~ s/\\"/"/g;
+ $value =~ s/^"//;
+ $value =~ s/"$//;
+ }
+ }
}
$result{$attribute} = $value;
}
