You are viewing a plain text version of this content. The canonical link for it is here.
Posted to mod_python-commits@quetz.apache.org by gr...@apache.org on 2002/12/30 19:59:35 UTC
cvs commit: httpd-python/dist Makefile.in setup.py.in
grisha 2002/12/30 10:59:35
Modified: . Makefile.in configure configure.in
dist Makefile.in setup.py.in
Log:
Make install now uses distutils to install the mod_python package.
Revision Changes Path
1.16 +9 -7 httpd-python/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/httpd-python/Makefile.in,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Makefile.in 28 Dec 2002 03:47:04 -0000 1.15
+++ Makefile.in 30 Dec 2002 18:59:34 -0000 1.16
@@ -70,6 +70,7 @@
do_dso:
@cd src && $(MAKE)
+ @cd dist && $(MAKE) dist
no_dso:
@echo
@@ -102,13 +103,14 @@
@echo
install_py_lib:
- $(INSTALL) -d $(PY_STD_LIB)/site-packages/mod_python
- @for f in `ls lib/python/mod_python/*.py`; \
- do \
- $(INSTALL) $$f $(PY_STD_LIB)/site-packages/mod_python; \
- done
- ${PYTHON_BIN} $(PY_STD_LIB)/compileall.py $(PY_STD_LIB)/site-packages/mod_python
- ${PYTHON_BIN} -O $(PY_STD_LIB)/compileall.py $(PY_STD_LIB)/site-packages/mod_python
+ cd dist && $(MAKE) install_py_lib
+# $(INSTALL) -d $(PY_STD_LIB)/site-packages/mod_python
+# @for f in `ls lib/python/mod_python/*.py`; \
+# do \
+# $(INSTALL) $$f $(PY_STD_LIB)/site-packages/mod_python; \
+# done
+# ${PYTHON_BIN} $(PY_STD_LIB)/compileall.py $(PY_STD_LIB)/site-packages/mod_python
+# ${PYTHON_BIN} -O $(PY_STD_LIB)/compileall.py $(PY_STD_LIB)/site-packages/mod_python
clean:
cd src && $(MAKE) clean
1.27 +4 -4 httpd-python/configure
Index: configure
===================================================================
RCS file: /home/cvs/httpd-python/configure,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- configure 28 Dec 2002 05:32:04 -0000 1.26
+++ configure 30 Dec 2002 18:59:34 -0000 1.27
@@ -1204,13 +1204,13 @@
{ echo "configure: error: Neither static nor DSO option available, there is no point in continuing." 1>&2; exit 1; }
fi
+
echo $ac_n "checking for --with-python""... $ac_c" 1>&6
-echo "configure:1209: checking for --with-python" >&5
+echo "configure:1210: checking for --with-python" >&5
# Check whether --with-python or --without-python was given.
if test "${with_python+set}" = set; then
withval="$with_python"
-
PYTHON_BIN="$withval"
echo "$ac_t""$PYTHON_BIN" 1>&6
@@ -1506,7 +1506,7 @@
ac_given_srcdir=$srcdir
ac_given_INSTALL="$INSTALL"
-trap 'rm -fr `echo "Makefile src/Makefile Doc/Makefile test/testconf.py dist/setup.py" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+trap 'rm -fr `echo "Makefile src/Makefile Doc/Makefile test/testconf.py dist/setup.py dist/Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
EOF
cat >> $CONFIG_STATUS <<EOF
@@ -1601,7 +1601,7 @@
cat >> $CONFIG_STATUS <<EOF
-CONFIG_FILES=\${CONFIG_FILES-"Makefile src/Makefile Doc/Makefile test/testconf.py dist/setup.py"}
+CONFIG_FILES=\${CONFIG_FILES-"Makefile src/Makefile Doc/Makefile test/testconf.py dist/setup.py dist/Makefile"}
EOF
cat >> $CONFIG_STATUS <<\EOF
for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
1.31 +2 -2 httpd-python/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/httpd-python/configure.in,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- configure.in 28 Dec 2002 05:32:04 -0000 1.30
+++ configure.in 30 Dec 2002 18:59:34 -0000 1.31
@@ -209,10 +209,10 @@
AC_MSG_ERROR([Neither static nor DSO option available, there is no point in continuing.])
fi
+AC_SUBST(PYTHON_BIN)
AC_MSG_CHECKING(for --with-python)
AC_ARG_WITH(python, [--with-python=DIR Path to specific Python binary],
[
- AC_SUBST(PYTHON_BIN)
PYTHON_BIN="$withval"
AC_MSG_RESULT($PYTHON_BIN)
],
@@ -316,7 +316,7 @@
MP_VERSION=`awk '/MPV_STRING/ {print $3}' src/include/mpversion.h`
MP_VERSION=`echo $MP_VERSION | sed s/\\"//g`
-AC_OUTPUT(Makefile src/Makefile Doc/Makefile test/testconf.py dist/setup.py)
+AC_OUTPUT(Makefile src/Makefile Doc/Makefile test/testconf.py dist/setup.py dist/Makefile)
1.2 +3 -3 httpd-python/dist/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/httpd-python/dist/Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.in 30 Dec 2002 18:44:27 -0000 1.1
+++ Makefile.in 30 Dec 2002 18:59:35 -0000 1.2
@@ -77,11 +77,11 @@
# this may require root privilidges
install_py_lib: unixdist
- @cd dist; \
+ cd dist; \
gunzip -c mod_python-$(MP_VERSION).tar.gz | tar xf -; \
cd mod_python-$(MP_VERSION); \
$(PYTHON_BIN) setup.py install --optimize 2 --force; \
- rm -rf mod_python-$(MP_VERSION)
+ cd ..; rm -rf mod_python-$(MP_VERSION)
mod_python.so:
@echo "Please place a WIN32 compiled mod_python.so in this directory"
1.3 +23 -12 httpd-python/dist/setup.py.in
Index: setup.py.in
===================================================================
RCS file: /home/cvs/httpd-python/dist/setup.py.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- setup.py.in 28 Dec 2002 05:32:04 -0000 1.2
+++ setup.py.in 30 Dec 2002 18:59:35 -0000 1.3
@@ -2,29 +2,40 @@
# $Id$
APXS = r"@APXS@"
+VER = "@MP_VERSION@"
from distutils.core import setup
import sys
-if len(sys.argv) > 0 and sys.argv[0] == "bdist_wininst":
+if len(sys.argv) > 1 and sys.argv[1] == "bdist_wininst":
moddir = ""
mpso = "mod_python.so"
+
+ setup(name="mod_python",
+ version=VER,
+ description="Apache/Python Integration",
+ author="Gregory Trubetskoy et al",
+ author_email="mod_python@modpython.org",
+ url="http://www.modpython.org/",
+ packages=["mod_python"],
+ package_dir = {"mod_python":"../lib/python/mod_python"},
+ scripts=["win32_postinstall.py"],
+ data_files=[(moddir, ["mod_python.so"])])
+
else:
import commands
moddir = commands.getoutput("%s -q LIBEXECDIR" % APXS)
mpso = "../src/mod_python.so"
-setup(name="Mod_python",
- version="@MP_VERSION@",
- description="Apache/Python Integration",
- author="Gregory Trubetskoy et al",
- author_email="mod_python@modpython.org",
- url="http://www.modpython.org/",
- packages=["mod_python"],
- package_dir = {"mod_python":"../lib/python/mod_python"},
- scripts=["win32_postinstall.py"],
- data_files=[(moddir, ["mod_python.so"])])
+ setup(name="mod_python",
+ version=VER,
+ description="Apache/Python Integration",
+ author="Gregory Trubetskoy et al",
+ author_email="mod_python@modpython.org",
+ url="http://www.modpython.org/",
+ packages=["mod_python"])
+
# makes emacs go into python mode
### Local Variables: