From: <sv...@ww...> - 2004-06-27 17:34:48
|
Author: mkrose Date: 2004-06-27 10:34:40 -0700 (Sun, 27 Jun 2004) New Revision: 1078 Modified: trunk/CSP/SimData/CHANGES.current trunk/CSP/SimData/setup.py Log: Added ThreadLog.h to setup.py Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1078 Modified: trunk/CSP/SimData/CHANGES.current =================================================================== --- trunk/CSP/SimData/CHANGES.current 2004-06-27 17:32:36 UTC (rev 1077) +++ trunk/CSP/SimData/CHANGES.current 2004-06-27 17:34:40 UTC (rev 1078) @@ -4,6 +4,8 @@ 2004-06-27: onsight * Opps, forgot Source/ThreadBase.cpp + * Added ThreadLog.h to setup.py + 2004-06-26: onsight * Remove superflous logging in interface registry, and suppress swig warnings. Modified: trunk/CSP/SimData/setup.py =================================================================== --- trunk/CSP/SimData/setup.py 2004-06-27 17:32:36 UTC (rev 1077) +++ trunk/CSP/SimData/setup.py 2004-06-27 17:34:40 UTC (rev 1078) @@ -1,18 +1,18 @@ # SimDataCSP: Data Infrastructure for Simulations # Copyright (C) 2002 Mark Rose <tm...@st...> -# +# # This file is part of SimDataCSP. -# +# # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License # as published by the Free Software Foundation; either version 2 # of the License, or (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -38,7 +38,7 @@ print >>sys.stderr, "SimData requires Python version %s or higher. (current version is %s)" % \ (min_python_version, sys.version[:5]) sys.exit(old) - + from distutils.core import setup from distutils.core import Extension import distutils.command.build_ext @@ -149,7 +149,7 @@ if file.endswith(".py"): script = os.path.join(modpath, file) if os.path.exists(script): - py_compile.compile(script) + py_compile.compile(script) os.chmod(script+"c", 0644) except Exception, e: print e @@ -164,13 +164,13 @@ sys.exit(0) class build_swig_ext(build_ext): - + options = [] def build_extension(self, ext): self.ext = ext build_ext.build_extension(self, ext) - + def swig_sources (self, sources): """Walk the list of source files in 'sources', looking for SWIG @@ -209,7 +209,7 @@ swig = self.find_swig() swig_cmd = [swig] + build_swig_ext.options - + if 1 or self.inplace: fullname = self.get_ext_fullname(self.ext.name) modpath = string.split(fullname, '.') @@ -329,6 +329,7 @@ "TaggedRecordRegistry.h", "Thread.h", "ThreadBase.h", + "ThreadLog.h", "ThreadQueue.h", "Timing.h", "Trace.h", @@ -411,11 +412,11 @@ print ' '.join(swigopts) sys.exit(0) -cSimData = Extension("SimData._cSimData", - sources + main_interface_fullpath, +cSimData = Extension("SimData._cSimData", + sources + main_interface_fullpath, include_dirs = includes, define_macros = defines, - libraries = libraries, + libraries = libraries, extra_compile_args = cflags, ) |