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 2003/10/15 03:32:21 UTC
cvs commit: httpd-python/src Makefile.in psp_parser.c
grisha 2003/10/14 18:32:21
Modified: . Makefile.in
dist Makefile.in
src Makefile.in psp_parser.c
Log:
Removed -ll, remove tabs from psp_parser.l, also remove some old stuff
from root Makefile.in
Revision Changes Path
1.19 +0 -7 httpd-python/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/httpd-python/Makefile.in,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- Makefile.in 14 Aug 2003 15:24:41 -0000 1.18
+++ Makefile.in 15 Oct 2003 01:32:20 -0000 1.19
@@ -109,13 +109,6 @@
install_py_lib:
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.8 +2 -2 httpd-python/dist/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/httpd-python/dist/Makefile.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Makefile.in 13 Jun 2003 02:52:03 -0000 1.7
+++ Makefile.in 15 Oct 2003 01:32:20 -0000 1.8
@@ -73,7 +73,7 @@
# this may require root privilidges
install_py_lib: mod_python src
@cd src; $(MAKE) psp_parser.c
- $(PYTHON_BIN) setup.py install --optimize 2 --force; \
+ $(PYTHON_BIN) setup.py install --optimize 2 --force
mod_python.so:
@echo "Please place a WIN32 compiled mod_python.so in this directory"
1.36 +1 -1 httpd-python/src/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/httpd-python/src/Makefile.in,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- Makefile.in 14 Aug 2003 15:24:42 -0000 1.35
+++ Makefile.in 15 Oct 2003 01:32:20 -0000 1.36
@@ -63,7 +63,7 @@
# requires flex 2.5.31 for reentrant support
LEX=/usr/local/bin/flex
INCLUDES=@INCLUDES@
-LIBS=@LIBS@ -ll
+LIBS=@LIBS@
LDFLAGS=@LDFLAGS@
OPT=
CFLAGS=$(OPT) $(INCLUDES)
1.16 +19 -19 httpd-python/src/psp_parser.c
Index: psp_parser.c
===================================================================
RCS file: /home/cvs/httpd-python/src/psp_parser.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- psp_parser.c 11 Aug 2003 20:13:03 -0000 1.15
+++ psp_parser.c 15 Oct 2003 01:32:20 -0000 1.16
@@ -536,8 +536,8 @@
#include "psp_parser.h"
#define OUTPUT_WHITESPACE(__wsstring) \
- psp_string_0((__wsstring)); \
- psp_string_append(&PSP_PG(pycode), (__wsstring)->blob)
+ psp_string_0((__wsstring)); \
+ psp_string_append(&PSP_PG(pycode), (__wsstring)->blob)
#define CLEAR_WHITESPACE(__wsstring) psp_string_clear((__wsstring));
@@ -934,13 +934,13 @@
{
yypop_buffer_state(yyscanner);
if (!YY_CURRENT_BUFFER) {
- /* this is really the end */
- psp_string_appendl(&PSP_PG(pycode), STATIC_STR("\"\"\")\n"));
- yyterminate();
+ /* this is really the end */
+ psp_string_appendl(&PSP_PG(pycode), STATIC_STR("\"\"\")\n"));
+ yyterminate();
}
else {
- /* we are inside include, continue scanning */
- BEGIN DIR;
+ /* we are inside include, continue scanning */
+ BEGIN DIR;
}
}
YY_BREAK
@@ -1053,27 +1053,27 @@
filename[strchr(filename, '"')-filename] = '\0';
if (PSP_PG(dir)) {
- path = malloc(strlen(filename)+strlen(PSP_PG(dir))+1);
- if (path == NULL) {
- PyErr_NoMemory();
- yyterminate();
- }
- strcpy(path, PSP_PG(dir));
- strcat(path, filename);
+ path = malloc(strlen(filename)+strlen(PSP_PG(dir))+1);
+ if (path == NULL) {
+ PyErr_NoMemory();
+ yyterminate();
+ }
+ strcpy(path, PSP_PG(dir));
+ strcat(path, filename);
}
else {
- path = filename;
+ path = filename;
}
Py_BEGIN_ALLOW_THREADS
f = fopen(path, "rb");
Py_END_ALLOW_THREADS
if (f == NULL) {
- PyErr_SetFromErrnoWithFilename(PyExc_IOError, path);
+ PyErr_SetFromErrnoWithFilename(PyExc_IOError, path);
}
else {
- yypush_buffer_state(yy_create_buffer(f,YY_BUF_SIZE,yyscanner),yyscanner);
- BEGIN(TEXT);
+ yypush_buffer_state(yy_create_buffer(f,YY_BUF_SIZE,yyscanner),yyscanner);
+ BEGIN(TEXT);
}
if (PSP_PG(dir)) free(path);