From 801cae13ac53968a3f65556d855ea84f08835999 Mon Sep 17 00:00:00 2001 From: "Ralf W. Grosse-Kunstleve" Date: Tue, 31 Jul 2001 07:39:05 +0000 Subject: [PATCH] Macintosh mods: do_it_yourself_converters -> do_it_yourself_convts [SVN r10729] --- build/Jamfile | 4 ++-- build/filemgr.py | 6 +++--- build/irix_CC.mak | 12 ++++++------ build/linux_gcc.mak | 12 ++++++------ build/mingw32.mak | 12 ++++++------ build/tru64_cxx.mak | 12 ++++++------ build/vc60.mak | 8 ++++---- example/README | 2 +- ...self_converters.cpp => do_it_yourself_convts.cpp} | 4 ++-- ...f_converters.py => test_do_it_yourself_convts.py} | 8 ++++---- 10 files changed, 40 insertions(+), 40 deletions(-) rename example/{do_it_yourself_converters.cpp => do_it_yourself_convts.cpp} (97%) rename example/{test_do_it_yourself_converters.py => test_do_it_yourself_convts.py} (63%) diff --git a/build/Jamfile b/build/Jamfile index 314b1440..562aca1e 100644 --- a/build/Jamfile +++ b/build/Jamfile @@ -25,7 +25,7 @@ # getting_started1 - # getting_started2 - # simple_vector - -# do_it_yourself_converters - +# do_it_yourself_convts - # pickle1 - # pickle2 - # pickle3 - @@ -215,7 +215,7 @@ boost-python-example-test abstract ; boost-python-example-test getting_started1 ; boost-python-example-test getting_started2 ; boost-python-example-test simple_vector ; -boost-python-example-test do_it_yourself_converters ; +boost-python-example-test do_it_yourself_convts ; boost-python-example-test pickle1 ; boost-python-example-test pickle2 ; boost-python-example-test pickle3 ; diff --git a/build/filemgr.py b/build/filemgr.py index 5e32460e..2ff163f0 100644 --- a/build/filemgr.py +++ b/build/filemgr.py @@ -23,7 +23,7 @@ bpl_exa + "/abstract.cpp", bpl_exa + "/getting_started1.cpp", bpl_exa + "/getting_started2.cpp", bpl_exa + "/simple_vector.cpp", -bpl_exa + "/do_it_yourself_converters.cpp", +bpl_exa + "/do_it_yourself_convts.cpp", bpl_exa + "/pickle1.cpp", bpl_exa + "/pickle2.cpp", bpl_exa + "/pickle3.cpp", @@ -31,7 +31,7 @@ bpl_exa + "/test_abstract.py", bpl_exa + "/test_getting_started1.py", bpl_exa + "/test_getting_started2.py", bpl_exa + "/test_simple_vector.py", -bpl_exa + "/test_do_it_yourself_converters.py", +bpl_exa + "/test_do_it_yourself_convts.py", bpl_exa + "/test_pickle1.py", bpl_exa + "/test_pickle2.py", bpl_exa + "/test_pickle3.py", @@ -67,7 +67,7 @@ defs = ( "getting_started1", "getting_started2", "simple_vector", -"do_it_yourself_converters", +"do_it_yourself_convts", "pickle1", "pickle2", "pickle3", diff --git a/build/irix_CC.mak b/build/irix_CC.mak index 1fbe3388..6e465b98 100644 --- a/build/irix_CC.mak +++ b/build/irix_CC.mak @@ -43,7 +43,7 @@ DEPOBJ=$(OBJ) \ abstract.o \ getting_started1.o getting_started2.o \ simple_vector.o \ - do_it_yourself_converters.o \ + do_it_yourself_convts.o \ pickle1.o pickle2.o pickle3.o \ noncopyable_export.o noncopyable_import.o \ ivect.o dvect.o \ @@ -56,7 +56,7 @@ all: libboost_python.a \ abstract.so \ getting_started1.so getting_started2.so \ simple_vector.so \ - do_it_yourself_converters.so \ + do_it_yourself_convts.so \ pickle1.so pickle2.so pickle3.so \ noncopyable_export.so noncopyable_import.so \ ivect.so dvect.so \ @@ -81,8 +81,8 @@ getting_started2.so: $(OBJ) getting_started2.o simple_vector.so: $(OBJ) simple_vector.o $(LD) $(LDOPTS) $(OBJ) simple_vector.o -o simple_vector.so -do_it_yourself_converters.so: $(OBJ) do_it_yourself_converters.o - $(LD) $(LDOPTS) $(OBJ) do_it_yourself_converters.o -o do_it_yourself_converters.so +do_it_yourself_convts.so: $(OBJ) do_it_yourself_convts.o + $(LD) $(LDOPTS) $(OBJ) do_it_yourself_convts.o -o do_it_yourself_convts.so pickle1.so: $(OBJ) pickle1.o $(LD) $(LDOPTS) $(OBJ) pickle1.o -o pickle1.so @@ -125,7 +125,7 @@ test: $(PYEXE) test_getting_started1.py $(PYEXE) test_getting_started2.py $(PYEXE) test_simple_vector.py - $(PYEXE) test_do_it_yourself_converters.py + $(PYEXE) test_do_it_yourself_convts.py $(PYEXE) test_pickle1.py $(PYEXE) test_pickle2.py $(PYEXE) test_pickle3.py @@ -141,7 +141,7 @@ clean: rm -f getting_started1.o getting_started1.so rm -f getting_started2.o getting_started2.so rm -f simple_vector.o simple_vector.so - rm -f do_it_yourself_converters.o do_it_yourself_converters.so + rm -f do_it_yourself_convts.o do_it_yourself_convts.so rm -f pickle1.o pickle1.so rm -f pickle2.o pickle2.so rm -f pickle3.o pickle3.so diff --git a/build/linux_gcc.mak b/build/linux_gcc.mak index 3fe407a0..2c977473 100644 --- a/build/linux_gcc.mak +++ b/build/linux_gcc.mak @@ -44,7 +44,7 @@ DEPOBJ=$(OBJ) \ abstract.o \ getting_started1.o getting_started2.o \ simple_vector.o \ - do_it_yourself_converters.o \ + do_it_yourself_convts.o \ pickle1.o pickle2.o pickle3.o \ noncopyable_export.o noncopyable_import.o \ ivect.o dvect.o \ @@ -57,7 +57,7 @@ all: libboost_python.a \ abstract.so \ getting_started1.so getting_started2.so \ simple_vector.so \ - do_it_yourself_converters.so \ + do_it_yourself_convts.so \ pickle1.so pickle2.so pickle3.so \ noncopyable_export.so noncopyable_import.so \ ivect.so dvect.so \ @@ -82,8 +82,8 @@ getting_started2.so: $(OBJ) getting_started2.o simple_vector.so: $(OBJ) simple_vector.o $(LD) $(LDOPTS) $(OBJ) simple_vector.o -o simple_vector.so -do_it_yourself_converters.so: $(OBJ) do_it_yourself_converters.o - $(LD) $(LDOPTS) $(OBJ) do_it_yourself_converters.o -o do_it_yourself_converters.so +do_it_yourself_convts.so: $(OBJ) do_it_yourself_convts.o + $(LD) $(LDOPTS) $(OBJ) do_it_yourself_convts.o -o do_it_yourself_convts.so pickle1.so: $(OBJ) pickle1.o $(LD) $(LDOPTS) $(OBJ) pickle1.o -o pickle1.so @@ -126,7 +126,7 @@ test: $(PYEXE) test_getting_started1.py $(PYEXE) test_getting_started2.py $(PYEXE) test_simple_vector.py - $(PYEXE) test_do_it_yourself_converters.py + $(PYEXE) test_do_it_yourself_convts.py $(PYEXE) test_pickle1.py $(PYEXE) test_pickle2.py $(PYEXE) test_pickle3.py @@ -142,7 +142,7 @@ clean: rm -f getting_started1.o getting_started1.so rm -f getting_started2.o getting_started2.so rm -f simple_vector.o simple_vector.so - rm -f do_it_yourself_converters.o do_it_yourself_converters.so + rm -f do_it_yourself_convts.o do_it_yourself_convts.so rm -f pickle1.o pickle1.so rm -f pickle2.o pickle2.so rm -f pickle3.o pickle3.so diff --git a/build/mingw32.mak b/build/mingw32.mak index 6f192ce2..e966f48a 100644 --- a/build/mingw32.mak +++ b/build/mingw32.mak @@ -59,7 +59,7 @@ all: libboost_python.a \ abstract.pyd \ getting_started1.pyd getting_started2.pyd \ simple_vector.pyd \ - do_it_yourself_converters.pyd \ + do_it_yourself_convts.pyd \ pickle1.pyd pickle2.pyd pickle3.pyd \ noncopyable_export.pyd noncopyable_import.pyd \ ivect.pyd dvect.pyd \ @@ -102,11 +102,11 @@ simple_vector.pyd: $(OBJ) simple_vector.o --def simple_vector.def \ $(OBJ) simple_vector.o $(PYLIB) -do_it_yourself_converters.pyd: $(OBJ) do_it_yourself_converters.o +do_it_yourself_convts.pyd: $(OBJ) do_it_yourself_convts.o dllwrap $(DLLWRAPOPTS) \ - --dllname do_it_yourself_converters.pyd \ - --def do_it_yourself_converters.def \ - $(OBJ) do_it_yourself_converters.o $(PYLIB) + --dllname do_it_yourself_convts.pyd \ + --def do_it_yourself_convts.def \ + $(OBJ) do_it_yourself_convts.o $(PYLIB) pickle1.pyd: $(OBJ) pickle1.o dllwrap $(DLLWRAPOPTS) \ @@ -177,7 +177,7 @@ test: $(PYEXE) test_getting_started1.py $(PYEXE) test_getting_started2.py $(PYEXE) test_simple_vector.py - $(PYEXE) test_do_it_yourself_converters.py + $(PYEXE) test_do_it_yourself_convts.py $(PYEXE) test_pickle1.py $(PYEXE) test_pickle2.py $(PYEXE) test_pickle3.py diff --git a/build/tru64_cxx.mak b/build/tru64_cxx.mak index 8f3d3abf..fba2bfe1 100644 --- a/build/tru64_cxx.mak +++ b/build/tru64_cxx.mak @@ -54,7 +54,7 @@ DEPOBJ=$(OBJ) \ abstract.o \ getting_started1.o getting_started2.o \ simple_vector.o \ - do_it_yourself_converters.o \ + do_it_yourself_convts.o \ pickle1.o pickle2.o pickle3.o \ noncopyable_export.o noncopyable_import.o \ ivect.o dvect.o \ @@ -67,7 +67,7 @@ all: libboost_python.a \ abstract.so \ getting_started1.so getting_started2.so \ simple_vector.so \ - do_it_yourself_converters.so \ + do_it_yourself_convts.so \ pickle1.so pickle2.so pickle3.so \ noncopyable_export.so noncopyable_import.so \ ivect.so dvect.so \ @@ -96,8 +96,8 @@ getting_started2.so: $(OBJ) getting_started2.o simple_vector.so: $(OBJ) simple_vector.o $(LD) $(LDOPTS) $(OBJ) simple_vector.o -o simple_vector.so -do_it_yourself_converters.so: $(OBJ) do_it_yourself_converters.o - $(LD) $(LDOPTS) $(OBJ) do_it_yourself_converters.o -o do_it_yourself_converters.so +do_it_yourself_convts.so: $(OBJ) do_it_yourself_convts.o + $(LD) $(LDOPTS) $(OBJ) do_it_yourself_convts.o -o do_it_yourself_convts.so pickle1.so: $(OBJ) pickle1.o $(LD) $(LDOPTS) $(OBJ) pickle1.o -o pickle1.so @@ -140,7 +140,7 @@ test: $(PYEXE) test_getting_started1.py $(PYEXE) test_getting_started2.py $(PYEXE) test_simple_vector.py - $(PYEXE) test_do_it_yourself_converters.py + $(PYEXE) test_do_it_yourself_convts.py $(PYEXE) test_pickle1.py $(PYEXE) test_pickle2.py $(PYEXE) test_pickle3.py @@ -156,7 +156,7 @@ clean: rm -f getting_started1.o getting_started1.so rm -f getting_started2.o getting_started2.so rm -f simple_vector.o simple_vector.so - rm -f do_it_yourself_converters.o do_it_yourself_converters.so + rm -f do_it_yourself_convts.o do_it_yourself_convts.so rm -f pickle1.o pickle1.so rm -f pickle2.o pickle2.so rm -f pickle3.o pickle3.so diff --git a/build/vc60.mak b/build/vc60.mak index f545015b..ae655c14 100644 --- a/build/vc60.mak +++ b/build/vc60.mak @@ -43,7 +43,7 @@ all: boost_python.lib \ abstract.pyd \ getting_started1.pyd getting_started2.pyd \ simple_vector.pyd \ - do_it_yourself_converters.pyd \ + do_it_yourself_convts.pyd \ pickle1.pyd pickle2.pyd pickle3.pyd \ noncopyable_export.pyd noncopyable_import.pyd \ ivect.pyd dvect.pyd \ @@ -67,8 +67,8 @@ getting_started2.pyd: $(OBJ) getting_started2.obj simple_vector.pyd: $(OBJ) simple_vector.obj $(LD) $(LDOPTS) $(OBJ) simple_vector.obj $(PYLIB) /export:initsimple_vector /out:"simple_vector.pyd" -do_it_yourself_converters.pyd: $(OBJ) do_it_yourself_converters.obj - $(LD) $(LDOPTS) $(OBJ) do_it_yourself_converters.obj $(PYLIB) /export:initdo_it_yourself_converters /out:"do_it_yourself_converters.pyd" +do_it_yourself_convts.pyd: $(OBJ) do_it_yourself_convts.obj + $(LD) $(LDOPTS) $(OBJ) do_it_yourself_convts.obj $(PYLIB) /export:initdo_it_yourself_convts /out:"do_it_yourself_convts.pyd" pickle1.pyd: $(OBJ) pickle1.obj $(LD) $(LDOPTS) $(OBJ) pickle1.obj $(PYLIB) /export:initpickle1 /out:"pickle1.pyd" @@ -109,7 +109,7 @@ test: $(PYEXE) test_getting_started1.py $(PYEXE) test_getting_started2.py $(PYEXE) test_simple_vector.py - $(PYEXE) test_do_it_yourself_converters.py + $(PYEXE) test_do_it_yourself_convts.py $(PYEXE) test_pickle1.py $(PYEXE) test_pickle2.py $(PYEXE) test_pickle3.py diff --git a/example/README b/example/README index 35d822d5..817facd0 100644 --- a/example/README +++ b/example/README @@ -10,7 +10,7 @@ See also: libs/python/doc/pickle.html Other advanced concepts are introduced by: abstract.cpp simple_vector.cpp - do_it_yourself_converters.cpp + do_it_yourself_convts.cpp Examples for the cross-module support are provided by: noncopyable_export.cpp diff --git a/example/do_it_yourself_converters.cpp b/example/do_it_yourself_convts.cpp similarity index 97% rename from example/do_it_yourself_converters.cpp rename to example/do_it_yourself_convts.cpp index 6d2d2d6a..4d9c1c89 100644 --- a/example/do_it_yourself_converters.cpp +++ b/example/do_it_yourself_convts.cpp @@ -105,12 +105,12 @@ BOOST_PYTHON_BEGIN_CONVERSION_NAMESPACE BOOST_PYTHON_END_CONVERSION_NAMESPACE -BOOST_PYTHON_MODULE_INIT(do_it_yourself_converters) +BOOST_PYTHON_MODULE_INIT(do_it_yourself_convts) { try { // Create an object representing this extension module. - python::module_builder this_module("do_it_yourself_converters"); + python::module_builder this_module("do_it_yourself_convts"); // Create the Python type object for our extension class. python::class_builder ixset_class(this_module, "IndexingSet"); diff --git a/example/test_do_it_yourself_converters.py b/example/test_do_it_yourself_convts.py similarity index 63% rename from example/test_do_it_yourself_converters.py rename to example/test_do_it_yourself_convts.py index 17240750..6f5fa5a0 100644 --- a/example/test_do_it_yourself_converters.py +++ b/example/test_do_it_yourself_convts.py @@ -1,5 +1,5 @@ -r'''>>> import do_it_yourself_converters - >>> ixset = do_it_yourself_converters.IndexingSet() +r'''>>> import do_it_yourself_convts + >>> ixset = do_it_yourself_convts.IndexingSet() >>> ixset.add((1,2,3)) >>> ixset.add((4,5,6)) >>> ixset.add((7,8,9)) @@ -15,8 +15,8 @@ def run(args = None): if args is not None: import sys sys.argv = args - import doctest, test_do_it_yourself_converters - return doctest.testmod(test_do_it_yourself_converters) + import doctest, test_do_it_yourself_convts + return doctest.testmod(test_do_it_yourself_convts) if __name__ == '__main__': import sys