From f2b763c2e12e0716f3e24e54801abf1336b382ce Mon Sep 17 00:00:00 2001 From: "Ralf W. Grosse-Kunstleve" Date: Tue, 20 Mar 2001 02:16:08 +0000 Subject: [PATCH] VC++ 6.0 makefile; filemgr.py used by all ralf_grosse_kunstleve makefiles. [SVN r9602] --- build/linux_gcc.mak | 99 +++++---------------------- build/mingw32.mak | 160 ++++++++------------------------------------ build/tru64_cxx.mak | 88 +++++------------------- 3 files changed, 60 insertions(+), 287 deletions(-) diff --git a/build/linux_gcc.mak b/build/linux_gcc.mak index fd5aade8..453b077b 100644 --- a/build/linux_gcc.mak +++ b/build/linux_gcc.mak @@ -12,24 +12,15 @@ BOOST= /net/cci/rwgk/boost +#PYEXE= /usr/bin/python +#PYINC= -I/usr/include/python1.5 PYEXE= /usr/local/Python-1.5.2/bin/python PYINC= -I/usr/local/Python-1.5.2/include/python1.5 #PYEXE= /usr/local/Python-2.0/bin/python #PYINC= -I/usr/local/Python-2.0/include/python2.0 -#STLPORTINC= -I/usr/local/STLport-4.1b3/stlport -#STLPORTOPTS= \ -# -D__USE_STD_IOSTREAM \ -# -D__STL_NO_SGI_IOSTREAMS \ -# -D__STL_USE_NATIVE_STRING \ -# -D__STL_NO_NEW_C_HEADERS \ -# -D_RWSTD_COMPILE_INSTANTIATE=1 -#STLPORTINC= -I/usr/local/STLport-4.1b4/stlport -#STLPORTOPTS= -D__NO_USE_STD_IOSTREAM -D__STL_NO_SGI_IOSTREAMS -#STLPORTINC= -I/net/cci/xp/C++_C_headers STDOPTS= -ftemplate-depth-21 WARNOPTS= -# use -msg_display_number to obtain integer tags for -msg_disable CPP= g++ CPPOPTS= $(STLPORTINC) $(STLPORTOPTS) -I$(BOOST) $(PYINC) \ @@ -39,57 +30,9 @@ MAKEDEP= -M LD= g++ LDOPTS= -shared -#HIDDEN= -hidden - -BPL_SRC = $(BOOST)/libs/python/src -BPL_TST = $(BOOST)/libs/python/test -BPL_EXA = $(BOOST)/libs/python/example -SOFTLINKS = \ -$(BPL_SRC)/classes.cpp \ -$(BPL_SRC)/conversions.cpp \ -$(BPL_SRC)/extension_class.cpp \ -$(BPL_SRC)/functions.cpp \ -$(BPL_SRC)/init_function.cpp \ -$(BPL_SRC)/module_builder.cpp \ -$(BPL_SRC)/objects.cpp \ -$(BPL_SRC)/types.cpp \ -$(BPL_SRC)/x_class_builder.cpp \ -$(BPL_TST)/comprehensive.cpp \ -$(BPL_TST)/comprehensive.hpp \ -$(BPL_TST)/comprehensive.py \ -$(BPL_TST)/doctest.py \ -$(BPL_EXA)/abstract.cpp \ -$(BPL_EXA)/getting_started1.cpp \ -$(BPL_EXA)/getting_started2.cpp \ -$(BPL_EXA)/getting_started3.cpp \ -$(BPL_EXA)/getting_started4.cpp \ -$(BPL_EXA)/getting_started5.cpp \ -$(BPL_EXA)/pickle1.cpp \ -$(BPL_EXA)/pickle2.cpp \ -$(BPL_EXA)/pickle3.cpp \ -$(BPL_EXA)/test_abstract.py \ -$(BPL_EXA)/test_getting_started1.py \ -$(BPL_EXA)/test_getting_started2.py \ -$(BPL_EXA)/test_getting_started3.py \ -$(BPL_EXA)/test_getting_started4.py \ -$(BPL_EXA)/test_getting_started5.py \ -$(BPL_EXA)/test_pickle1.py \ -$(BPL_EXA)/test_pickle2.py \ -$(BPL_EXA)/test_pickle3.py \ -$(BPL_EXA)/noncopyable.h \ -$(BPL_EXA)/noncopyable_export.cpp \ -$(BPL_EXA)/noncopyable_import.cpp \ -$(BPL_EXA)/tst_noncopyable.py \ -$(BPL_EXA)/ivect.h \ -$(BPL_EXA)/ivect.cpp \ -$(BPL_EXA)/dvect.h \ -$(BPL_EXA)/dvect.cpp \ -$(BPL_EXA)/tst_ivect.py \ -$(BPL_EXA)/tst_dvect.py - OBJ = classes.o conversions.o extension_class.o functions.o \ init_function.o module_builder.o \ - objects.o types.o x_class_builder.o + objects.o types.o cross_module.o DEPOBJ= $(OBJ) \ comprehensive.o \ abstract.o \ @@ -110,30 +53,6 @@ all: libboost_python.a \ noncopyable_export.so noncopyable_import.so \ ivect.so dvect.so -softlinks: - @ for pn in $(SOFTLINKS); \ - do \ - bn=`basename "$$pn"`; \ - if [ ! -e "$$bn" ]; then \ - echo "ln -s $$pn ."; \ - ln -s "$$pn" .; \ - else \ - echo "info: no softlink created (file exists): $$bn"; \ - fi; \ - done - -unlink: - @ for pn in $(SOFTLINKS); \ - do \ - bn=`basename "$$pn"`; \ - if [ -L "$$bn" ]; then \ - echo "rm $$bn"; \ - rm "$$bn"; \ - elif [ -e "$$bn" ]; then \ - echo "info: not a softlink: $$bn"; \ - fi; \ - done - libboost_python.a: $(OBJ) rm -f libboost_python.a ar r libboost_python.a $(OBJ) @@ -221,6 +140,18 @@ clean: rm -f so_locations *.pyc rm -rf cxx_repository +softlinks: + python $(BOOST)/libs/python/build/filemgr.py $(BOOST) softlinks + +unlink: + python $(BOOST)/libs/python/build/filemgr.py $(BOOST) unlink + +cp: + python $(BOOST)/libs/python/build/filemgr.py $(BOOST) cp + +rm: + python $(BOOST)/libs/python/build/filemgr.py $(BOOST) rm + depend: @ cat Makefile.nodepend; \ for obj in $(DEPOBJ); \ diff --git a/build/mingw32.mak b/build/mingw32.mak index c361ed08..77b6523b 100644 --- a/build/mingw32.mak +++ b/build/mingw32.mak @@ -1,18 +1,10 @@ # Usage: # -# Create a new empty directory anywhere (preferably not in the boost tree). -# Copy this Makefile to that new directory and rename it to "Makefile" -# Set the BOOST_* pathnames below. -# -# The idea is that the build directory is on a Unix filesystem that -# is mounted on a PC using SAMBA. Use this makefile under both Unix -# and Windows: -# -# Unix: make softlinks Create softlinks to source code and tests -# Win: make Compile all sources -# Win: make test Run doctest tests -# Unix: make clean Remove all object files -# Unix: make unlink Remove softlinks +# make copy Copy the sources and tests +# make Compile all sources +# make test Run doctest tests +# make clean Remove all object files +# make del Remove the sources and tests # To install mingw32, follow instructions at: # http://starship.python.net/crew/kernr/mingw32/Notes.html @@ -34,8 +26,8 @@ # -fvtable-thunks eliminates the compiler warning, but # "import boost_python_test" still causes a crash. -BOOST_UNIX= /net/cci/rwgk/boost BOOST_WIN= "L:\boost" +BOOST_UNIX= /net/cci/rwgk/boost PYEXE= "C:\Program files\Python\python.exe" PYINC= -I"C:\usr\include\python1.5" @@ -51,76 +43,13 @@ CPPOPTS= $(STLPORTINC) $(STLPORTOPTS) -I$(BOOST_WIN) $(PYINC) \ LD= g++ LDOPTS= -shared -BPL_SRC = $(BOOST_UNIX)/libs/python/src -BPL_TST = $(BOOST_UNIX)/libs/python/test -BPL_EXA = $(BOOST_UNIX)/libs/python/example -SOFTLINKS = \ -$(BPL_SRC)/classes.cpp \ -$(BPL_SRC)/conversions.cpp \ -$(BPL_SRC)/extension_class.cpp \ -$(BPL_SRC)/functions.cpp \ -$(BPL_SRC)/init_function.cpp \ -$(BPL_SRC)/module_builder.cpp \ -$(BPL_SRC)/objects.cpp \ -$(BPL_SRC)/types.cpp \ -$(BPL_SRC)/x_class_builder.cpp \ -$(BPL_TST)/comprehensive.cpp \ -$(BPL_TST)/comprehensive.hpp \ -$(BPL_TST)/comprehensive.py \ -$(BPL_TST)/doctest.py \ -$(BPL_EXA)/abstract.cpp \ -$(BPL_EXA)/getting_started1.cpp \ -$(BPL_EXA)/getting_started2.cpp \ -$(BPL_EXA)/getting_started3.cpp \ -$(BPL_EXA)/getting_started4.cpp \ -$(BPL_EXA)/getting_started5.cpp \ -$(BPL_EXA)/pickle1.cpp \ -$(BPL_EXA)/pickle2.cpp \ -$(BPL_EXA)/pickle3.cpp \ -$(BPL_EXA)/test_abstract.py \ -$(BPL_EXA)/test_getting_started1.py \ -$(BPL_EXA)/test_getting_started2.py \ -$(BPL_EXA)/test_getting_started3.py \ -$(BPL_EXA)/test_getting_started4.py \ -$(BPL_EXA)/test_getting_started5.py \ -$(BPL_EXA)/test_pickle1.py \ -$(BPL_EXA)/test_pickle2.py \ -$(BPL_EXA)/test_pickle3.py \ -$(BPL_EXA)/noncopyable.h \ -$(BPL_EXA)/noncopyable_export.cpp \ -$(BPL_EXA)/noncopyable_import.cpp \ -$(BPL_EXA)/tst_noncopyable.py \ -$(BPL_EXA)/ivect.h \ -$(BPL_EXA)/ivect.cpp \ -$(BPL_EXA)/dvect.h \ -$(BPL_EXA)/dvect.cpp \ -$(BPL_EXA)/tst_ivect.py \ -$(BPL_EXA)/tst_dvect.py - -DEFS= \ -boost_python_test \ -abstract \ -getting_started1 \ -getting_started2 \ -getting_started3 \ -getting_started4 \ -getting_started5 \ -pickle1 \ -pickle2 \ -pickle3 \ -noncopyable_export \ -noncopyable_import \ -ivect \ -dvect - OBJ = classes.o conversions.o extension_class.o functions.o \ init_function.o module_builder.o \ - objects.o types.o x_class_builder.o + objects.o types.o cross_module.o .SUFFIXES: .o .cpp all: libboost_python.a \ - boost_python_test.pyd \ abstract.pyd \ getting_started1.pyd getting_started2.pyd getting_started3.pyd \ getting_started4.pyd getting_started5.pyd \ @@ -128,42 +57,6 @@ all: libboost_python.a \ noncopyable_export.pyd noncopyable_import.pyd \ ivect.pyd dvect.pyd -softlinks: defs - @ for pn in $(SOFTLINKS); \ - do \ - bn=`basename "$$pn"`; \ - if [ ! -e "$$bn" ]; then \ - echo "ln -s $$pn ."; \ - ln -s "$$pn" .; \ - else \ - echo "info: no softlink created (file exists): $$bn"; \ - fi; \ - done - -unlink: rmdefs - @ for pn in $(SOFTLINKS); \ - do \ - bn=`basename "$$pn"`; \ - if [ -L "$$bn" ]; then \ - echo "rm $$bn"; \ - rm -f "$$bn"; \ - elif [ -e "$$bn" ]; then \ - echo "info: not a softlink: $$bn"; \ - fi; \ - done - -defs: - @ for def in $(DEFS); \ - do \ - echo "EXPORTS\n\tinit$$def" > $$def.def; \ - done - -rmdefs: - @ for def in $(DEFS); \ - do \ - rm -f $$def.def; \ - done - libboost_python.a: $(OBJ) del libboost_python.a ar r libboost_python.a $(OBJ) @@ -276,20 +169,25 @@ tst: $(PYEXE) tst_dvect.py clean: - rm -f $(OBJ) libboost_python.a libboost_python.a.input - rm -f comprehensive.o boost_python_test.pyd - rm -f abstract.o abstract.pyd - rm -f getting_started1.o getting_started1.pyd - rm -f getting_started2.o getting_started2.pyd - rm -f getting_started3.o getting_started3.pyd - rm -f getting_started4.o getting_started4.pyd - rm -f getting_started5.o getting_started5.pyd - rm -f pickle1.o pickle1.pyd - rm -f pickle2.o pickle2.pyd - rm -f pickle3.o pickle3.pyd - rm -f noncopyable_export.o noncopyable_export.pyd - rm -f noncopyable_import.o noncopyable_import.pyd - rm -f ivect.o ivect.pyd - rm -f dvect.o dvect.pyd - rm -f so_locations *.pyc - rm -rf cxx_repository + del *.o + del *.a + del *.pyd + del *.pyc + +softlinks: + python $(BOOST_UNIX)/libs/python/build/filemgr.py $(BOOST_UNIX) softlinks + +unlink: + python $(BOOST_UNIX)/libs/python/build/filemgr.py $(BOOST_UNIX) unlink + +cp: + python $(BOOST_UNIX)/libs/python/build/filemgr.py $(BOOST_UNIX) cp + +rm: + python $(BOOST_UNIX)/libs/python/build/filemgr.py $(BOOST_UNIX) rm + +copy: + python $(BOOST_WIN)\libs\python\build\filemgr.py $(BOOST_WIN) copy + +del: + python $(BOOST_WIN)\libs\python\build\filemgr.py $(BOOST_WIN) del diff --git a/build/tru64_cxx.mak b/build/tru64_cxx.mak index b711941e..6f4baea6 100644 --- a/build/tru64_cxx.mak +++ b/build/tru64_cxx.mak @@ -41,55 +41,9 @@ LDOPTS= -shared -expect_unresolved 'Py*' -expect_unresolved '_Py*' #HIDDEN= -hidden -BPL_SRC = $(BOOST)/libs/python/src -BPL_TST = $(BOOST)/libs/python/test -BPL_EXA = $(BOOST)/libs/python/example -SOFTLINKS = \ -$(BPL_SRC)/classes.cpp \ -$(BPL_SRC)/conversions.cpp \ -$(BPL_SRC)/extension_class.cpp \ -$(BPL_SRC)/functions.cpp \ -$(BPL_SRC)/init_function.cpp \ -$(BPL_SRC)/module_builder.cpp \ -$(BPL_SRC)/objects.cpp \ -$(BPL_SRC)/types.cpp \ -$(BPL_SRC)/x_class_builder.cpp \ -$(BPL_TST)/comprehensive.cpp \ -$(BPL_TST)/comprehensive.hpp \ -$(BPL_TST)/comprehensive.py \ -$(BPL_TST)/doctest.py \ -$(BPL_EXA)/abstract.cpp \ -$(BPL_EXA)/getting_started1.cpp \ -$(BPL_EXA)/getting_started2.cpp \ -$(BPL_EXA)/getting_started3.cpp \ -$(BPL_EXA)/getting_started4.cpp \ -$(BPL_EXA)/getting_started5.cpp \ -$(BPL_EXA)/pickle1.cpp \ -$(BPL_EXA)/pickle2.cpp \ -$(BPL_EXA)/pickle3.cpp \ -$(BPL_EXA)/test_abstract.py \ -$(BPL_EXA)/test_getting_started1.py \ -$(BPL_EXA)/test_getting_started2.py \ -$(BPL_EXA)/test_getting_started3.py \ -$(BPL_EXA)/test_getting_started4.py \ -$(BPL_EXA)/test_getting_started5.py \ -$(BPL_EXA)/test_pickle1.py \ -$(BPL_EXA)/test_pickle2.py \ -$(BPL_EXA)/test_pickle3.py \ -$(BPL_EXA)/noncopyable.h \ -$(BPL_EXA)/noncopyable_export.cpp \ -$(BPL_EXA)/noncopyable_import.cpp \ -$(BPL_EXA)/tst_noncopyable.py \ -$(BPL_EXA)/ivect.h \ -$(BPL_EXA)/ivect.cpp \ -$(BPL_EXA)/dvect.h \ -$(BPL_EXA)/dvect.cpp \ -$(BPL_EXA)/tst_ivect.py \ -$(BPL_EXA)/tst_dvect.py - OBJ = classes.o conversions.o extension_class.o functions.o \ init_function.o module_builder.o \ - objects.o types.o x_class_builder.o + objects.o types.o cross_module.o DEPOBJ= $(OBJ) \ comprehensive.o \ abstract.o \ @@ -107,32 +61,10 @@ all: libboost_python.a \ getting_started1.so getting_started2.so getting_started3.so \ getting_started4.so getting_started5.so \ pickle1.so pickle2.so pickle3.so \ - noncopyable_export.so noncopyable_import.so \ - ivect.so dvect.so + noncopyable_export.so -softlinks: - @ for pn in $(SOFTLINKS); \ - do \ - bn=`basename "$$pn"`; \ - if [ ! -e "$$bn" ]; then \ - echo "ln -s $$pn ."; \ - ln -s "$$pn" .; \ - else \ - echo "info: no softlink created (file exists): $$bn"; \ - fi; \ - done - -unlink: - @ for pn in $(SOFTLINKS); \ - do \ - bn=`basename "$$pn"`; \ - if [ -L "$$bn" ]; then \ - echo "rm $$bn"; \ - rm "$$bn"; \ - elif [ -e "$$bn" ]; then \ - echo "info: not a softlink: $$bn"; \ - fi; \ - done +# noncopyable_import.so \ +# ivect.so dvect.so libboost_python.a: $(OBJ) rm -f libboost_python.a @@ -225,6 +157,18 @@ clean: rm -f so_locations *.pyc rm -rf cxx_repository +softlinks: + python $(BOOST)/libs/python/build/filemgr.py $(BOOST) softlinks + +unlink: + python $(BOOST)/libs/python/build/filemgr.py $(BOOST) unlink + +cp: + python $(BOOST)/libs/python/build/filemgr.py $(BOOST) cp + +rm: + python $(BOOST)/libs/python/build/filemgr.py $(BOOST) rm + depend: @ cat Makefile.nodepend; \ for obj in $(DEPOBJ); \