Changeset 103 for trunk/pbs_drmaa

Timestamp:

09/11/15 12:46:51 (10 years ago)

Author:

pkopta

Message:

 

Location:

trunk/pbs_drmaa

Files:

• Makefile.am (modified) (3 diffs)
• job.c (modified) (1 diff)

trunk/pbs_drmaa/Makefile.am

@@ -27 +27 @@
  drmaa.c \
  job.c job.h \
- pbs_attrib.gperf pbs_attrib.h \
+ pbs_attrib.h \
  session.c session.h \
  submit.c submit.h \
@@ -33 +33 @@
  log_reader.c log_reader.h \
  pbs_conn.c pbs_conn.h 
+
+
+if PBS_PROFESSIONAL
+GPERF_INPUT= pbs_attrib_pro.gperf
+else
+GPERF_INPUT= pbs_attrib.gperf
+endif
+
+libdrmaa_la_SOURCES += $(GPERF_INPUT)
+
+BUILT_SOURCES       = $(GPERF_INPUT:.gperf=.c)
+EXTRA_DIST          = $(GPERF_INPUT:.gperf=.c)
+
 if TORQUE4
 libdrmaa_la_SOURCES += torque4.cpp torque4.h
 endif
-BUILT_SOURCES       = pbs_attrib.c
-EXTRA_DIST          = pbs_attrib.c
 dist_sysconf_DATA   = pbs_drmaa.conf.example
 libdrmaa_la_LIBADD  = ../drmaa_utils/drmaa_utils/libdrmaa_utils.la @PBS_LIBS@
@@ -47 +58 @@
 
 if GCC
-pbs_attrib.lo: CFLAGS += @GCC_W_NO_MISSING_FIELD_INITIALIZERS@
+$(GPERF_INPUT:.gperf=.lo): CFLAGS += @GCC_W_NO_MISSING_FIELD_INITIALIZERS@
 endif

trunk/pbs_drmaa/job.c

@@ -252 +252 @@
                  {
                         case 'C': /* Job is completed after having run. */
+#ifdef PBS_PROFESSIONAL
+                        case 'F': /* Job is completed after having run. */
+#endif
                                 self->flags &= FSD_JOB_TERMINATED_MASK;
                                 self->flags |= FSD_JOB_TERMINATED;