[open-ils-commits] r8386 - in branches/acq-experiment: . Open-ILS/src Open-ILS/src/python

[svn at svn.open-ils.org]

Author: dbs
Date: 2008-01-15 13:34:22 -0500 (Tue, 15 Jan 2008)
New Revision: 8386

Modified:
   branches/acq-experiment/Open-ILS/src/Makefile
   branches/acq-experiment/Open-ILS/src/python/Makefile
   branches/acq-experiment/Open-ILS/src/python/setup.py
   branches/acq-experiment/config.sh
   branches/acq-experiment/install.conf.default
   branches/acq-experiment/install.sh
Log:
Add a build flag for Python modules.
Use setuptools for building and installing Python modules.


Modified: branches/acq-experiment/Open-ILS/src/Makefile
===================================================================
--- branches/acq-experiment/Open-ILS/src/Makefile	2008-01-15 18:07:00 UTC (rev 8385)
+++ branches/acq-experiment/Open-ILS/src/Makefile	2008-01-15 18:34:22 UTC (rev 8386)
@@ -141,14 +141,12 @@
 # ------------------------------------------------------------------------------
 
 python-build:
-	@echo $@
-	make -C python build
+	if [ -n "$(EG_PYTHON_INSTALL)" ]; then echo $@; make -C python build; fi;
 
 # -----------------------------------------------------------------------------------
 
 python-install:
-	@echo $@
-	make -C python install
+	if [ -n "$(EG_PYTHON_INSTALL)" ]; then echo $@; make -C python install; fi;
 
 # -----------------------------------------------------------------------------------
 
@@ -216,5 +214,5 @@
 	make -C extras clean
 	make -C apachemods clean
 	make -C c-apps clean
-	make -C python clean
+	if [ -n "$(EG_PYTHON_INSTALL)" ]; then echo $@; make -C python clean --all; fi;
 

Modified: branches/acq-experiment/Open-ILS/src/python/Makefile
===================================================================
--- branches/acq-experiment/Open-ILS/src/python/Makefile	2008-01-15 18:07:00 UTC (rev 8385)
+++ branches/acq-experiment/Open-ILS/src/python/Makefile	2008-01-15 18:34:22 UTC (rev 8386)
@@ -18,5 +18,5 @@
 # CLEAN	
 # ------------------------------------------------------------------------------
 clean:
-	/bin/rm -rf build 
+	python setup.py clean --all
 

Modified: branches/acq-experiment/Open-ILS/src/python/setup.py
===================================================================
--- branches/acq-experiment/Open-ILS/src/python/setup.py	2008-01-15 18:07:00 UTC (rev 8385)
+++ branches/acq-experiment/Open-ILS/src/python/setup.py	2008-01-15 18:34:22 UTC (rev 8386)
@@ -1,16 +1,13 @@
 #!/usr/bin/env python
-from distutils.core import setup
-import os, os.path
+from setuptools import setup
 
-dir = os.path.dirname(__file__)
-
 setup(name='Evergreen',
-    version='1.2',
-    requires='OpenSRF',
+    version='1.4',
+    install_requires='OpenSRF>=1.0',
     description='Evergreen Python Modules',
     author='Bill Erickson',
-    author_email='open-ils-dev at list.georgialibraries.org',
+    author_email='erickson at esilibrary.com',
+    license='GPL',
     url='http://www.open-ils.org/',
     packages=['oils', 'oils.utils'],
-    package_dir={'': dir}
 )

Modified: branches/acq-experiment/config.sh
===================================================================
--- branches/acq-experiment/config.sh	2008-01-15 18:07:00 UTC (rev 8385)
+++ branches/acq-experiment/config.sh	2008-01-15 18:34:22 UTC (rev 8386)
@@ -92,6 +92,13 @@
 	prompt "Build targets [${TARGETS[@]:0}] "
 	read X; if [ ! -z "$X" ]; then TARGETS=("$X"); fi;
 
+	prompt "Should we build Python modules? (Y/N) [$EG_PYTHON_INSTALL] "
+	read X; 
+    if [ "$X" = "Y" ]; 
+        then EG_PYTHON_INSTALL="Y"; 
+        else EG_PYTHON_INSTALL="";
+    fi;
+
 	prompt "Database Driver [$DBDRVR] "
 	read X; if [ ! -z "$X" ]; then DBDRVR="$X"; fi;
 
@@ -164,6 +171,7 @@
 	STR="$STR)";
 	_write "$STR";
 
+    _write "EG_PYTHON_INSTALL=\"$EG_PYTHON_INSTALL\"";
 	_write "OPENILSDIR=\"Open-ILS/src/\"";
 	_write "EVERGREENDIR=\"Evergreen/\"";
 

Modified: branches/acq-experiment/install.conf.default
===================================================================
--- branches/acq-experiment/install.conf.default	2008-01-15 18:07:00 UTC (rev 8385)
+++ branches/acq-experiment/install.conf.default	2008-01-15 18:34:22 UTC (rev 8386)
@@ -36,6 +36,12 @@
 
 
 # --------------------------------------------------------------------
+# Should we build the Evergreen Python modules?
+# These depend on having the setuptools module installed.
+# --------------------------------------------------------------------
+EG_PYTHON_INSTALL="N"
+
+# --------------------------------------------------------------------
 # Global install prefix.  Binaries will be installed into PREFIX/bin,
 # libraries will be installed into PREFIX/lib, etc.  The user 
 # running 'install.sh install' must have write permissions to PREFIX

Modified: branches/acq-experiment/install.sh
===================================================================
--- branches/acq-experiment/install.sh	2008-01-15 18:07:00 UTC (rev 8385)
+++ branches/acq-experiment/install.sh	2008-01-15 18:34:22 UTC (rev 8386)
@@ -119,7 +119,7 @@
 
 		MAKE="make $verbose APXS2=$APXS2 PREFIX=$PREFIX TMP=$TMP APR_HEADERS=$APR_HEADERS \
 			APACHE2_HEADERS=$APACHE2_HEADERS LIBXML2_HEADERS=$LIBXML2_HEADERS DBPORT=$DBPORT\
-			BINDIR=$BINDIR DBI_LIBS=$DBI_LIBS LIBDIR=$LIBDIR PERLDIR=$PERLDIR INCLUDEDIR=$INCLUDEDIR \
+			BINDIR=$BINDIR DBI_LIBS=$DBI_LIBS LIBDIR=$LIBDIR PERLDIR=$PERLDIR EG_PYTHON_INSTALL=$EG_PYTHON_INSTALL INCLUDEDIR=$INCLUDEDIR \
 			WEBDIR=$WEBDIR TEMPLATEDIR=$TEMPLATEDIR ETCDIR=$ETCDIR REPORTERDIR=$REPORTERDIR\
 			OPENSRF_HEADERS=$OPENSRF_HEADERS OPENSRF_LIBS=$OPENSRF_LIBS OPENILSDIR=$OPENILSDIR EVERGREENDIR=$EVERGREENDIR \
 			CIRCRULESDIR=$CIRCRULESDIR CATALOGSCRIPTDIR=$CATALOGSCRIPTDIR CGIDIR=$CGIDIR \