[Python-checkins] CVS: python/dist/src configure.in,1.285,1.286 configure,1.276,1.277 Makefile.pre.in,1.71,1.72
Jack Jansen
jackjansen@users.sourceforge.net
Thu, 06 Dec 2001 13:47:22 -0800
Update of /cvsroot/python/python/dist/src
In directory usw-pr-cvs1:/tmp/cvs-serv8423
Modified Files:
configure.in configure Makefile.pre.in
Log Message:
Test wether we are building on a case-insensitive filesystem (such
as OSX HFS+) and if so add an extension to the python executable, but
only in the build directory, not on the installed python.
Index: configure.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure.in,v
retrieving revision 1.285
retrieving revision 1.286
diff -C2 -d -r1.285 -r1.286
*** configure.in 2001/12/05 23:27:31 1.285
--- configure.in 2001/12/06 21:47:19 1.286
***************
*** 199,207 ****
esac])
AC_MSG_RESULT($EXEEXT)
# Test whether we're running on a non-case-sensitive system, in which
# case we give a warning if no ext is given
! if test -d "python" -a -z "$EXEEXT"
then
! AC_MSG_WARN(This filesystem is not case-sensitive so you should probably use --with-suffix)
fi
--- 199,214 ----
esac])
AC_MSG_RESULT($EXEEXT)
+
# Test whether we're running on a non-case-sensitive system, in which
# case we give a warning if no ext is given
! AC_SUBST(BUILDEXEEXT)
! AC_MSG_CHECKING(for case-insensitive build directory)
! if test -d "python"
then
! AC_MSG_RESULT(yes)
! BUILDEXEEXT=.exe
! else
! AC_MSG_RESULT(no)
! BUILDEXEEXT='$(EXEEXT)'
fi
Index: configure
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure,v
retrieving revision 1.276
retrieving revision 1.277
diff -C2 -d -r1.276 -r1.277
*** configure 2001/12/05 23:27:32 1.276
--- configure 2001/12/06 21:47:19 1.277
***************
*** 1,5 ****
#! /bin/sh
! # From configure.in Revision: 1.284
# Guess values for system-dependent variables and create Makefiles.
--- 1,5 ----
#! /bin/sh
! # From configure.in Revision: 1.285
[...4554 lines suppressed...]
*** 7530,7534 ****
SRCDIRS="Parser Grammar Objects Python Modules"
echo $ac_n "checking for build directories""... $ac_c" 1>&6
! echo "configure:7533: checking for build directories" >&5
for dir in $SRCDIRS; do
if test ! -d $dir; then
--- 7538,7542 ----
SRCDIRS="Parser Grammar Objects Python Modules"
echo $ac_n "checking for build directories""... $ac_c" 1>&6
! echo "configure:7541: checking for build directories" >&5
for dir in $SRCDIRS; do
if test ! -d $dir; then
***************
*** 7685,7688 ****
--- 7693,7697 ----
s%@CPP@%$CPP%g
s%@EXEEXT@%$EXEEXT%g
+ s%@BUILDEXEEXT@%$BUILDEXEEXT%g
s%@LIBRARY@%$LIBRARY%g
s%@LDLIBRARY@%$LDLIBRARY%g
Index: Makefile.pre.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/Makefile.pre.in,v
retrieving revision 1.71
retrieving revision 1.72
diff -C2 -d -r1.71 -r1.72
*** Makefile.pre.in 2001/12/04 03:54:08 1.71
--- Makefile.pre.in 2001/12/06 21:47:20 1.72
***************
*** 101,104 ****
--- 101,105 ----
# Executable suffix (.exe on Windows and Mac OS X)
EXE= @EXEEXT@
+ BUILDEXE= @BUILDEXEEXT@
# Short name and location for Mac OS X Python framework
***************
*** 151,154 ****
--- 152,156 ----
PYTHON= python$(EXE)
+ BUILDPYTHON= python$(BUILDEXE)
# === Definitions added by makesetup ===
***************
*** 287,307 ****
# Default target
! all: $(PYTHON) oldsharedmods sharedmods
# Build the interpreter
! $(PYTHON): Modules/$(MAINOBJ) $(LDLIBRARY)
$(LINKCC) $(LDFLAGS) $(LINKFORSHARED) -o $@ \
Modules/$(MAINOBJ) \
$(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
! platform: $(PYTHON)
! ./$(PYTHON) -E -c 'import sys ; from distutils.util import get_platform ; print get_platform()+"-"+sys.version[0:3]' >platform
# Build the shared modules
! sharedmods: $(PYTHON)
case $$MAKEFLAGS in \
! *-s*) CC='$(CC)' LDSHARED='$(LDSHARED)' OPT='$(OPT)' ./$(PYTHON) -E $(srcdir)/setup.py -q build;; \
! *) CC='$(CC)' LDSHARED='$(LDSHARED)' OPT='$(OPT)' ./$(PYTHON) -E $(srcdir)/setup.py build;; \
esac
--- 289,309 ----
# Default target
! all: $(BUILDPYTHON) oldsharedmods sharedmods
# Build the interpreter
! $(BUILDPYTHON): Modules/$(MAINOBJ) $(LDLIBRARY)
$(LINKCC) $(LDFLAGS) $(LINKFORSHARED) -o $@ \
Modules/$(MAINOBJ) \
$(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
! platform: $(BUILDPYTHON)
! ./$(BUILDPYTHON) -E -c 'import sys ; from distutils.util import get_platform ; print get_platform()+"-"+sys.version[0:3]' >platform
# Build the shared modules
! sharedmods: $(BUILDPYTHON)
case $$MAKEFLAGS in \
! *-s*) CC='$(CC)' LDSHARED='$(LDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -q build;; \
! *) CC='$(CC)' LDSHARED='$(LDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \
esac
***************
*** 485,489 ****
TESTOPTS= -l
TESTPROG= $(srcdir)/Lib/test/regrtest.py
! TESTPYTHON= ./$(PYTHON) -E -tt
test: all platform
-find $(srcdir)/Lib -name '*.py[co]' -print | xargs rm -f
--- 487,491 ----
TESTOPTS= -l
TESTPROG= $(srcdir)/Lib/test/regrtest.py
! TESTPYTHON= ./$(BUILDPYTHON) -E -tt
test: all platform
-find $(srcdir)/Lib -name '*.py[co]' -print | xargs rm -f
***************
*** 545,549 ****
# Install the interpreter with $(VERSION) affixed
# This goes into $(exec_prefix)
! altbininstall: $(PYTHON)
@for i in $(BINDIR); \
do \
--- 547,551 ----
# Install the interpreter with $(VERSION) affixed
# This goes into $(exec_prefix)
! altbininstall: $(BUILDPYTHON)
@for i in $(BINDIR); \
do \
***************
*** 554,558 ****
fi; \
done
! $(INSTALL_PROGRAM) $(PYTHON) $(BINDIR)/python$(VERSION)$(EXE)
if test -f libpython$(VERSION).so; then \
$(INSTALL_DATA) libpython$(VERSION).so $(LIBDIR); \
--- 556,560 ----
fi; \
done
! $(INSTALL_PROGRAM) $(BUILDPYTHON) $(BINDIR)/python$(VERSION)$(EXE)
if test -f libpython$(VERSION).so; then \
$(INSTALL_DATA) libpython$(VERSION).so $(LIBDIR); \
***************
*** 584,588 ****
encodings email compiler hotshot \
distutils distutils/command $(XMLLIBSUBDIRS) curses $(MACHDEPS)
! libinstall: $(PYTHON) $(srcdir)/Lib/$(PLATDIR)
@for i in $(SCRIPTDIR) $(LIBDEST); \
do \
--- 586,590 ----
encodings email compiler hotshot \
distutils distutils/command $(XMLLIBSUBDIRS) curses $(MACHDEPS)
! libinstall: $(BUILDPYTHON) $(srcdir)/Lib/$(PLATDIR)
@for i in $(SCRIPTDIR) $(LIBDEST); \
do \
***************
*** 640,647 ****
$(INSTALL_DATA) $(srcdir)/LICENSE $(LIBDEST)/LICENSE.txt
PYTHONPATH=$(LIBDEST) \
! ./$(PYTHON) -tt $(LIBDEST)/compileall.py -x badsyntax \
$(LIBDEST)
PYTHONPATH=$(LIBDEST) \
! ./$(PYTHON) -O $(LIBDEST)/compileall.py -x badsyntax $(LIBDEST)
# Create the PLATDIR source directory, if one wasn't distributed..
--- 642,649 ----
$(INSTALL_DATA) $(srcdir)/LICENSE $(LIBDEST)/LICENSE.txt
PYTHONPATH=$(LIBDEST) \
! ./$(BUILDPYTHON) -tt $(LIBDEST)/compileall.py -x badsyntax \
$(LIBDEST)
PYTHONPATH=$(LIBDEST) \
! ./$(BUILDPYTHON) -O $(LIBDEST)/compileall.py -x badsyntax $(LIBDEST)
# Create the PLATDIR source directory, if one wasn't distributed..
***************
*** 732,736 ****
# This goes into $(exec_prefix)
sharedinstall:
! ./$(PYTHON) -E $(srcdir)/setup.py install \
--install-scripts=$(BINDIR) \
--install-platlib=$(DESTSHARED)
--- 734,738 ----
# This goes into $(exec_prefix)
sharedinstall:
! ./$(BUILDPYTHON) -E $(srcdir)/setup.py install \
--install-scripts=$(BINDIR) \
--install-platlib=$(DESTSHARED)
***************
*** 803,807 ****
$(SHELL) $(srcdir)/configure $(CONFIG_ARGS)
! .PRECIOUS: config.status $(PYTHON) Makefile Makefile.pre
# Some make's put the object file in the current directory
--- 805,809 ----
$(SHELL) $(srcdir)/configure $(CONFIG_ARGS)
! .PRECIOUS: config.status $(BUILDPYTHON) Makefile Makefile.pre
# Some make's put the object file in the current directory
***************
*** 843,847 ****
clobber: clean
! -rm -f $(PYTHON) $(PGEN) $(LIBRARY) $(LDLIBRARY) $(DLLLIBRARY) \
tags TAGS \
config.cache config.log pyconfig.h Modules/config.c
--- 845,849 ----
clobber: clean
! -rm -f $(BUILDPYTHON) $(PGEN) $(LIBRARY) $(LDLIBRARY) $(DLLLIBRARY) \
tags TAGS \
config.cache config.log pyconfig.h Modules/config.c