[open-ils-commits] r8341 - in trunk: . Open-ILS/src Open-ILS/src/python

[svn at svn.open-ils.org]

Author: dbs
Date: 2008-01-06 20:05:01 -0500 (Sun, 06 Jan 2008)
New Revision: 8341

Modified:
   trunk/Open-ILS/src/Makefile
   trunk/Open-ILS/src/python/Makefile
   trunk/install.sh
Log:
Enable Python build with regular user to avoid perm problems at clean time.


Modified: trunk/Open-ILS/src/Makefile
===================================================================
--- trunk/Open-ILS/src/Makefile	2008-01-07 01:01:19 UTC (rev 8340)
+++ trunk/Open-ILS/src/Makefile	2008-01-07 01:05:01 UTC (rev 8341)
@@ -8,7 +8,7 @@
 
 export STAFF_CLIENT_BUILD_ID = `/bin/cat ../xul/staff_client/build/BUILD_ID`
 
-all:  c_apps client-xul mod_xmlent
+all:  c_apps client-xul mod_xmlent python-build
 
 install:	perl-install python-install web-install server-xul string-templates-install xsl-install c_apps-install circ_rules-install offline-install storage-bootstrap cgi-bootstrap
 
@@ -138,6 +138,12 @@
 	mkdir -p $(TEMPLATEDIR)
 	cp -r templates/marc $(TEMPLATEDIR)
 
+# ------------------------------------------------------------------------------
+
+python-build:
+	@echo $@
+	make -C python build
+
 # -----------------------------------------------------------------------------------
 
 python-install:

Modified: trunk/Open-ILS/src/python/Makefile
===================================================================
--- trunk/Open-ILS/src/python/Makefile	2008-01-07 01:01:19 UTC (rev 8340)
+++ trunk/Open-ILS/src/python/Makefile	2008-01-07 01:05:01 UTC (rev 8341)
@@ -1,16 +1,22 @@
-# vim:noet:ts=4
+# makefile for OpenSRF Python modules and scripts
 
-install: python-install
-
-python-build:
+# ------------------------------------------------------------------------------
+# BUILD
+# ------------------------------------------------------------------------------
+build:
 	@echo $@
 	python setup.py build
 
-python-install:
+# ------------------------------------------------------------------------------
+# INSTALL
+# ------------------------------------------------------------------------------
+install:	build
 	@echo $@
 	python setup.py install
 
+# ------------------------------------------------------------------------------
+# CLEAN	
+# ------------------------------------------------------------------------------
 clean:
-	@echo $@
-	rm -fr build
-	find . -name "*.pyc" -exec rm -f {} \;
+	/bin/rm -rf build 
+

Modified: trunk/install.sh
===================================================================
--- trunk/install.sh	2008-01-07 01:01:19 UTC (rev 8340)
+++ trunk/install.sh	2008-01-07 01:05:01 UTC (rev 8341)
@@ -139,9 +139,13 @@
 				;;
 
 			"openils_core" )
-				if building; then $MAKE -C "$OPENILSDIR" "c_apps"; fi;
+				if building; then 
+					$MAKE -C "$OPENILSDIR" "c_apps";
+					$MAKE -C "$OPENILSDIR" "python-build";
+				fi;
 				if installing; then 
 					$MAKE -C "$OPENILSDIR" "perl-install"; 
+					$MAKE -C "$OPENILSDIR" "python-install"; 
 					$MAKE -C "$OPENILSDIR" "string-templates-install"; 
 					$MAKE -C "$OPENILSDIR" "xsl-install"; 
 					$MAKE -C "$OPENILSDIR" "c_apps-install";