Changeset 95

Timestamp:

11/08/05 11:36:19 (18 years ago)

Author:

bas

Message:

distro:

• Setup.py is generated by configure
• Added --with-pbsdir=PATH option to configure

Location:

trunk/pbs_swig/distro

Files:

• Makefile.in (modified) (1 diff)
• configure (modified) (6 diffs)
• configure.in (modified) (2 diffs)
• setup.py (modified) (1 diff)
• setup.py.in (added)

trunk/pbs_swig/distro/Makefile.in

@@ -5 +5 @@
 exec_prefix=$(PREFIX)
 BINDIR=$(PREFIX)/bin
+PBSLIB=@pbspath@
+
+
 DOCDIR=/usr/share/doc/pbs-python
 EXAMPLES=$(DOCDIR)/examples

trunk/pbs_swig/distro/configure

@@ -272 +272 @@
 PACKAGE_BUGREPORT=
 
-ac_unique_file="Makefile.in"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS pyexecdir PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pkgpyexecdir LIBOBJS LTLIBOBJS'
+ac_unique_file="src/pbs.py"
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS pyexecdir pbspath PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pkgpyexecdir LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
@@ -780 +780 @@
 
   cat <<\_ACEOF
+
+Optional Packages:
+  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+
+  --with-pbsdir=PATH    directory that contains the torque libraries
 
 _ACEOF
@@ -1223 +1229 @@
 
 
+# Check whether --with-pbsdir or --without-pbsdir was given.
+if test "${with_pbsdir+set}" = set; then
+  withval="$with_pbsdir"
+  case "${withval}" in
+        *) pbspath="${withval}" ;;
+  esac
+else
+  pbspath=""
+
+fi;
+
+
+
 
         # Find any Python interpreter.
@@ -1341 +1360 @@
 
 
-          ac_config_files="$ac_config_files Makefile"
+                    ac_config_files="$ac_config_files Makefile setup.py"
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -1893 +1912 @@
   # Handling of arguments.
   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+  "setup.py" ) CONFIG_FILES="$CONFIG_FILES setup.py" ;;
   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
@@ -1977 +1997 @@
 s,@LIBS@,$LIBS,;t t
 s,@pyexecdir@,$pyexecdir,;t t
+s,@pbspath@,$pbspath,;t t
 s,@PYTHON@,$PYTHON,;t t
 s,@PYTHON_VERSION@,$PYTHON_VERSION,;t t

trunk/pbs_swig/distro/configure.in

@@ -1 @@
-AC_INIT(Makefile.in)
+AC_INIT(src/pbs.py)
 AC_SUBST(prefix)
 AC_SUBST(exec_prefix)
 AC_SUBST(pyexecdir)
+AC_SUBST(pbspath)
+
+
+AC_ARG_WITH(pbsdir,
+[  
+  --with-pbsdir=PATH    directory that contains the torque libraries],
+
+  [case "${withval}" in
+        *) pbspath="${withval}" ;;
+  esac], 
+
+  [pbspath=""]
+)dnl
 
 AM_PATH_PYTHON
@@ -8 +21 @@
 AC_OUTPUT(
         Makefile
+        setup.py
         )

trunk/pbs_swig/distro/setup.py

@@ -5 +5 @@
 import sys
 import os
+#from pbslibdir import PBS_LIB_DIR
+PBS_LIB_DIR='bas'
 
 from distutils.core import setup, Extension 
 
-# The location of the pbs libraries. If left blank
-# then we try to find out where the libraries are
+# Libs required by this package
 #
-PBS_LIB_DIR=''
 LIBS = ['log', 'net', 'pbs']