From: <sv...@ww...> - 2004-11-14 22:51:01
|
Author: mkrose Date: 2004-11-14 14:50:53 -0800 (Sun, 14 Nov 2004) New Revision: 1319 Removed: trunk/CSP/SimData/Tools/TaggedRecordCompiler/bootstrap.py Modified: trunk/CSP/SimData/CHANGES.current trunk/CSP/SimData/Tools/TaggedRecordCompiler/trc.py Log: Removed spurious 'import bootstrap' from trc. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1319 Modified: trunk/CSP/SimData/CHANGES.current =================================================================== --- trunk/CSP/SimData/CHANGES.current 2004-11-14 21:58:46 UTC (rev 1318) +++ trunk/CSP/SimData/CHANGES.current 2004-11-14 22:50:53 UTC (rev 1319) @@ -4,6 +4,8 @@ 2004-11-14: onsight * Added a method to Timer to both return and reset the elapsed time. +* Removed spurious 'import bootstrap' from trc. + * Set the SWIG_STD_BACKWARD_COMP flag to the Scons script to fix the build under Swig 1.3.22. Deleted: trunk/CSP/SimData/Tools/TaggedRecordCompiler/bootstrap.py =================================================================== --- trunk/CSP/SimData/Tools/TaggedRecordCompiler/bootstrap.py 2004-11-14 21:58:46 UTC (rev 1318) +++ trunk/CSP/SimData/Tools/TaggedRecordCompiler/bootstrap.py 2004-11-14 22:50:53 UTC (rev 1319) @@ -1,33 +0,0 @@ -# SimData: Data Infrastructure for Simulations -# Copyright 2004 Mark Rose <mk...@us...> -# -# This file is part of SimData. -# -# 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. - -try: - import CSP -except: - import sys - import os.path - dn = os.path.dirname - csp_root = dn(dn(dn(dn(dn(__file__))))) - sys.path.insert(0, csp_root) - try: - import CSP - except: - print 'Unable to import the main CSP module. Check that you have' - print 'a complete working copy.' - sys.exit(1) Modified: trunk/CSP/SimData/Tools/TaggedRecordCompiler/trc.py =================================================================== --- trunk/CSP/SimData/Tools/TaggedRecordCompiler/trc.py 2004-11-14 21:58:46 UTC (rev 1318) +++ trunk/CSP/SimData/Tools/TaggedRecordCompiler/trc.py 2004-11-14 22:50:53 UTC (rev 1319) @@ -31,7 +31,6 @@ import os.path import re -import bootstrap from CSP.base import app import BaseTypes |