csp-commits — Mailing list for CVS commit messages.

[Csp-commits] APPLICATIONS/SimData/Include/SimData Archive.h,1.4,1.5

[<de...@us...>]

Update of /cvsroot/csp/APPLICATIONS/SimData/Include/SimData
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29423

Modified Files:
	Archive.h 
Log Message:
see CHANGES.current

Index: Archive.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Archive.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Archive.h	21 Oct 2003 16:23:34 -0000	1.4
--- Archive.h	30 Mar 2004 10:32:03 -0000	1.5
***************
*** 36,40 ****
  #include <SimData/BaseType.h>
  #include <SimData/HashUtility.h>
! #include <SimData/Exception.h>
  #include <SimData/Namespace.h>
  
--- 36,40 ----
  #include <SimData/BaseType.h>
  #include <SimData/HashUtility.h>
! #include <SimData/ExceptionBase.h>
  #include <SimData/Namespace.h>
  

[Csp-commits] APPLICATIONS/SimData/Source ExceptionBase.cpp,NONE,1.1

[<de...@us...>]

Update of /cvsroot/csp/APPLICATIONS/SimData/Source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28864

Added Files:
	ExceptionBase.cpp 
Log Message:
see CHANGES.current

--- NEW FILE: ExceptionBase.cpp ---
/* 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.
 */


#include <SimData/ExceptionBase.h>
#include <iostream>


NAMESPACE_SIMDATA


ExceptionBase::ExceptionBase(std::string const &type, std::string const &msg) {
     //: std::runtime_error(type+": "+msg) {
    _type = type;
    _msg = msg;
    dump = true;
}

ExceptionBase::ExceptionBase(ExceptionBase const &e) {
    _type = e._type;
    _msg = e._msg;
    dump = e.dump;
    e.dump = false;
}

std::string ExceptionBase::getMessage() { 
    return _msg; 
}

std::string ExceptionBase::getType() { 
    return _type; 
}

std::string ExceptionBase::getError() {
    return _type + ": " + _msg;
}

void ExceptionBase::appendMessage(std::string const &msg) { 
    _msg += "\n" + msg;
}

void ExceptionBase::addMessage(std::string const &msg) { 
    _msg = msg + "\n" + _msg;
}

void ExceptionBase::clear() { 
    dump = false; 
}

void ExceptionBase::details() {
    std::cerr << getError() << std::endl;
}

ExceptionBase::~ExceptionBase() {
    if (dump) details();
}


NAMESPACE_SIMDATA_END

[Csp-commits] APPLICATIONS/SimData/Source Exception.cpp,1.7,NONE

[<de...@us...>]

Update of /cvsroot/csp/APPLICATIONS/SimData/Source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28732

Removed Files:
	Exception.cpp 
Log Message:
see CHANGES.current

--- Exception.cpp DELETED ---

[Csp-commits] APPLICATIONS/SimData/Source DataManager.cpp,1.8,1.9

[<de...@us...>]

Update of /cvsroot/csp/APPLICATIONS/SimData/Source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28624

Modified Files:
	DataManager.cpp 
Log Message:
see CHANGES.current

Index: DataManager.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/DataManager.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** DataManager.cpp	17 Aug 2003 10:50:21 -0000	1.8
--- DataManager.cpp	30 Mar 2004 10:27:55 -0000	1.9
***************
*** 23,27 ****
  #include <SimData/DataArchive.h>
  #include <SimData/Log.h>
! #include <SimData/Exception.h>
  
  
--- 23,27 ----
  #include <SimData/DataArchive.h>
  #include <SimData/Log.h>
! #include <SimData/ExceptionBase.h>
  
  

[Csp-commits] APPLICATIONS/SimData/Source InterfaceRegistry.cpp,1.17,1.18

[<de...@us...>]

Update of /cvsroot/csp/APPLICATIONS/SimData/Source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28583

Modified Files:
	InterfaceRegistry.cpp 
Log Message:
see CHANGES.current

Index: InterfaceRegistry.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/InterfaceRegistry.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** InterfaceRegistry.cpp	30 Mar 2004 10:14:08 -0000	1.17
--- InterfaceRegistry.cpp	30 Mar 2004 10:27:24 -0000	1.18
***************
*** 32,36 ****
  #include <SimData/ObjectInterface.h>
  #include <SimData/Namespace.h>
! #include <SimData/BaseException.h>
  #include <SimData/Enum.h>
  #include <SimData/Path.h>
--- 32,36 ----
  #include <SimData/ObjectInterface.h>
  #include <SimData/Namespace.h>
! #include <SimData/ExceptionBase.h>
  #include <SimData/Enum.h>
  #include <SimData/Path.h>

[Csp-commits] APPLICATIONS/SimData/Include/SimData ExceptionBase.h,NONE,1.1 ExceptionBase.i,NONE,1.1

[<de...@us...>]

Update of /cvsroot/csp/APPLICATIONS/SimData/Include/SimData
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27724

Added Files:
	ExceptionBase.h ExceptionBase.i 
Log Message:
see CHANGES.current

--- NEW FILE: ExceptionBase.h ---
/* SimData: Data Infrastructure for Simulations
 * Copyright (C) 2002 Mark Rose <tm...@st...>
 * 
 * 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.
 */


/**
 * @file BaseException.h
 * @brief Exception base classes and macros for creating new exceptions.
 */


#ifndef __SIMDATA_EXCEPTION_H__
#define __SIMDATA_EXCEPTION_H__

#include <string>


#include <SimData/Export.h>
#include <SimData/Namespace.h>

// XXX this is a temporary hack to make
// swig1.3.21 correctly parses this file
#ifndef NAMESPACE_SIMDATA
namespace simdata {
#else
NAMESPACE_SIMDATA
#endif

#ifndef SIMDATA_EXPORT
#define SIMDATA_EXPORT
#endif

/** General exception base class with error reporting.
 *
 *  @author Mark Rose <mr...@st...>
 */
class SIMDATA_EXPORT ExceptionBase { //: public std::runtime_error {
	std::string _msg;
	std::string _type;
	mutable bool dump;
public:
	/** Create a new exception.
	 *
	 *  @param type a string representing the type of error.
	 *  @param msg a string providing additional information about the error.
	 */
	ExceptionBase(std::string const &type="Exception", std::string const &msg="");

	/** Copy constructor.
	 */
	ExceptionBase(ExceptionBase const &e);

	/** Destructor.
	 *
	 *  If the exception has not cleared, it will display its
	 *  details to stderr on destruction.
	 */
	virtual ~ExceptionBase();

	/** Get the string describing the error.
	 */
	std::string getMessage();

	/** Get the string representing the type of error.
	 */
	std::string getType();

	/** Get the full error message (type + message).
	 */
	std::string getError();

	/** Append additional information to the error description.
	 */
	void appendMessage(std::string const &msg);

	/** Add (prepend) additional information to the error description.
	 */
	void addMessage(std::string const &msg);

	/** Reset the exception so that it will not print to stderr on 
	 *  destruction.
	 */
	void clear();

	/** Dump information about the exception to stderr.
	 */
	void details();
};

/** Base class for all SimData specific exceptions.
 */
class SIMDATA_EXPORT Exception: public ExceptionBase {
public:
	Exception(std::string const &type="Exception", std::string const &msg=""): 
		ExceptionBase(type, msg) { }
};

#define SIMDATA_SUBEXCEPTION(a, b) \
class a: public b { \
public: \
	a(std::string const &msg=""): \
		b(#a, msg) { } \
	a(std::string const &type, std::string const &msg): \
		b(type, msg) { } \
};

#define SIMDATA_EXCEPTION(a)	SIMDATA_SUBEXCEPTION(a, Exception)


/** Exception for marshalling python exceptions through SWIG wrapers.
 *
 *  @author Mark Rose <mr...@st...>
 */
SIMDATA_EXCEPTION(PythonException);

#ifndef NAMESPACE_SIMDATA_END
}
#else
NAMESPACE_SIMDATA_END
#endif

#endif // __SIMDATA_EXCEPTION_H__


--- NEW FILE: ExceptionBase.i ---
/* 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.
 */

%module ExceptionBase
%{
#include "SimData/ExceptionBase.h"
%}

// suppress warning about undefined base class std::runtime_exception
// not sure how to fix this cleanly, since std::runtime_exception has
// a protected default constructor that causes the wrapper code to
// break if swig knows about the class.
%warnfilter(401) Exception;

%include "SimData/ExceptionBase.h"

[Csp-commits] APPLICATIONS/SimData/Include/SimData Exception.h,1.18,NONE Exception.i,1.3,NONE

[<de...@us...>]

Update of /cvsroot/csp/APPLICATIONS/SimData/Include/SimData
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27626

Removed Files:
	Exception.h Exception.i 
Log Message:
see CHANGES.current

--- Exception.h DELETED ---

--- Exception.i DELETED ---

[Csp-commits] APPLICATIONS/SimData/Source InterfaceRegistry.cpp,1.16,1.17

[<de...@us...>]

Update of /cvsroot/csp/APPLICATIONS/SimData/Source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26629

Modified Files:
	InterfaceRegistry.cpp 
Log Message:
see CHANGES.current

Index: InterfaceRegistry.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/InterfaceRegistry.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** InterfaceRegistry.cpp	1 Jan 2004 16:15:19 -0000	1.16
--- InterfaceRegistry.cpp	30 Mar 2004 10:14:08 -0000	1.17
***************
*** 32,36 ****
  #include <SimData/ObjectInterface.h>
  #include <SimData/Namespace.h>
! #include <SimData/Exception.h>
  #include <SimData/Enum.h>
  #include <SimData/Path.h>
--- 32,36 ----
  #include <SimData/ObjectInterface.h>
  #include <SimData/Namespace.h>
! #include <SimData/BaseException.h>
  #include <SimData/Enum.h>
  #include <SimData/Path.h>

[Csp-commits] APPLICATIONS/SimData/Source Makefile,1.14,1.15

[<de...@us...>]

Update of /cvsroot/csp/APPLICATIONS/SimData/Source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26517

Modified Files:
	Makefile 
Log Message:
see CHANGES.current

Index: Makefile
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/Makefile,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Makefile	19 Oct 2003 23:53:56 -0000	1.14
--- Makefile	30 Mar 2004 10:13:45 -0000	1.15
***************
*** 10,44 ****
  
  MODULES = \
! 	BaseType \
! 	DataArchive \
! 	DataManager \
! 	Date \
! 	Enum \
! 	Exception \
! 	External \
! 	FileUtility \
! 	GeoPos \
! 	HashUtility \
! 	InterfaceRegistry \
! 	Interpolate \
! 	Key \
! 	Link \
! 	List \
! 	LogStream \
! 	LUT \
! 	Math \
! 	Matrix3 \
! 	Noise \
! 	Object \
! 	Path \
! 	Quat \
! 	Random \
! 	Real \
! 	TypeAdapter \
! 	Vector3 \
! 	Version
  
  SOURCES = $(MODULES:%=%.cpp)
! OBJECTS = $(MODULES:%=%.o) 
  
  DEPDIR = .deps
--- 10,44 ----
  
  MODULES = \
!     BaseType \
!     DataArchive \
!     DataManager \
!     Date \
!     Enum \
!     ExceptionBase \
!     External \
!     FileUtility \
!     GeoPos \
!     HashUtility \
!     InterfaceRegistry \
!     Interpolate \
!     Key \
!     Link \
!     List \
!     LogStream \
!     LUT \
!     Math \
!     Matrix3 \
!     Noise \
!     Object \
!     Path \
!     Quat \
!     Random \
!     Real \
!     TypeAdapter \
!     Vector3 \
!     Version
  
  SOURCES = $(MODULES:%=%.cpp)
! OBJECTS = $(MODULES:%=%.o)
  
  DEPDIR = .deps
***************
*** 52,69 ****
  
  default:
! 	@echo "run make from top-level directory only"
! 	
  clean-objects:
! 	rm -f $(MODULES:%=_%.so)
! 	rm -f $(MODULES:%=%.o)
! 	rm -f lib*.a
! 	rm -f _cSimData.so cSimData_wrap.*
! 	rm -f $(MODULES:%=%_wrap.o)
! 	rm -f $(DEPDIR)/*.d
! 	rm -f $(TOPDIR)/SimData/_cSimData.so
! 	rm -f $(TOPDIR)/SimData/cSimData.py
  
  clean-dependencies:
! 	@echo $(RM) -r $(RMFLAGS) $(DEPDIR)
  
  clean-deps: clean-dependencies
--- 52,69 ----
  
  default:
!     @echo "run make from top-level directory only"
! 
  clean-objects:
!     rm -f $(MODULES:%=_%.so)
!     rm -f $(MODULES:%=%.o)
!     rm -f lib*.a
!     rm -f _cSimData.so cSimData_wrap.*
!     rm -f $(MODULES:%=%_wrap.o)
!     rm -f $(DEPDIR)/*.d
!     rm -f $(TOPDIR)/SimData/_cSimData.so
!     rm -f $(TOPDIR)/SimData/cSimData.py
  
  clean-dependencies:
!     @echo $(RM) -r $(RMFLAGS) $(DEPDIR)
  
  clean-deps: clean-dependencies
***************
*** 78,118 ****
  
  #clean clean-deps:
! #	for dir in $(SUBDIRS); do \
! #		$(MAKE) -C $${dir} $@; \
! #	done
! 	
  build-subdirs:
! 	for dir in $(SUBDIRS); do \
! 		$(MAKE) -C $${dir} all; \
! 	done
  
  $(DEPDIR)/%.d : %
! 	@echo "Computing dependencies for $<..."
! 	@$(MKDEP) $< $(DEPFILTER) > $@
! 	
  $(DEPDIR)/%.swigdep : %
! 	@echo "Computing dependencies for $<..."
! 	@$(SWDEP) $(DEPFILTER) -o $(<:.i=_wrap.cpp) $< > $@
  
  libSimData.a: $(OBJECTS)
! 	ar cru $@ $^
! 	ranlib $@
! 	cp $@ $(TOPDIR)/SimData
  
  _cSimData.so: $(OBJECTS) cSimData_wrap.o
! 	$(CXX) -Wl,-z,lazyload $(LDOPTS) -o$@ $^
! 	cp $@ $(TOPDIR)/SimData
  
  cSimData_wrap.cpp: cSimData.i
! 	$(SWIG) $(SWOPTS) -o $@ $< 
! 	cp cSimData.py $(TOPDIR)/SimData
  
  cSimData_wrap.o: cSimData_wrap.cpp
! 	$(CXX) -c $(SWCXXF) -I$(PYTHON_INCLUDE) $(@:.o=.cpp)
  
! %.o: %.cpp 
! 	$(CXX) -c $(CFLAGS) $(@:.o=.cpp)
  
  all: _cSimData.so libSimData.a
  #all: build-subdirs _cSimData.so libSimData.a
- 
--- 78,117 ----
  
  #clean clean-deps:
! #   for dir in $(SUBDIRS); do \
! #       $(MAKE) -C $${dir} $@; \
! #   done
! 
  build-subdirs:
!     for dir in $(SUBDIRS); do \
!         $(MAKE) -C $${dir} all; \
!     done
  
  $(DEPDIR)/%.d : %
!     @echo "Computing dependencies for $<..."
!     @$(MKDEP) $< $(DEPFILTER) > $@
! 
  $(DEPDIR)/%.swigdep : %
!     @echo "Computing dependencies for $<..."
!     @$(SWDEP) $(DEPFILTER) -o $(<:.i=_wrap.cpp) $< > $@
  
  libSimData.a: $(OBJECTS)
!     ar cru $@ $^
!     ranlib $@
!     cp $@ $(TOPDIR)/SimData
  
  _cSimData.so: $(OBJECTS) cSimData_wrap.o
!     $(CXX) -Wl,-z,lazyload $(LDOPTS) -o$@ $^
!     cp $@ $(TOPDIR)/SimData
  
  cSimData_wrap.cpp: cSimData.i
!     $(SWIG) $(SWOPTS) -o $@ $<
!     cp cSimData.py $(TOPDIR)/SimData
  
  cSimData_wrap.o: cSimData_wrap.cpp
!     $(CXX) -c $(SWCXXF) -I$(PYTHON_INCLUDE) $(@:.o=.cpp)
  
! %.o: %.cpp
!     $(CXX) -c $(CFLAGS) $(@:.o=.cpp)
  
  all: _cSimData.so libSimData.a
  #all: build-subdirs _cSimData.so libSimData.a

[Csp-commits] APPLICATIONS/SimData/Source SConscript,1.7,1.8

[<de...@us...>]

Update of /cvsroot/csp/APPLICATIONS/SimData/Source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26408

Modified Files:
	SConscript 
Log Message:
see CHANGES.current

Index: SConscript
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/SConscript,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** SConscript	19 Mar 2004 08:57:14 -0000	1.7
--- SConscript	30 Mar 2004 10:13:04 -0000	1.8
***************
*** 28,182 ****
  
  headers = Prefix("#/Include/SimData",
! 	"""
! 	Archive.h
! 	BaseType.h
! 	Composite.h
! 	Conversions.h
! 	DataArchive.h
! 	DataManager.h
! 	Date.h
! 	Enum.h
! 	Exception.h
! 	Export.h
! 	External.h
! 	FileUtility.h
! 	GeoPos.h
! 	hash_map.h
! 	HashUtility.h
! 	Integer.h
! 	InterfaceRegistry.h
! 	Interpolate.h
! 	Key.h
! 	Link.h
! 	List.h
! 	LUT.h
! 	Log.h
! 	LogStream.h
! 	Math.h
! 	Matrix3.h
! 	Noise.h
! 	Namespace.h
! 	Object.h
! 	ObjectInterface.h
! 	osg.h
! 	Path.h
! 	PTS.h
! 	Quat.h
! 	Random.h
! 	Real.h
! 	Ref.h
! 	Singleton.h
! 	String.h
! 	Trace.h
! 	TypeAdapter.h
! 	Types.h
! 	Uniform.h
! 	Vector3.h
! 	Version.h
! 	""")
  
  sub_interfaces = Prefix("#/Include/SimData",
! 	"""
! 	Archive.i
! 	BaseType.i
! 	Conversions.i
! 	cSimData.i
! 	DataArchive.i
! 	DataManager.i
! 	Date.i
! 	Enum.i
! 	Exception.i
! 	External.i
! 	filemap.i
! 	GeoPos.i
! 	HashUtility.i
! 	InterfaceRegistry.i
! 	Interpolate.i
! 	Key.i
! 	Link.i
! 	List.i
! 	Log.i
! 	LUT.i
! 	Matrix3.i
! 	Noise.i
! 	Object.i
! 	Path.i
! 	Quat.i
! 	Random.i
! 	Real.i
! 	String.i
! 	Types.i
! 	vector.i
! 	Vector3.i
! 	""")
  
  sources = """
! 	BaseType.cpp
! 	DataArchive.cpp
! 	DataManager.cpp
! 	Date.cpp
! 	Enum.cpp
! 	Exception.cpp
! 	External.cpp
! 	FileUtility.cpp
! 	GeoPos.cpp
! 	HashUtility.cpp
! 	InterfaceRegistry.cpp
! 	Interpolate.cpp
! 	Key.cpp
! 	Link.cpp
! 	List.cpp
! 	LogStream.cpp
! 	LUT.cpp
! 	Math.cpp
! 	Matrix3.cpp
! 	Noise.cpp
! 	Object.cpp
! 	Path.cpp
! 	Quat.cpp
! 	Random.cpp
! 	Real.cpp
! 	TypeAdapter.cpp
! 	Vector3.cpp
! 	Version.cpp
! 	""".split()
  
  package_files = Prefix("#/SimData",
! 	"""
! 	__init__.py
! 	Parse.py
! 	Compile.py
! 	Debug.py
! 	cSimData.py
! 	""")
  
  extra_files = Prefix("#",
! 	"""
! 	README
! 	COPYING
! 	TODO
! 	SConstruct
! 	build_support.py
! 	build_config.py
! 	setup.py
! 	Source/SConscript
! 	""")
  
  doc_files = Prefix("#/Doc",
! 	"""
! 	Doxyfile
! 	SConscript
! 	footer.html
! 	""")
  
  deb_files = Prefix("#/debian",
! 	"""
! 	control
! 	rules
! 	copyright
! 	changelog
! 	docs
! 	files
! 	""")
  
  # extension module
--- 28,182 ----
  
  headers = Prefix("#/Include/SimData",
!     """
!     Archive.h
!     BaseType.h
!     Composite.h
!     Conversions.h
!     DataArchive.h
!     DataManager.h
!     Date.h
!     Enum.h
!     ExceptionBase.h
!     Export.h
!     External.h
!     FileUtility.h
!     GeoPos.h
!     hash_map.h
!     HashUtility.h
!     Integer.h
!     InterfaceRegistry.h
!     Interpolate.h
!     Key.h
!     Link.h
!     List.h
!     LUT.h
!     Log.h
!     LogStream.h
!     Math.h
!     Matrix3.h
!     Noise.h
!     Namespace.h
!     Object.h
!     ObjectInterface.h
!     osg.h
!     Path.h
!     PTS.h
!     Quat.h
!     Random.h
!     Real.h
!     Ref.h
!     Singleton.h
!     String.h
!     Trace.h
!     TypeAdapter.h
!     Types.h
!     Uniform.h
!     Vector3.h
!     Version.h
!     """)
  
  sub_interfaces = Prefix("#/Include/SimData",
!     """
!     Archive.i
!     BaseType.i
!     Conversions.i
!     cSimData.i
!     DataArchive.i
!     DataManager.i
!     Date.i
!     Enum.i
!     ExceptionBase.i
!     External.i
!     filemap.i
!     GeoPos.i
!     HashUtility.i
!     InterfaceRegistry.i
!     Interpolate.i
!     Key.i
!     Link.i
!     List.i
!     Log.i
!     LUT.i
!     Matrix3.i
!     Noise.i
!     Object.i
!     Path.i
!     Quat.i
!     Random.i
!     Real.i
!     String.i
!     Types.i
!     vector.i
!     Vector3.i
!     """)
  
  sources = """
!     BaseType.cpp
!     DataArchive.cpp
!     DataManager.cpp
!     Date.cpp
!     Enum.cpp
!     ExceptionBase.cpp
!     External.cpp
!     FileUtility.cpp
!     GeoPos.cpp
!     HashUtility.cpp
!     InterfaceRegistry.cpp
!     Interpolate.cpp
!     Key.cpp
!     Link.cpp
!     List.cpp
!     LogStream.cpp
!     LUT.cpp
!     Math.cpp
!     Matrix3.cpp
!     Noise.cpp
!     Object.cpp
!     Path.cpp
!     Quat.cpp
!     Random.cpp
!     Real.cpp
!     TypeAdapter.cpp
!     Vector3.cpp
!     Version.cpp
!     """.split()
  
  package_files = Prefix("#/SimData",
!     """
!     __init__.py
!     Parse.py
!     Compile.py
!     Debug.py
!     cSimData.py
!     """)
  
  extra_files = Prefix("#",
!     """
!     README
!     COPYING
!     TODO
!     SConstruct
!     build_support.py
!     build_config.py
!     setup.py
!     Source/SConscript
!     """)
  
  doc_files = Prefix("#/Doc",
!     """
!     Doxyfile
!     SConscript
!     footer.html
!     """)
  
  deb_files = Prefix("#/debian",
!     """
!     control
!     rules
!     copyright
!     changelog
!     docs
!     files
!     """)
  
  # extension module
***************
*** 195,213 ****
  ExpandList(libraries, shared_library)
  
  if env['PLATFORM'] != 'win32':
    static_library = env.StaticLibrary('#/SimData/libSimData', sources)
    ExpandList(libraries, static_library)
  
  package_targets = libraries + [package_module]
  
  # installation
  package = env['PACKAGE']
  package.installTarget(package_files + libraries, headers + sub_interfaces)
  package.add(Prefix('#/Source', sources), 'source')
  package.add(extension_interface, 'source')
! package.add(deb_files, 'source')
! package.add(libraries, 'binary')
! package.add(package_files + headers + sub_interfaces + extra_files + doc_files, 'both')
! package.setTargets(package_targets)
! package.unitTests('./runtests.py')
! 
--- 195,221 ----
  ExpandList(libraries, shared_library)
  
+ 
+ # XXX
+ #static_library = env.StaticLibrary('#/SimData/libSimData', sources)
+ 
+ #libraries = [shared_library, static_library]
+ #libraries = [shared_library]
+ 
  if env['PLATFORM'] != 'win32':
    static_library = env.StaticLibrary('#/SimData/libSimData', sources)
    ExpandList(libraries, static_library)
  
+ 
  package_targets = libraries + [package_module]
  
  # installation
  package = env['PACKAGE']
+ # XXX
  package.installTarget(package_files + libraries, headers + sub_interfaces)
  package.add(Prefix('#/Source', sources), 'source')
  package.add(extension_interface, 'source')
! #package.add(deb_files, 'source')
! #package.add(libraries, 'binary')
! #package.add(package_files + headers + sub_interfaces + extra_files + doc_files, 'both')
! #package.setTargets(package_targets)
! #package.unitTests('./runtests.py')

[Csp-commits] APPLICATIONS/SimData setup.py,1.33,1.34

[<de...@us...>]

Update of /cvsroot/csp/APPLICATIONS/SimData
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26147

Modified Files:
	setup.py 
Log Message:
see CHANGES.current

Index: setup.py
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/setup.py,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** setup.py	31 Jan 2004 06:24:07 -0000	1.33
--- setup.py	30 Mar 2004 10:11:35 -0000	1.34
***************
*** 79,166 ****
  
  def copy_dir(src, dst, files, verbose=0):
! 	from distutils.file_util import copy_file
! 	from distutils.dir_util import mkpath
! 	from distutils.errors import DistutilsFileError, DistutilsInternalError
! 	from stat import ST_ATIME, ST_MTIME, ST_MODE, S_IMODE
! 	if not os.path.isdir(src):
! 		raise DistutilsFileError, \
! 			"cannot copy dir '%s': not a directory" % src
! 	mkpath(dst)
! 	st = os.stat(src)
! 	os.chmod(dst, S_IMODE(st[ST_MODE]))
! 	warnings = 0
! 	for n in files:
! 		src_name = os.path.join(src, n)
! 		dst_name = os.path.join(dst, n)
! 		if not os.path.isdir(src_name):
! 			if verbose:
! 				print "%s => %s" % (src_name, dst_name)
! 			try:
! 				copy_file(src_name, dst_name)
! 			except DistutilsFileError, e:
! 				print "WARNING:", e
! 				warnings = warnings + 1
! 	return warnings
  
  def make_install(win, args):
! 	from distutils.errors import DistutilsFileError
! 	lib = sysconfig.get_python_lib()
! 	inc = sysconfig.get_python_inc()
! 	modpath = os.path.join(lib, "SimData")
! 	incpath = os.path.join(inc, "SimData")
! 	localinc = os.path.normpath("Include/SimData")
! 	libpath = modpath
! 	prefix = ""
! 	verbose = 0
! 	warnings = 0
! 	for arg in args:
! 		if arg.startswith("--prefix="):
! 			prefix = arg[9:]
! 			modpath = os.path.normpath(prefix+modpath)
! 			incpath = os.path.normpath(prefix+incpath)
! 			libpath = os.path.normpath(prefix+libpath)
! 		elif arg=='-v' or arg=='--verbose':
! 			verbose = 1
! 	package_files = ['__init__.py', 'Debug.py', 'Parse.py', 'Compile.py']
! 	if win:
! 		package_files.extend(['cSimData.py', '_cSimData.dll', '_cSimData.lib','_cSimDatad.dll', '_cSimDatad.lib'])
! 		src = os.path.join("VisualStudio","cSimData.py")
! 		if os.path.exists(src):
! 			from distutils.file_util import copy_file
! 			try:
! 				copy_file(src, os.path.join("SimData","cSimData.py"))
! 			except DistutilsFileError, e:
! 				print "WARNING:", e
! 				warnings = warnings + 1
! 	else:
! 		package_files.extend(['cSimData.py', '_cSimData.so'])
! 	try:
! 		print "Installing SimData package to", modpath
! 		warnings = warnings + copy_dir("SimData", modpath, package_files, verbose)
! 		print "Installing SimData headers to", incpath
! 		warnings = warnings + copy_dir(localinc, incpath, headers, verbose)
! 		warnings = warnings + copy_dir(localinc, incpath, interfaces, verbose)
! 		if not win:
! 			print "Installing SimData libraries to", libpath
! 			warnings = warnings + copy_dir("SimData", libpath, ['_cSimData.so', 'libSimData.a'], verbose)
! 		print "Byte compiling the Python modules..."
! 		import py_compile
! 		for file in package_files:
! 			if file.endswith(".py"):
! 				script = os.path.join(modpath, file)
! 				if os.path.exists(script):
! 					py_compile.compile(script)  
! 					os.chmod(script+"c", 0644)
! 	except Exception, e:
! 		print e
! 		sys.exit(1)
! 	if warnings > 0:
! 		print "WARNING: Some errors were encountered during installation."
! 		if win:
! 			print
! 			print "         If you have only built the release version of SimData, you"
! 			print "         can safely ignore warnings related to _cSimDatad.dll  and"
! 			print "         _cSimDatad.lib."
! 	sys.exit(0)
  
  class build_swig_ext(build_ext):
--- 79,166 ----
  
  def copy_dir(src, dst, files, verbose=0):
!     from distutils.file_util import copy_file
!     from distutils.dir_util import mkpath
!     from distutils.errors import DistutilsFileError, DistutilsInternalError
!     from stat import ST_ATIME, ST_MTIME, ST_MODE, S_IMODE
!     if not os.path.isdir(src):
!         raise DistutilsFileError, \
!             "cannot copy dir '%s': not a directory" % src
!     mkpath(dst)
!     st = os.stat(src)
!     os.chmod(dst, S_IMODE(st[ST_MODE]))
!     warnings = 0
!     for n in files:
!         src_name = os.path.join(src, n)
!         dst_name = os.path.join(dst, n)
!         if not os.path.isdir(src_name):
!             if verbose:
!                 print "%s => %s" % (src_name, dst_name)
!             try:
!                 copy_file(src_name, dst_name)
!             except DistutilsFileError, e:
!                 print "WARNING:", e
!                 warnings = warnings + 1
!     return warnings
  
  def make_install(win, args):
!     from distutils.errors import DistutilsFileError
!     lib = sysconfig.get_python_lib()
!     inc = sysconfig.get_python_inc()
!     modpath = os.path.join(lib, "SimData")
!     incpath = os.path.join(inc, "SimData")
!     localinc = os.path.normpath("Include/SimData")
!     libpath = modpath
!     prefix = ""
!     verbose = 0
!     warnings = 0
!     for arg in args:
!         if arg.startswith("--prefix="):
!             prefix = arg[9:]
!             modpath = os.path.normpath(prefix+modpath)
!             incpath = os.path.normpath(prefix+incpath)
!             libpath = os.path.normpath(prefix+libpath)
!         elif arg=='-v' or arg=='--verbose':
!             verbose = 1
!     package_files = ['__init__.py', 'Debug.py', 'Parse.py', 'Compile.py']
!     if win:
!         package_files.extend(['cSimData.py', '_cSimData.dll', '_cSimData.lib','_cSimDatad.dll', '_cSimDatad.lib'])
!         src = os.path.join("VisualStudio","cSimData.py")
!         if os.path.exists(src):
!             from distutils.file_util import copy_file
!             try:
!                 copy_file(src, os.path.join("SimData","cSimData.py"))
!             except DistutilsFileError, e:
!                 print "WARNING:", e
!                 warnings = warnings + 1
!     else:
!         package_files.extend(['cSimData.py', '_cSimData.so'])
!     try:
!         print "Installing SimData package to", modpath
!         warnings = warnings + copy_dir("SimData", modpath, package_files, verbose)
!         print "Installing SimData headers to", incpath
!         warnings = warnings + copy_dir(localinc, incpath, headers, verbose)
!         warnings = warnings + copy_dir(localinc, incpath, interfaces, verbose)
!         if not win:
!             print "Installing SimData libraries to", libpath
!             warnings = warnings + copy_dir("SimData", libpath, ['_cSimData.so', 'libSimData.a'], verbose)
!         print "Byte compiling the Python modules..."
!         import py_compile
!         for file in package_files:
!             if file.endswith(".py"):
!                 script = os.path.join(modpath, file)
!                 if os.path.exists(script):
!                     py_compile.compile(script)  
!                     os.chmod(script+"c", 0644)
!     except Exception, e:
!         print e
!         sys.exit(1)
!     if warnings > 0:
!         print "WARNING: Some errors were encountered during installation."
!         if win:
!             print
!             print "         If you have only built the release version of SimData, you"
!             print "         can safely ignore warnings related to _cSimDatad.dll  and"
!             print "         _cSimDatad.lib."
!     sys.exit(0)
  
  class build_swig_ext(build_ext):
***************
*** 250,363 ****
  
  sources = [
! 	"BaseType",
! 	"DataArchive",
! 	"DataManager",
! 	"Date",
! 	"Enum",
! 	"Exception",
! 	"External",
! 	"FileUtility",
! 	"GeoPos",
! 	"HashUtility",
! 	"InterfaceRegistry",
! 	"Interpolate",
! 	"Key",
! 	"Link",
! 	"List",
! 	"LogStream",
! 	"LUT",
! 	"Math",
! 	"Matrix3",
! 	"Object",
! 	"Noise",
! 	"Path",
! 	"Quat",
! 	"Random",
! 	"Real",
! 	"TypeAdapter",
! 	"Vector3",
! 	"Version",
  ]
  
  headers = [
! 	"Archive.h",
! 	"BaseType.h",
! 	"Composite.h",
! 	"Conversions.h",
! 	"DataArchive.h",
! 	"DataManager.h",
! 	"Date.h",
! 	"Enum.h",
! 	"Exception.h",
! 	"Export.h",
! 	"External.h",
! 	"FileUtility.h",
! 	"GeoPos.h",
! 	"hash_map.h",
! 	"HashUtility.h",
! 	"Integer.h",
! 	"InterfaceRegistry.h",
! 	"Interpolate.h",
! 	"Key.h",
! 	"Link.h",
! 	"List.h",
! 	"LUT.h",
! 	"Log.h",
! 	"LogStream.h",
! 	"Math.h",
! 	"Matrix3.h",
! 	"Noise.h",
! 	"Namespace.h",
! 	"Object.h",
! 	"ObjectInterface.h",
! 	"osg.h",
! 	"Path.h",
! 	"PTS.h",
! 	"Quat.h",
! 	"Random.h",
! 	"Real.h",
! 	"Ref.h",
! 	"Singleton.h",
! 	"String.h",
! 	"Trace.h",
! 	"TypeAdapter.h",
! 	"Types.h",
! 	"Uniform.h",
! 	"Vector3.h",
! 	"Version.h",
  ]
  
  interfaces = [
! 	"cSimData.i",
! 	"Archive.i",
! 	"BaseType.i",
! 	"Conversions.i",
! 	"DataArchive.i",
! 	"DataManager.i",
! 	"Date.i",
! 	"Enum.i",
! 	"Exception.i",
! 	"External.i",
! 	"filemap.i",
! 	"GeoPos.i",
! 	"HashUtility.i",
! 	"InterfaceRegistry.i",
! 	"Interpolate.i",
! 	"Key.i",
! 	"Link.i",
! 	"List.i",
! 	"Log.i",
! 	"LUT.i",
! 	"Matrix3.i",
! 	"Noise.i",
! 	"Object.i",
! 	"Path.i",
! 	"Quat.i",
! 	"Random.i",
! 	"Real.i",
! 	"String.i",
! 	"Types.i",
! 	"vector.i",
! 	"Vector3.i",
  ]
  
--- 250,363 ----
  
  sources = [
!     "BaseType",
!     "DataArchive",
!     "DataManager",
!     "Date",
!     "Enum",
!     "BaseException",
!     "External",
!     "FileUtility",
!     "GeoPos",
!     "HashUtility",
!     "InterfaceRegistry",
!     "Interpolate",
!     "Key",
!     "Link",
!     "List",
!     "LogStream",
!     "LUT",
!     "Math",
!     "Matrix3",
!     "Object",
!     "Noise",
!     "Path",
!     "Quat",
!     "Random",
!     "Real",
!     "TypeAdapter",
!     "Vector3",
!     "Version",
  ]
  
  headers = [
!     "Archive.h",
!     "BaseType.h",
!     "Composite.h",
!     "Conversions.h",
!     "DataArchive.h",
!     "DataManager.h",
!     "Date.h",
!     "Enum.h",
!     "ExceptionBase.h",
!     "Export.h",
!     "External.h",
!     "FileUtility.h",
!     "GeoPos.h",
!     "hash_map.h",
!     "HashUtility.h",
!     "Integer.h",
!     "InterfaceRegistry.h",
!     "Interpolate.h",
!     "Key.h",
!     "Link.h",
!     "List.h",
!     "LUT.h",
!     "Log.h",
!     "LogStream.h",
!     "Math.h",
!     "Matrix3.h",
!     "Noise.h",
!     "Namespace.h",
!     "Object.h",
!     "ObjectInterface.h",
!     "osg.h",
!     "Path.h",
!     "PTS.h",
!     "Quat.h",
!     "Random.h",
!     "Real.h",
!     "Ref.h",
!     "Singleton.h",
!     "String.h",
!     "Trace.h",
!     "TypeAdapter.h",
!     "Types.h",
!     "Uniform.h",
!     "Vector3.h",
!     "Version.h",
  ]
  
  interfaces = [
!     "cSimData.i",
!     "Archive.i",
!     "BaseType.i",
!     "Conversions.i",
!     "DataArchive.i",
!     "DataManager.i",
!     "Date.i",
!     "Enum.i",
!     "ExceptionBase.i",
!     "External.i",
!     "filemap.i",
!     "GeoPos.i",
!     "HashUtility.i",
!     "InterfaceRegistry.i",
!     "Interpolate.i",
!     "Key.i",
!     "Link.i",
!     "List.i",
!     "Log.i",
!     "LUT.i",
!     "Matrix3.i",
!     "Noise.i",
!     "Object.i",
!     "Path.i",
!     "Quat.i",
!     "Random.i",
!     "Real.i",
!     "String.i",
!     "Types.i",
!     "vector.i",
!     "Vector3.i",
  ]
  
***************
*** 395,402 ****
      if command == "ldopts":
          print '-shared', ' '.join(map(lambda x: '-l%s' % x, libraries))
! 	sys.exit(0)
      if command == "swigopts":
          print ' '.join(swigopts)
! 	sys.exit(0)
  
  cSimData = Extension("SimData._cSimData", 
--- 395,402 ----
      if command == "ldopts":
          print '-shared', ' '.join(map(lambda x: '-l%s' % x, libraries))
!     sys.exit(0)
      if command == "swigopts":
          print ' '.join(swigopts)
!     sys.exit(0)
  
  cSimData = Extension("SimData._cSimData", 
***************
*** 414,418 ****
        author_email="mr...@st...",
        url="http://csp.sourceforge.net/wiki/SimData",
! 	  license="GNU General Public License, version 2 or later.",
        packages=['SimData'],
        headers = headers_fullpath + interfaces_fullpath + main_interface_fullpath,
--- 414,418 ----
        author_email="mr...@st...",
        url="http://csp.sourceforge.net/wiki/SimData",
!       license="GNU General Public License, version 2 or later.",
        packages=['SimData'],
        headers = headers_fullpath + interfaces_fullpath + main_interface_fullpath,

[Csp-commits] APPLICATIONS/SimData build_config.py,1.5,1.6

[<de...@us...>]

Update of /cvsroot/csp/APPLICATIONS/SimData
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26099

Modified Files:
	build_config.py 
Log Message:
see CHANGES.current

Index: build_config.py
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/build_config.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** build_config.py	19 Mar 2004 08:57:14 -0000	1.5
--- build_config.py	30 Mar 2004 10:11:18 -0000	1.6
***************
*** 1,36 ****
  from build_support import Config, compareVersions
  
- 
  class Config_posix(Config):
! 	def config(self, env):
! 		self.CXXFLAGS = '-g -Wall -O2'
! 		self.CPPFLAGS = ''
! 		self.CPPPATH = ['#/Include', self.PYTHON_INC]
! 		self.SHLINKFLAGS = ' -shared -Wl,-z,lazyload'
! 		self.SHLINKLIBS = ['dl']
! 		self.CXXFILESUFFIX = '.cpp'
! 		self.ARCHIVE_FORMATS = None
  
  class Config_msvc(Config):
! 	def config(self, env):
! 		wine = '' #wine --debugmsg -all -- '
! 		self.CXX = wine + 'cl'
! 		self.LINK = wine + 'link'
! 		self.CXXFLAGS = '/nologo /DWIN32=1 /D_WIN32=1 /D_STLPORT=1 /DSIMDATA_EXPORTS=1 /GR /GX /W3'
! 		self.CPPFLAGS = ''
! 		self.CPPPATH = ['#/Include', self.PYTHON_INC]
! 		self.SHLINKFLAGS = ' /MACHINE:I386 /LIBPATH:%s /NODEFAULTLIB:LIBC' % self.PYTHON_LIB
! 		self.SHLINKLIBS = []
! 		self.CXXFILESUFFIX = '.cpp'
! 		self.ARCHIVE_FORMATS = ['.zip']
  
  class Config_win32(Config):
! 	def config(self, env):
! 		self.CXXFLAGS = '/nologo /DWIN32=1 /D_WIN32=1 /D_STLPORT=1 /DSIMDATA_EXPORTS=1 /GR /GX /W3'
! 		self.CPPFLAGS = ''
! 		self.CPPPATH = ['#/Include', self.PYTHON_INC]
! 		self.SHLINKFLAGS = ' /MACHINE:I386 /LIBPATH:%s /NODEFAULTLIB:LIBC' % self.PYTHON_LIB
! 		self.SHLINKLIBS = []
! 		self.CXXFILESUFFIX = '.cpp'
! 		self.ARCHIVE_FORMATS = ['.zip']
! 
--- 1,36 ----
  from build_support import Config, compareVersions
  
  class Config_posix(Config):
!     def config(self, env):
!         self.CXXFLAGS = '-g -Wall -O2'
!         self.CPPFLAGS = ''
!         self.CPPPATH = ['#/Include', self.PYTHON_INC]
!         self.SHLINKFLAGS = ' -shared -Wl,-z,lazyload'
!         self.SHLINKLIBS = ['dl']
!         self.CXXFILESUFFIX = '.cpp'
!         self.ARCHIVE_FORMATS = None
  
  class Config_msvc(Config):
!     def config(self, env):
!         wine = '' #wine --debugmsg -all -- '
!         self.CXX = wine + 'cl'
!         self.LINK = wine + 'link'
!         self.CXXFLAGS = '/nologo /DWIN32=1 /D_WIN32=1 /D_STLPORT=1 /DSIMDATA_EXPORTS=1 /GR /GX /W3'
!         self.CPPFLAGS = ''
!         self.CPPPATH = ['#/Include', self.PYTHON_INC]
!         self.SHLINKFLAGS = ' /MACHINE:I386 /LIBPATH:%s /NODEFAULTLIB:LIBC' % self.PYTHON_LIB
!         self.SHLINKLIBS = []
!         self.CXXFILESUFFIX = '.cpp'
!         self.ARCHIVE_FORMATS = ['.zip']
  
  class Config_win32(Config):
!     def config(self, env):
!         import sys
!         from os.path import join
!         self.PYTHON_LIBS = join(sys.prefix, 'libs')
!         self.CPPFLAGS = '/EHsc /DWIN32=1 /DSIMDATA_EXPORTS=1 /GR /GX /W3 /MD'
!         self.CPPPATH = ['#/Include', self.PYTHON_INC]
!         self.SHLINKFLAGS = '/MACHINE:I386 /LIBPATH:%s /DLL' % self.PYTHON_LIBS
!         self.ARCHIVE_FORMATS = ['.zip']
!         
!         

[Csp-commits] APPLICATIONS/SimData build_support.py,1.5,1.6

[<de...@us...>]

Update of /cvsroot/csp/APPLICATIONS/SimData
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25951

Modified Files:
	build_support.py 
Log Message:
see CHANGES.current

Index: build_support.py
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/build_support.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** build_support.py	19 Mar 2004 08:57:14 -0000	1.5
--- build_support.py	30 Mar 2004 10:11:04 -0000	1.6
***************
*** 19,24 ****
  # along with this program; if not, write to the Free Software
  # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- 
  ##
  # Utilities for building and installing with SCons 
  
--- 19,24 ----
  # along with this program; if not, write to the Free Software
  # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  ##
+ 
  # Utilities for building and installing with SCons 
  
***************
*** 47,88 ****
  
  def getPythonInc():
! 	from distutils import sysconfig
! 	return sysconfig.get_python_inc()
  
  def getPythonLib():
! 	from distutils import sysconfig
! 	return sysconfig.get_python_lib()
  
  def installFile(target, source, env):
! 	"""Install a source file into a target using the function specified
! 	as the INSTALL construction variable."""
! 	try:
! 		install = env['INSTALL']
! 	except KeyError:
! 		raise SCons.Errors.UserError('Missing INSTALL construction variable.')
! 	return install(target[0].path, source[0].path, env)
  
  def byteCompile(target, source, env):
! 	"""Byte compile a python source file."""
! 	target = str(target[0])
! 	if target.endswith(".py") and os.path.exists(target):
! 		import py_compile
! 		try:
! 			py_compile.compile(target)  
! 			os.chmod(target+"c", 0644)
! 			return 0
! 		except:
! 			pass
! 	return 0
  
  def installFileString(target, source, env):
! 	source = str(source[0])
! 	target = str(target[0])
! 	return 'copying %s -> %s' % (source, target)
  
  def byteCompileString(target, source, env):
! 	target = str(target[0])
! 	if target.endswith(".py"):
! 		return 'byte-compiling %s to %sc' % (target, os.path.basename(target))
  
  installFileAction = Action(installFile, installFileString)
--- 47,88 ----
  
  def getPythonInc():
!     from distutils import sysconfig
!     return sysconfig.get_python_inc()
  
  def getPythonLib():
!     from distutils import sysconfig
!     return sysconfig.get_python_lib()
  
  def installFile(target, source, env):
!     """Install a source file into a target using the function specified
!     as the INSTALL construction variable."""
!     try:
!         install = env['INSTALL']
!     except KeyError:
!         raise SCons.Errors.UserError('Missing INSTALL construction variable.')
!     return install(target[0].path, source[0].path, env)
  
  def byteCompile(target, source, env):
!     """Byte compile a python source file."""
!     target = str(target[0])
!     if target.endswith(".py") and os.path.exists(target):
!         import py_compile
!         try:
!             py_compile.compile(target)  
!             os.chmod(target+"c", 0644)
!             return 0
!         except:
!             pass
!     return 0
  
  def installFileString(target, source, env):
!     source = str(source[0])
!     target = str(target[0])
!     return 'copying %s -> %s' % (source, target)
  
  def byteCompileString(target, source, env):
!     target = str(target[0])
!     if target.endswith(".py"):
!         return 'byte-compiling %s to %sc' % (target, os.path.basename(target))
  
  installFileAction = Action(installFile, installFileString)
***************
*** 108,112 ****
  
  
- 
  ############################################################################
  # general utilities
--- 108,111 ----
***************
*** 114,133 ****
  
  def compareVersions(a, b):
! 	a = map(int, a.split('.'))
! 	b = map(int, b.split('.'))
! 	for i in range(min(len(a), len(b))):
! 		if a[i] < b[i]: return -1
! 		if a[i] > b[i]: return 1
! 	if len(a) < len(b): return -1
! 	if len(a) > len(b): return 1
! 	return 0
  
! def addConfigTests(conf):	
! 	conf.AddTests(configure_tests)
  
  def CustomConfigure(env):
! 	conf = env.Configure(log_file='#/.config.log')
! 	addConfigTests(conf)
! 	return conf
  
  def ExpandList(list, arg):
--- 113,132 ----
  
  def compareVersions(a, b):
!     a = map(int, a.split('.'))
!     b = map(int, b.split('.'))
!     for i in range(min(len(a), len(b))):
!         if a[i] < b[i]: return -1
!         if a[i] > b[i]: return 1
!     if len(a) < len(b): return -1
!     if len(a) > len(b): return 1
!     return 0
  
! def addConfigTests(conf):   
!     conf.AddTests(configure_tests)
  
  def CustomConfigure(env):
!     conf = env.Configure(log_file='#/.config.log')
!     addConfigTests(conf)
!     return conf
  
  def ExpandList(list, arg):
***************
*** 142,185 ****
  
  def addDoxygen(env):
! 	def dox(target, source, env):
! 		cwd = os.getcwd()
! 		os.chdir(os.path.dirname(str(source[0])))
! 		sources = map(os.path.basename, map(str, source))
! 		result = os.system("doxygen %s" % " ".join(sources))
! 		os.chdir(cwd)
! 		return result
! 	#action = 'cd $SOURCE.dir && doxygen $SOURCES.file'
! 	action = dox
! 	env.Append(BUILDERS = {'Doxygen': Builder(action=action)})
  
  def addCopyFile(env):
! 	def copy(target, source, env):
! 		shutil.copy(str(source[0]), str(target[0]))
! 	def report(target, source, env):
! 		source = str(source[0])
! 		target = str(target[0])
! 		return 'copying %s -> %s' % (source, target)
! 	CopyFile = Builder(action=Action(copy, report))
! 	env.Append(BUILDERS = {'CopyFile': CopyFile})
  
  def addLinkFile(env):
! 	def copy(target, source, env):
! 		source = str(source[0])
! 		target = str(target[0])
! 		if os.name=='posix':
! 			os.link(source, target)
! 		else:
! 			shutil.copy(source, target)
! 	def report(target, source, env):
! 		source = str(source[0])
! 		target = str(target[0])
! 		return 'copying %s -> %s' % (source, target)
! 	CopyFile = Builder(action=Action(copy, report))
! 	env.Append(BUILDERS = {'LinkFile': CopyFile})
  
  def addBuilders(env):
! 	addDoxygen(env)
! 	addCopyFile(env)
! 	addLinkFile(env)
  
  ############################################################################
--- 141,184 ----
  
  def addDoxygen(env):
!     def dox(target, source, env):
!         cwd = os.getcwd()
!         os.chdir(os.path.dirname(str(source[0])))
!         sources = map(os.path.basename, map(str, source))
!         result = os.system("doxygen %s" % " ".join(sources))
!         os.chdir(cwd)
!         return result
!     #action = 'cd $SOURCE.dir && doxygen $SOURCES.file'
!     action = dox
!     env.Append(BUILDERS = {'Doxygen': Builder(action=action)})
  
  def addCopyFile(env):
!     def copy(target, source, env):
!         shutil.copy(str(source[0]), str(target[0]))
!     def report(target, source, env):
!         source = str(source[0])
!         target = str(target[0])
!         return 'copying %s -> %s' % (source, target)
!     CopyFile = Builder(action=Action(copy, report))
!     env.Append(BUILDERS = {'CopyFile': CopyFile})
  
  def addLinkFile(env):
!     def copy(target, source, env):
!         source = str(source[0])
!         target = str(target[0])
!         if os.name=='posix':
!             os.link(source, target)
!         else:
!             shutil.copy(source, target)
!     def report(target, source, env):
!         source = str(source[0])
!         target = str(target[0])
!         return 'copying %s -> %s' % (source, target)
!     CopyFile = Builder(action=Action(copy, report))
!     env.Append(BUILDERS = {'LinkFile': CopyFile})
  
  def addBuilders(env):
!     addDoxygen(env)
!     addCopyFile(env)
!     addLinkFile(env)
  
  ############################################################################
***************
*** 209,217 ****
  	else:
  		context.Result("no")
! 	return ok 
  
  configure_tests['checkSwig'] = checkSwig
  
! 	
  def emitSwig(target, source, env):
  	target = []
--- 208,216 ----
  	else:
  		context.Result("no")
! 	return ok
  
  configure_tests['checkSwig'] = checkSwig
  
!     
  def emitSwig(target, source, env):
  	target = []
***************
*** 229,252 ****
  
  def addSwigBuild(env):
! 	builder = Builder(action = '$SWIG $SWIGFLAGS -o ${TARGETS[0]} $SOURCE',
! 	                  emitter = emitSwig)
! 	env.Append(BUILDERS = {'Swig': builder})
  
  def addSwigDep(env):
! 	def SwigScanner(node, env, path, arg=None):
! 		cmd = env.subst('$SWIG -MM $_CPPINCFLAGS %s' % str(node))
! 		stdin, stdout, stderr = os.popen3(cmd, 't')
! 		deps = ''.join(map(lambda x: x.strip(), stdout.readlines()))
! 		deps = map(lambda x: "#/"+x.strip(), deps.split('\\'))[1:]
! 		return deps
! 	scanner = Scanner(name = 'SwigScanner', function = SwigScanner, skeys = ['.i'], recursive = 0)
! 	env.Append(SCANNERS = scanner)
  
  def addSwigSupport(env):
! 	global SWIG
! 	SWIG = SCons.Util.WhereIs('swig')
! 	env['SWIG'] = SWIG
! 	addSwigDep(env)
! 	addSwigBuild(env)
  
  
--- 228,251 ----
  
  def addSwigBuild(env):
!     builder = Builder(action = '$SWIG $SWIGFLAGS -o ${TARGETS[0]} $SOURCE',
!                       emitter = emitSwig)
!     env.Append(BUILDERS = {'Swig': builder})
  
  def addSwigDep(env):
!     def SwigScanner(node, env, path, arg=None):
!         cmd = env.subst('$SWIG -MM $_CPPINCFLAGS %s' % str(node))
!         stdin, stdout, stderr = os.popen3(cmd, 't')
!         deps = ''.join(map(lambda x: x.strip(), stdout.readlines()))
!         deps = map(lambda x: "#/"+x.strip(), deps.split('\\'))[1:]
!         return deps
!     scanner = Scanner(name = 'SwigScanner', function = SwigScanner, skeys = ['.i'], recursive = 0)
!     env.Append(SCANNERS = scanner)
  
  def addSwigSupport(env):
!     global SWIG
!     SWIG = SCons.Util.WhereIs('swig')
!     env['SWIG'] = SWIG
!     addSwigDep(env)
!     addSwigBuild(env)
  
  
***************
*** 256,286 ****
  
  class OptionSet:
! 	class Empty: 
! 		pass
! 	def __init__(self):
! 		self.set = OptionSet.Empty()
! 		self.add = OptionSet.Empty()
! 	def __getattr__(self, x):
! 		d = self.__dict__
! 		if x in d.keys(): return d[x]
! 		return getattr(d['set'], x)
! 	def methods(self):
! 		return self.set, self.add
! 	def apply(self, env):
! 		for key, value in self.set.__dict__.iteritems():
! 				env[key] = value
! 		for key, value in self.add.__dict__.iteritems():
! 				env.Append(**{key: value})
  
  class Globals:
! 	class Empty:
! 		pass
! 	def __init__(self):
! 		self.add = Globals.Empty()
! 	def set(self):
! 		for key, value in self.set.__dict__.iteritems():
! 			eval("%s=%s" % (key, value), globals(), globals())
  
! 	
  
  class Package:
--- 255,285 ----
  
  class OptionSet:
!     class Empty: 
!         pass
!     def __init__(self):
!         self.set = OptionSet.Empty()
!         self.add = OptionSet.Empty()
!     def __getattr__(self, x):
!         d = self.__dict__
!         if x in d.keys(): return d[x]
!         return getattr(d['set'], x)
!     def methods(self):
!         return self.set, self.add
!     def apply(self, env):
!         for key, value in self.set.__dict__.iteritems():
!                 env[key] = value
!         for key, value in self.add.__dict__.iteritems():
!                 env.Append(**{key: value})
  
  class Globals:
!     class Empty:
!         pass
!     def __init__(self):
!         self.add = Globals.Empty()
!     def set(self):
!         for key, value in self.set.__dict__.iteritems():
!             eval("%s=%s" % (key, value), globals(), globals())
  
!     
  
  class Package:
***************
*** 493,524 ****
  
  def Prefix(dir, names):
! 	if type(names) == type(''):
! 		names = names.split()
! 	return map(lambda x: os.path.normpath(os.path.join(dir, x)), names)
  
  
  def SelectBuildDir(env, build_dir, platform=None): 
! 	if not platform: 
! 		platform = env['PLATFORM']
! 	target_dir = os.path.join(build_dir, platform)
! 	if not os.path.exists(target_dir):
! 		os.makedirs(target_dir, 0755)
! 	print "Building in '%s'" % target_dir 
! 	return target_dir 
  
  
  def ConfigPlatform(env):
! 	import build_config
! 	platform = env['PLATFORM']
! 	try:
! 		config = eval('build_config.Config_%s' % platform)
! 	except:
! 		print "No configuration for platform '%s', aborting" % platform
! 		sys.exit(0)
! 	config(env)
  
  def ConfigPython(env):
! 	env['PYTHON_INC'] = getPythonInc()
! 	env['PYTHON_LIB'] = getPythonLib()
  
  class Config:
--- 492,523 ----
  
  def Prefix(dir, names):
!     if type(names) == type(''):
!         names = names.split()
!     return map(lambda x: os.path.normpath(os.path.join(dir, x)), names)
  
  
  def SelectBuildDir(env, build_dir, platform=None): 
!     if not platform: 
!         platform = env['PLATFORM']
!     target_dir = os.path.join(build_dir, platform)
!     if not os.path.exists(target_dir):
!         os.makedirs(target_dir, 0755)
!     print "Building in '%s'" % target_dir 
!     return target_dir 
  
  
  def ConfigPlatform(env):
!     import build_config
!     platform = env['PLATFORM']
!     try:
!         config = eval('build_config.Config_%s' % platform)
!     except:
!         print "No configuration for platform '%s', aborting" % platform
!         sys.exit(0)
!     config(env)
  
  def ConfigPython(env):
!     env['PYTHON_INC'] = getPythonInc()
!     env['PYTHON_LIB'] = getPythonLib()
  
  class Config:
***************
*** 541,544 ****
  			self.SWIGFLAGS = self.SWIGFLAGS + ' -c'
  			self.SHLINKLIBS.append('swigpy')
- 
- 
--- 540,541 ----

[Csp-commits] APPLICATIONS/SimData SConstruct,1.6,1.7

[<de...@us...>]

Update of /cvsroot/csp/APPLICATIONS/SimData
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25864

Modified Files:
	SConstruct 
Log Message:
see CHANGES.current

Index: SConstruct
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/SConstruct,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** SConstruct	14 Mar 2004 04:19:23 -0000	1.6
--- SConstruct	30 Mar 2004 10:10:24 -0000	1.7
***************
*** 50,56 ****
  
  if ARGUMENTS.get('PLATFORM', 0):
! 	env = Environment(PLATFORM = ARGUMENTS['PLATFORM'])
  else:
! 	env = Environment()
  
  ConfigPython(env)
--- 50,56 ----
  
  if ARGUMENTS.get('PLATFORM', 0):
!     env = Environment(PLATFORM = ARGUMENTS['PLATFORM'])
  else:
!     env = Environment()
  
  ConfigPython(env)
***************
*** 59,62 ****
--- 59,67 ----
  env['PACKAGE'] = package
  
+ # XXX
+ # this should only be done on windows/vc++; maybe there is a better place to do it
+ print "\nSee Scons' FAQ: env['ENV']['TMP'] = os.environ['TMP']\n"
+ env['ENV']['TMP'] = os.environ['TMP']
+ 
  info = package.info
  info.package = 'SimData'
***************
*** 89,99 ****
  conf = CustomConfigure(env)
  if not conf.checkSwig('1.3.16', ('1.3.18','1.3.19')):
! 	print
! 	print "   SimData requires SWIG 1.3.16, 1.3.17, 1.3.20, or newer.  If a"
! 	print "   compatible version of SWIG is already installed, check that is"
! 	print "   it in the default path.  SWIG can be downloaded from"
! 	print "   http://www.swig.org"
!  	print
!  	Exit(1)
  env = conf.Finish()
  addSwigSupport(env)
--- 94,104 ----
  conf = CustomConfigure(env)
  if not conf.checkSwig('1.3.16', ('1.3.18','1.3.19')):
!     print
!     print "   SimData requires SWIG 1.3.16, 1.3.17, 1.3.20, or newer.  If a"
!     print "   compatible version of SWIG is already installed, check that is"
!     print "   it in the default path.  SWIG can be downloaded from"
!     print "   http://www.swig.org"
!     print
!     Exit(1)
  env = conf.Finish()
  addSwigSupport(env)
***************
*** 110,119 ****
  
  for subdir in SUBDIRS:
! 	SConscript(subdir+'/SConscript')
! 
! package.addManifest("MANIFEST.IN")
! package.sdist()
! package.bdist()
! package.debian()
  
  
--- 115,130 ----
  
  for subdir in SUBDIRS:
!     SConscript(subdir+'/SConscript')
!     
! # XXX vs project generation
! #env.MSVSProject(target='SimData'+env['MSVSPROJECTSUFFIX'],srcs=['sources'],incs=['headers'],buildtarget='_cSimData.dll',variant='Release')
! #localincs = barlocalincs,
! #resources = barresources,
! #misc = barmisc,
  
  
+ package.addManifest("MANIFEST.IN")
+ # XXX
+ #package.sdist()
+ #package.bdist()
+ #package.debian()

[Csp-commits] APPLICATIONS/SimData CHANGES.current,1.99,1.100

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/SimData
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6110

Modified Files:
	CHANGES.current 
Log Message:


Index: CHANGES.current
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/CHANGES.current,v
retrieving revision 1.99
retrieving revision 1.100
diff -C2 -d -r1.99 -r1.100
*** CHANGES.current	14 Mar 2004 04:19:23 -0000	1.99
--- CHANGES.current	19 Mar 2004 09:05:50 -0000	1.100
***************
*** 1,9 ****
  Version 0.4.0 (in progress)
  ===========================
  2004-03-13: onsight
    * Some enhancements to the scons script (e.g. building
      debian packages, fix a popen3 issue under windowns).
    * Minor swig interface cleanup of std_vector.i includes.
! 	* Added source code file and line numbers to log output.
  
  2004-02-03: delta
--- 1,15 ----
  Version 0.4.0 (in progress)
  ===========================
+ 2004-03-18: onsight
+   * After some effort debugging the scons scripts under windows
+     with delta, I've checked in some of the necessary changes.
+     This should be a step in the right direction, but isn't the
+     full answer.
+ 
  2004-03-13: onsight
    * Some enhancements to the scons script (e.g. building
      debian packages, fix a popen3 issue under windowns).
    * Minor swig interface cleanup of std_vector.i includes.
!   * Added source code file and line numbers to log output.
  
  2004-02-03: delta

[Csp-commits] APPLICATIONS/SimData build_config.py,1.4,1.5 build_support.py,1.4,1.5

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/SimData
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4320

Modified Files:
	build_config.py build_support.py 
Log Message:


Index: build_config.py
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/build_config.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** build_config.py	19 Mar 2004 07:57:43 -0000	1.4
--- build_config.py	19 Mar 2004 08:57:14 -0000	1.5
***************
*** 11,24 ****
  		self.CXXFILESUFFIX = '.cpp'
  		self.ARCHIVE_FORMATS = None
- 		self.configSwig(env)
- 	def configSwig(self, env):
- 		version = env['SWIG_VERSION']
- 		self.SWIGFLAGS = ' -c++ -python -noexcept -IInclude -I%s' % self.PYTHON_INC
- 		if compareVersions(version, '1.3.20') >= 0:
- 			self.SWIGFLAGS = self.SWIGFLAGS + ' -runtime'
- 		else:
- 			self.SWIGFLAGS = self.SWIGFLAGS + ' -c'
- 			self.SHLINKLIBS.append('swigpy')
- 
  
  class Config_msvc(Config):
--- 11,14 ----
***************
*** 34,69 ****
  		self.CXXFILESUFFIX = '.cpp'
  		self.ARCHIVE_FORMATS = ['.zip']
- 		self.configSwig(env)
- 	def configSwig(self, env):
- 		version = env['SWIG_VERSION']
- 		self.SWIGFLAGS = ' -c++ -python -noexcept -IInclude -I%s' % self.PYTHON_INC
- 		if compareVersions(version, '1.3.20') >= 0:
- 			self.SWIGFLAGS = self.SWIGFLAGS + ' -runtime'
- 		else:
- 			self.SWIGFLAGS = self.SWIGFLAGS + ' -c'
- 			self.SHLINKLIBS.append('swigpy')
- 		
  
  class Config_win32(Config):
  	def config(self, env):
! 		#wine = '' #wine --debugmsg -all -- '
! 		#self.CXX = wine + 'cl'
! 		#self.LINK = wine + 'link'
! 		#self.CXXFLAGS = '/nologo /DWIN32=1 /D_WIN32=1 /D_STLPORT=1 /DSIMDATA_EXPORTS=1 /GR /GX /W3'
! 		#self.CPPFLAGS = ''
! 		#self.CPPPATH = ['#/Include', self.PYTHON_INC]
! 		#self.SHLINKFLAGS = ' /MACHINE:I386 /LIBPATH:%s /NODEFAULTLIB:LIBC' % self.PYTHON_LIB
! 		#self.SHLINKLIBS = []
! 		#self.CXXFILESUFFIX = '.cpp'
! 		#self.ARCHIVE_FORMATS = ['.zip']
! 		self.configSwig(env)
! 	def configSwig(self, env):
! 		version = env['SWIG_VERSION']
! 		self.SWIGFLAGS = ' -c++ -python -noexcept -IInclude -I%s' % self.PYTHON_INC
! 		if compareVersions(version, '1.3.20') >= 0:
! 			self.SWIGFLAGS = self.SWIGFLAGS + ' -runtime'
! 		else:
! 			self.SWIGFLAGS = self.SWIGFLAGS + ' -c'
! 			self.SHLINKLIBS.append('swigpy')
! 		
  
--- 24,36 ----
  		self.CXXFILESUFFIX = '.cpp'
  		self.ARCHIVE_FORMATS = ['.zip']
  
  class Config_win32(Config):
  	def config(self, env):
! 		self.CXXFLAGS = '/nologo /DWIN32=1 /D_WIN32=1 /D_STLPORT=1 /DSIMDATA_EXPORTS=1 /GR /GX /W3'
! 		self.CPPFLAGS = ''
! 		self.CPPPATH = ['#/Include', self.PYTHON_INC]
! 		self.SHLINKFLAGS = ' /MACHINE:I386 /LIBPATH:%s /NODEFAULTLIB:LIBC' % self.PYTHON_LIB
! 		self.SHLINKLIBS = []
! 		self.CXXFILESUFFIX = '.cpp'
! 		self.ARCHIVE_FORMATS = ['.zip']
  

Index: build_support.py
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/build_support.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** build_support.py	19 Mar 2004 07:56:02 -0000	1.4
--- build_support.py	19 Mar 2004 08:57:14 -0000	1.5
***************
*** 35,39 ****
  Scanner = SCons.Scanner.Base
  
! import os, os.path, re, shutil, glob, sys
  
  # configure tests (defined below)
--- 35,39 ----
  Scanner = SCons.Scanner.Base
  
! import os, os.path, re, shutil, glob, sys, types
  
  # configure tests (defined below)
***************
*** 131,134 ****
--- 131,139 ----
  	return conf
  
+ def ExpandList(list, arg):
+ 	if type(arg) == types.ListType:
+ 		list.extend(arg)
+ 	else:
+ 		list.append(arg)
  
  ############################################################################
***************
*** 214,218 ****
  	ext = env['CXXFILESUFFIX']
  	for s in source:
! 		wrapper = os.path.splitext(str(s))[0]+'_wrap.'+ext
  		target.append(wrapper)
  		# XXX 
--- 219,223 ----
  	ext = env['CXXFILESUFFIX']
  	for s in source:
! 		wrapper = os.path.splitext(str(s))[0]+'_wrap'+ext
  		target.append(wrapper)
  		# XXX 
***************
*** 521,524 ****
--- 526,530 ----
  		self.__dict__['env'] = env.Dictionary()
  		self.config(env)
+ 		self.configSwig(env)
  	def __setattr__(self, attr, value):
  		dict = self.__dict__['env']
***************
*** 527,530 ****
--- 533,544 ----
  		dict = self.__dict__['env']
  		return dict.get(attr,None)
+ 	def configSwig(self, env):
+ 		version = env['SWIG_VERSION']
+ 		self.SWIGFLAGS = ' -c++ -python -noexcept -IInclude -I%s' % self.PYTHON_INC
+ 		if compareVersions(version, '1.3.20') >= 0:
+ 			self.SWIGFLAGS = self.SWIGFLAGS + ' -runtime'
+ 		else:
+ 			self.SWIGFLAGS = self.SWIGFLAGS + ' -c'
+ 			self.SHLINKLIBS.append('swigpy')
  
  

[Csp-commits] APPLICATIONS/SimData/Source SConscript,1.6,1.7

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/SimData/Source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4320/Source

Modified Files:
	SConscript 
Log Message:


Index: SConscript
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/SConscript,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** SConscript	14 Mar 2004 04:19:23 -0000	1.6
--- SConscript	19 Mar 2004 08:57:14 -0000	1.7
***************
*** 3,19 ****
  # SimData: Data Infrastructure for Simulations
  # Copyright (C) 2002, 2003 Mark Rose <tm...@st...>
! # 
  # 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
--- 3,19 ----
  # SimData: Data Infrastructure for Simulations
  # Copyright (C) 2002, 2003 Mark Rose <tm...@st...>
! #
  # 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
***************
*** 142,146 ****
  	""".split()
  
! package_files = Prefix("#/SimData", 
  	"""
  	__init__.py
--- 142,146 ----
  	""".split()
  
! package_files = Prefix("#/SimData",
  	"""
  	__init__.py
***************
*** 186,197 ****
  
  # main libraries
! shared_library = env.SharedLibrary('#/SimData/_cSimData', 
                                     sources + [extension_wrapper],
! 				   SHLIBPREFIX = '', 
! 				   LIBS=env.get('LIBS',[])+env.get('SHLINKLIBS',[]))
  
! static_library = env.StaticLibrary('#/SimData/libSimData', sources)
  
- libraries = [shared_library, static_library]
  package_targets = libraries + [package_module]
  
--- 186,202 ----
  
  # main libraries
! libraries = []
! 
! shared_library = env.SharedLibrary('#/SimData/_cSimData',
                                     sources + [extension_wrapper],
!                                    SHLIBPREFIX = '',
!                                    LIBS=env.get('LIBS',[])+env.get('SHLINKLIBS',[]))
  
! ExpandList(libraries, shared_library)
! 
! if env['PLATFORM'] != 'win32':
!   static_library = env.StaticLibrary('#/SimData/libSimData', sources)
!   ExpandList(libraries, static_library)
  
  package_targets = libraries + [package_module]
  

[Csp-commits] APPLICATIONS/SimData build_config.py,1.3,1.4

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/SimData
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24457

Modified Files:
	build_config.py 
Log Message:


Index: build_config.py
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/build_config.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** build_config.py	14 Mar 2004 04:19:23 -0000	1.3
--- build_config.py	19 Mar 2004 07:57:43 -0000	1.4
***************
*** 45,46 ****
--- 45,69 ----
  		
  
+ class Config_win32(Config):
+ 	def config(self, env):
+ 		#wine = '' #wine --debugmsg -all -- '
+ 		#self.CXX = wine + 'cl'
+ 		#self.LINK = wine + 'link'
+ 		#self.CXXFLAGS = '/nologo /DWIN32=1 /D_WIN32=1 /D_STLPORT=1 /DSIMDATA_EXPORTS=1 /GR /GX /W3'
+ 		#self.CPPFLAGS = ''
+ 		#self.CPPPATH = ['#/Include', self.PYTHON_INC]
+ 		#self.SHLINKFLAGS = ' /MACHINE:I386 /LIBPATH:%s /NODEFAULTLIB:LIBC' % self.PYTHON_LIB
+ 		#self.SHLINKLIBS = []
+ 		#self.CXXFILESUFFIX = '.cpp'
+ 		#self.ARCHIVE_FORMATS = ['.zip']
+ 		self.configSwig(env)
+ 	def configSwig(self, env):
+ 		version = env['SWIG_VERSION']
+ 		self.SWIGFLAGS = ' -c++ -python -noexcept -IInclude -I%s' % self.PYTHON_INC
+ 		if compareVersions(version, '1.3.20') >= 0:
+ 			self.SWIGFLAGS = self.SWIGFLAGS + ' -runtime'
+ 		else:
+ 			self.SWIGFLAGS = self.SWIGFLAGS + ' -c'
+ 			self.SHLINKLIBS.append('swigpy')
+ 		
+ 

[Csp-commits] APPLICATIONS/SimData build_support.py,1.3,1.4

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/SimData
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24181

Modified Files:
	build_support.py 
Log Message:


Index: build_support.py
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/build_support.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** build_support.py	14 Mar 2004 04:19:23 -0000	1.3
--- build_support.py	19 Mar 2004 07:56:02 -0000	1.4
***************
*** 94,99 ****
  	"""Install specified files in the given directory."""
  	import SCons.Node
! 	sources = SCons.Node.arg2nodes(source, env.fs.File)
! 	dnodes = SCons.Node.arg2nodes(dir, env.fs.Dir)
  	tgt = []
  	for dnode in dnodes:
--- 94,101 ----
  	"""Install specified files in the given directory."""
  	import SCons.Node
! 	sources = env.arg2nodes(source, env.fs.File)
! 	dnodes = env.arg2nodes(dir, env.fs.Dir)
! 	#sources = SCons.Node.arg2nodes(source, env.fs.File)
! 	#dnodes = SCons.Node.arg2nodes(dir, env.fs.Dir)
  	tgt = []
  	for dnode in dnodes:
***************
*** 185,190 ****
  	ok = 0
  	context.Message("Checking for swig...")
! 	#swig_in, swig_out, swig_err = os.popen3('%s -version' % SWIG, 't', 1024)
! 	swig_err = os.popen('%s -version 2>&1' % SWIG, 'rt', 1024)
  	if swig_err is not None:
  		output = swig_err.readlines()
--- 187,191 ----
  	ok = 0
  	context.Message("Checking for swig...")
! 	swig_in, swig_out, swig_err = os.popen3('%s -version' % SWIG, 't')
  	if swig_err is not None:
  		output = swig_err.readlines()
***************
*** 367,371 ****
  
  	def add(self, content, type='both'):
! 		content = SCons.Node.arg2nodes(content, self.env.fs.File)
  		if type == 'source' or type == 'both':
  			self.source_content.extend(content)
--- 368,373 ----
  
  	def add(self, content, type='both'):
! 		content = self.env.arg2nodes(content, self.env.fs.File)
! 		#content = SCons.Node.arg2nodes(content, self.env.fs.File)
  		if type == 'source' or type == 'both':
  			self.source_content.extend(content)
***************
*** 377,381 ****
  
  	def remove(self, content, type='both'):
! 		content = SCons.Node.arg2nodes(content, self.env.fs.File)
  		if type == 'source' or type == 'both':
  			self.source_content = self._filter_content(self.source_content, content)
--- 379,384 ----
  
  	def remove(self, content, type='both'):
! 		content = self.env.arg2nodes(content, self.env.fs.File)
! 		#content = SCons.Node.arg2nodes(content, self.env.fs.File)
  		if type == 'source' or type == 'both':
  			self.source_content = self._filter_content(self.source_content, content)
***************
*** 438,443 ****
  		src = map(str, content)
  		dst = map(lambda x: os.path.join(dist, x), src)
! 		src = SCons.Node.arg2nodes(src, env.fs.File)
! 		dst = SCons.Node.arg2nodes(dst, env.fs.File)
  		ret = []
  		for source, target in map(lambda x, y: (x,y), src, dst):
--- 441,448 ----
  		src = map(str, content)
  		dst = map(lambda x: os.path.join(dist, x), src)
! 		src = self.env.arg2nodes(src, env.fs.File)
! 		dst = self.env.arg2nodes(dst, env.fs.File)
! 		#src = SCons.Node.arg2nodes(src, env.fs.File)
! 		#dst = SCons.Node.arg2nodes(dst, env.fs.File)
  		ret = []
  		for source, target in map(lambda x, y: (x,y), src, dst):

[Csp-commits] APPLICATIONS/SimData CHANGES.current,1.98,1.99 README,1.8,1.9 SConstruct,1.5,1.6 build_config.py,1.2,1.3 build_support.py,1.2,1.3

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/SimData
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6313

Modified Files:
	CHANGES.current README SConstruct build_config.py 
	build_support.py 
Log Message:


Index: CHANGES.current
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/CHANGES.current,v
retrieving revision 1.98
retrieving revision 1.99
diff -C2 -d -r1.98 -r1.99
*** CHANGES.current	3 Feb 2004 19:49:56 -0000	1.98
--- CHANGES.current	14 Mar 2004 04:19:23 -0000	1.99
***************
*** 1,4 ****
--- 1,10 ----
  Version 0.4.0 (in progress)
  ===========================
+ 2004-03-13: onsight
+   * Some enhancements to the scons script (e.g. building
+     debian packages, fix a popen3 issue under windowns).
+   * Minor swig interface cleanup of std_vector.i includes.
+ 	* Added source code file and line numbers to log output.
+ 
  2004-02-03: delta
    * Added a quick hack in Exception.h to fix a weird 
***************
*** 17,32 ****
    as before.
    
  2003-01-31: onsight
    * Added debian packaging files (experimental).
  
    * Added 'docs --clean' target to scons.
- 
    * Fixed the source directory for building scons sdist.
    
    * Cleaned up swig std includes in the various interface
      files.  Now all loaded up front in cSimData.i.
  
-   * Added 'test' target to scons to run the unittests.
- 
  2003-01-30: onsight
    * Starting with version 1.3.20 of SWIG, the python runtime
--- 23,49 ----
    as before.
    
+ 2003-02-01: onsight
+   * Renamed CHANGELOG* to ChangeLog* to be slightly more GNUish,
+     plus vim picks up the syntax highlighting automatically now.
+ 
+   * Readded a Swig builder to scons to properly track dependencies
+     between the module, the wrapper, and the interface.
+   * Fixed the return value of the dist wrapper; dists will now be
+     reassembled only if necessary.
+   * Added a very basic debs target, which extracts the sdist archive
+     and builds the deb.  No dependency tracking yet, so it does all
+     the work everytime.
+ 
  2003-01-31: onsight
    * Added debian packaging files (experimental).
  
    * Added 'docs --clean' target to scons.
    * Fixed the source directory for building scons sdist.
+   * Added 'test' target to scons to run the unittests.
+   * Reenabled swig dependency tracking in scons.
    
    * Cleaned up swig std includes in the various interface
      files.  Now all loaded up front in cSimData.i.
  
  2003-01-30: onsight
    * Starting with version 1.3.20 of SWIG, the python runtime
***************
*** 105,109 ****
    * Expanded test_Objects.cpp test to check the interface
      registry and object introspection.
!     
  2003-10-23: onsight
    * Separated Singleton class into Singleton.h (was InterfaceRegistry.h).
--- 122,126 ----
    * Expanded test_Objects.cpp test to check the interface
      registry and object introspection.
! 
  2003-10-23: onsight
    * Separated Singleton class into Singleton.h (was InterfaceRegistry.h).

Index: README
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/README,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** README	21 Oct 2003 04:53:59 -0000	1.8
--- README	14 Mar 2004 04:19:23 -0000	1.9
***************
*** 3,7 ****
  Release 0.4.0
  
! Copyright (C) 2002, 2003 Mark Rose <mr...@st...>
  
  See COPYING for details.
--- 3,7 ----
  Release 0.4.0
  
! Copyright (C) 2002-2004 Mark Rose <mr...@st...>
  
  See COPYING for details.

Index: SConstruct
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/SConstruct,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** SConstruct	1 Feb 2004 12:06:43 -0000	1.5
--- SConstruct	14 Mar 2004 04:19:23 -0000	1.6
***************
*** 97,100 ****
--- 97,101 ----
   	Exit(1)
  env = conf.Finish()
+ addSwigSupport(env)
  
  ConfigPlatform(env)
***************
*** 103,107 ****
  Export('env')
  
! builddir = SelectBuildDir(env, "Build")
  BuildDir(builddir, 'Source')
  
--- 104,108 ----
  Export('env')
  
! builddir = SelectBuildDir(env, "build")
  BuildDir(builddir, 'Source')
  
***************
*** 114,117 ****
--- 115,119 ----
  package.sdist()
  package.bdist()
+ package.debian()
  
  

Index: build_config.py
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/build_config.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** build_config.py	1 Feb 2004 10:01:03 -0000	1.2
--- build_config.py	14 Mar 2004 04:19:23 -0000	1.3
***************
*** 16,23 ****
  		self.SWIGFLAGS = ' -c++ -python -noexcept -IInclude -I%s' % self.PYTHON_INC
  		if compareVersions(version, '1.3.20') >= 0:
! 		  self.SWIGFLAGS = self.SWIGFLAGS + ' -runtime'
  		else:
! 		  self.SWIGFLAGS = self.SWIGFLAGS + ' -c'
! 		  self.SHLINKLIBS.append('swigpy')
  
  
--- 16,23 ----
  		self.SWIGFLAGS = ' -c++ -python -noexcept -IInclude -I%s' % self.PYTHON_INC
  		if compareVersions(version, '1.3.20') >= 0:
! 			self.SWIGFLAGS = self.SWIGFLAGS + ' -runtime'
  		else:
! 			self.SWIGFLAGS = self.SWIGFLAGS + ' -c'
! 			self.SHLINKLIBS.append('swigpy')
  
  
***************
*** 31,38 ****
  		self.CPPPATH = ['#/Include', self.PYTHON_INC]
  		self.SHLINKFLAGS = ' /MACHINE:I386 /LIBPATH:%s /NODEFAULTLIB:LIBC' % self.PYTHON_LIB
! 		self.SHLINKLIBS = ['dl', 'swigpy']
! 		self.SWIGFLAGS = ' -c -c++ -python -noexcept -IInclude -I%s' % self.PYTHON_INC
  		self.CXXFILESUFFIX = '.cpp'
  		self.ARCHIVE_FORMATS = ['.zip']
  		
  
--- 31,46 ----
  		self.CPPPATH = ['#/Include', self.PYTHON_INC]
  		self.SHLINKFLAGS = ' /MACHINE:I386 /LIBPATH:%s /NODEFAULTLIB:LIBC' % self.PYTHON_LIB
! 		self.SHLINKLIBS = []
  		self.CXXFILESUFFIX = '.cpp'
  		self.ARCHIVE_FORMATS = ['.zip']
+ 		self.configSwig(env)
+ 	def configSwig(self, env):
+ 		version = env['SWIG_VERSION']
+ 		self.SWIGFLAGS = ' -c++ -python -noexcept -IInclude -I%s' % self.PYTHON_INC
+ 		if compareVersions(version, '1.3.20') >= 0:
+ 			self.SWIGFLAGS = self.SWIGFLAGS + ' -runtime'
+ 		else:
+ 			self.SWIGFLAGS = self.SWIGFLAGS + ' -c'
+ 			self.SHLINKLIBS.append('swigpy')
  		
  

Index: build_support.py
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/build_support.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** build_support.py	1 Feb 2004 10:01:03 -0000	1.2
--- build_support.py	14 Mar 2004 04:19:23 -0000	1.3
***************
*** 125,129 ****
  
  def CustomConfigure(env):
! 	conf = env.Configure()
  	addConfigTests(conf)
  	return conf
--- 125,129 ----
  
  def CustomConfigure(env):
! 	conf = env.Configure(log_file='#/.config.log')
  	addConfigTests(conf)
  	return conf
***************
*** 185,189 ****
  	ok = 0
  	context.Message("Checking for swig...")
! 	swig_in, swig_out, swig_err = os.popen3('%s -version' % SWIG, 't', 1024)
  	if swig_err is not None:
  		output = swig_err.readlines()
--- 185,190 ----
  	ok = 0
  	context.Message("Checking for swig...")
! 	#swig_in, swig_out, swig_err = os.popen3('%s -version' % SWIG, 't', 1024)
! 	swig_err = os.popen('%s -version 2>&1' % SWIG, 'rt', 1024)
  	if swig_err is not None:
  		output = swig_err.readlines()
***************
*** 206,222 ****
  configure_tests['checkSwig'] = checkSwig
  
! 
! def addSwigLib(env):
! 	# XXX this should work according to the scons dev docs, but builders
! 	# don't seem to have a Copy() method yet.
! 	#swiglib = env.SharedLibrary.Copy(SHLIBPREFIX = '', LIBS = env["SWLIBS"])
! 	#env.Append(BUILDERS = {'SwigLibrary': swiglib})
! 	pass
  
  def addSwigBuild(env):
! 	action = '$SWIG $SWFLAGS $_CPPINCFLAGS -o ${TARGETS[0]} $SOURCES'
! 	SwigBuild = Builder(action=action,
! 			    src_suffix=".i")
! 	env.Append(BUILDERS = {'SwigBuild': SwigBuild})
  
  def addSwigDep(env):
--- 207,229 ----
  configure_tests['checkSwig'] = checkSwig
  
! 	
! def emitSwig(target, source, env):
! 	target = []
! 	assert(len(source)==1)
! 	ext = env['CXXFILESUFFIX']
! 	for s in source:
! 		wrapper = os.path.splitext(str(s))[0]+'_wrap.'+ext
! 		target.append(wrapper)
! 		# XXX 
! 		# Module name really should be based on the %module
! 		# directive in the interface file.
! 		module = os.path.splitext(str(s))[0]+'.py'
! 		target.append(module)
! 	return (target, source)
  
  def addSwigBuild(env):
! 	builder = Builder(action = '$SWIG $SWIGFLAGS -o ${TARGETS[0]} $SOURCE',
! 	                  emitter = emitSwig)
! 	env.Append(BUILDERS = {'Swig': builder})
  
  def addSwigDep(env):
***************
*** 227,231 ****
  		deps = map(lambda x: "#/"+x.strip(), deps.split('\\'))[1:]
  		return deps
! 	scanner = Scanner(function = SwigScanner, skeys = ['.i'], recursive = 0)
  	env.Append(SCANNERS = scanner)
  
--- 234,238 ----
  		deps = map(lambda x: "#/"+x.strip(), deps.split('\\'))[1:]
  		return deps
! 	scanner = Scanner(name = 'SwigScanner', function = SwigScanner, skeys = ['.i'], recursive = 0)
  	env.Append(SCANNERS = scanner)
  
***************
*** 235,274 ****
  	env['SWIG'] = SWIG
  	addSwigDep(env)
- 	addSwigLib(env)
  	addSwigBuild(env)
  
- # def addSDist(env):
- # 	def copy(target, source, env):
- # 		info = env["PACKAGE_INFO"]
- # 		base = '%s-%s' % (info.package, info.version)
- # 		dist = os.path.join('dist', base)
- # 		makepaths = {}
- # 		for src in map(str, source):
- # 			dir = os.path.join(dist, os.path.dirname(src))
- # 			dst = os.path.join(dist, src)
- # 			if not makepaths.has_key(dir):
- # 				makepaths[dir] = 1
- # 				if not os.path.exists(dir):
- # 					os.makedirs(dir)
- 			#print "copy %s -> %s" % (src, dst)
- # 			shutil.copy2(src, dst)
- 		#print str(target[0])
- 		#os.system('tar -C %s -zcf %s.tgz %s' % ('dist', base, base))
- 		#---------
- 		#env["TARFLAGS"] = '-C dist -cz'
- 		#Action(env["TARCOM"])(base+'.tgz', dist, env)
- # 	def emitter(target, source, env):
- # 		info = env["PACKAGE_INFO"]
- # 		base = '%s-%s' % (info.package, info.version)
- # 		dist = os.path.join('#/dist', base)
- # 		return (dist+'.tgz', source)
- # 	def report(target, source, env):
- # 		info = env["PACKAGE_INFO"]
- # 		base = '%s-%s' % (info.package, info.version)
- # 		dist = os.path.join('dist', base)
- # 		return 'copying sources to %s...' % dist 
- # 	SDist = Builder(action=Action(copy, report), emitter=emitter)
- # 	env.Append(BUILDERS = {"SDist": SDist})
- 
  
  ############################################################
--- 242,247 ----
***************
*** 306,309 ****
--- 279,283 ----
  
  class Package:
+ 
  	def _addDistBuilder(self):
  		def DistAction(target, source, env):
***************
*** 341,345 ****
  				raise SCons.Errors.UserError(error)
  				return 0
! 			Action(command)(target, "", env)
  		def DistReport(target, source, env):
  			print "Creating package archive %s..." % str(target[0])
--- 315,319 ----
  				raise SCons.Errors.UserError(error)
  				return 0
! 			return Action(command)(target, "", env)
  		def DistReport(target, source, env):
  			print "Creating package archive %s..." % str(target[0])
***************
*** 362,365 ****
--- 336,340 ----
  		self.source_content = []
  		self.binary_content = []
+ 		self.dists = {}
  
  	def addManifest(self, filename, type='both'):
***************
*** 409,413 ****
  
  	def dump(self):
! 		print map(str, self.content)
  
  	def distpath(self, base=''):
--- 384,388 ----
  
  	def dump(self):
! 		pass #print map(str, self.content)
  
  	def distpath(self, base=''):
***************
*** 435,453 ****
  	def _getArchiveFormats(self):
  		env = self.env
! 		try:
! 			formats = env['ARCHIVE_FORMATS']
! 		except KeyError:
! 			formats = None
  		if formats is None:
  			try:
! 				formats = [self.default_format[os.name]]
  			except KeyError:
  				error = "Don't know how to create archive on platform '%s'" % os.name
  				raise SCons.Errors.UserError(error)
! 		else:
! 			formats = formats.split()
! 		return formats
  
! 	def _archiveExtension(self, format):
  		if format in ['gztar', 'tar.gz', 'gzip', 'gz', 'tgz']:
  			return '.tar.gz'
--- 410,423 ----
  	def _getArchiveFormats(self):
  		env = self.env
! 		formats = getattr(env, 'ARCHIVE_FORMATS', None)
  		if formats is None:
  			try:
! 				formats = self.default_format[os.name]
  			except KeyError:
  				error = "Don't know how to create archive on platform '%s'" % os.name
  				raise SCons.Errors.UserError(error)
! 		return formats.split()
  
! 	def _getArchiveExtension(self, format):
  		if format in ['gztar', 'tar.gz', 'gzip', 'gz', 'tgz']:
  			return '.tar.gz'
***************
*** 474,482 ****
  			ret.append(env.LinkFile(target, source))
  		for format in formats:
! 			ext = self._archiveExtension(format)
  			if ext is None:
  				error = "Don't know how to create distribution archive format '%s'" % format
  				raise SCons.Errors.UserError(error)
  			ret.append(env.DistArchive(dist+ext, dst))
    		env.Alias(alias, ret)
  
--- 444,453 ----
  			ret.append(env.LinkFile(target, source))
  		for format in formats:
! 			ext = self._getArchiveExtension(format)
  			if ext is None:
  				error = "Don't know how to create distribution archive format '%s'" % format
  				raise SCons.Errors.UserError(error)
  			ret.append(env.DistArchive(dist+ext, dst))
+ 		self.dists[alias] = ret
    		env.Alias(alias, ret)
  
***************
*** 492,495 ****
--- 463,485 ----
  		env.Alias('install', install_package + install_headers)
  
+ 	def debian(self):
+ 		env = self.env
+ 		info = self.info
+ 		base = self.base()
+ 		path = self.distpath('debian')
+ 		user = os.environ.get('USER', '')
+ 		cmd = ['rm -rf %s && mkdir -p %s' % (path, path),
+ 		       'cd %s && tar -vxzf ../%s-src.tar.gz && mv %s-src %s' % (path, base, base, base.lower()),
+ 	 	       'cd %s/%s && LOGNAME="%s" dpkg-buildpackage -rfakeroot -d "-i.sconsign|.pyc|debian|.cache"' % (path, base.lower(), user)]
+ 		env.Command('debs', self.dists['sdist'], cmd)
+ 
+ 	def setTargets(self, targets, default=1):
+ 		self.targets = targets
+ 		if default: self.env.Default(targets)
+ 
+ 	def unitTests(self, command):
+ 		self.env.Depends('unittests', self.targets)
+ 		self.env.Alias('test', self.env.Command('unittests', '', command))
+ 
  def Prefix(dir, names):
  	if type(names) == type(''):
***************
*** 533,534 ****
--- 523,525 ----
  		return dict.get(attr,None)
  
+ 

[Csp-commits] APPLICATIONS/SimData/Source SConscript,1.5,1.6 cSimData.i,1.7,1.8

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/SimData/Source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6313/Source

Modified Files:
	SConscript cSimData.i 
Log Message:


Index: SConscript
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/SConscript,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** SConscript	1 Feb 2004 12:06:44 -0000	1.5
--- SConscript	14 Mar 2004 04:19:23 -0000	1.6
***************
*** 76,84 ****
  	""")
  
- top_interfaces = Prefix("#/Source/",
- 	"""
- 	cSimData.i
- 	""")
- 
  sub_interfaces = Prefix("#/Include/SimData",
  	"""
--- 76,79 ----
***************
*** 161,165 ****
  	COPYING
  	TODO
- 	Makefile
  	SConstruct
  	build_support.py
--- 156,159 ----
***************
*** 174,186 ****
  	SConscript
  	footer.html
- 	Makefile
  	""")
  
! # swig wrappers
! wrapper = env.CopyFile('#/SimData/cSimData.py', 'cSimData.py')
  
  # main libraries
  shared_library = env.SharedLibrary('#/SimData/_cSimData', 
!                                    sources + top_interfaces, 
  				   SHLIBPREFIX = '', 
  				   LIBS=env.get('LIBS',[])+env.get('SHLINKLIBS',[]))
--- 168,191 ----
  	SConscript
  	footer.html
  	""")
  
! deb_files = Prefix("#/debian",
! 	"""
! 	control
! 	rules
! 	copyright
! 	changelog
! 	docs
! 	files
! 	""")
! 
! # extension module
! extension_interface = "#/Source/cSimData.i"
! extension_wrapper, extension_module = env.Swig([], extension_interface)
! package_module = env.CopyFile('#/SimData/cSimData.py', extension_module)
  
  # main libraries
  shared_library = env.SharedLibrary('#/SimData/_cSimData', 
!                                    sources + [extension_wrapper],
  				   SHLIBPREFIX = '', 
  				   LIBS=env.get('LIBS',[])+env.get('SHLINKLIBS',[]))
***************
*** 189,207 ****
  
  libraries = [shared_library, static_library]
! package_targets = libraries + [wrapper]
  
  # installation
  package = env['PACKAGE']
  package.installTarget(package_files + libraries, headers + sub_interfaces)
! package.add(Prefix('#/Source', sources) + top_interfaces, 'source')
! package.add(top_interfaces, 'source')
  package.add(libraries, 'binary')
  package.add(package_files + headers + sub_interfaces + extra_files + doc_files, 'both')
! 
! # default target(s)
! Default(package_targets)
! 
! # unittests
! env.Depends('unittests', package_targets)
! env.Alias('test', env.Command('unittests', '', './runtests.py'))
  
--- 194,208 ----
  
  libraries = [shared_library, static_library]
! package_targets = libraries + [package_module]
  
  # installation
  package = env['PACKAGE']
  package.installTarget(package_files + libraries, headers + sub_interfaces)
! package.add(Prefix('#/Source', sources), 'source')
! package.add(extension_interface, 'source')
! package.add(deb_files, 'source')
  package.add(libraries, 'binary')
  package.add(package_files + headers + sub_interfaces + extra_files + doc_files, 'both')
! package.setTargets(package_targets)
! package.unitTests('./runtests.py')
  

Index: cSimData.i
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/cSimData.i,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** cSimData.i	1 Nov 2003 16:08:40 -0000	1.7
--- cSimData.i	14 Mar 2004 04:19:23 -0000	1.8
***************
*** 3,5 ****
  %include "SimData/cSimData.i"
  
- 
--- 3,4 ----

[Csp-commits] APPLICATIONS/SimData/Include/SimData Interpolate.i,1.6,1.7 Log.h,1.7,1.8 Noise.i,1.2,1.3 cSimData.i,1.13,1.14

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/SimData/Include/SimData
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6313/Include/SimData

Modified Files:
	Interpolate.i Log.h Noise.i cSimData.i 
Log Message:


Index: Interpolate.i
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Interpolate.i,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Interpolate.i	14 Aug 2003 12:19:12 -0000	1.6
--- Interpolate.i	14 Mar 2004 04:19:23 -0000	1.7
***************
*** 24,28 ****
  %}
  
- %include "std_vector.i"
  #ifndef VFLOAT
  #define VFLOAT
--- 24,27 ----

Index: Log.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Log.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Log.h	19 Oct 2003 23:53:56 -0000	1.7
--- Log.h	14 Mar 2004 04:19:23 -0000	1.8
***************
*** 54,60 ****
   *  @return current logstream
   */
! inline SIMDATA_EXPORT logstream&
! log()
! {
  	//static logstream logstrm(std::cerr);
  	static logstream *logstrm = 0;
--- 54,58 ----
   *  @return current logstream
   */
! inline SIMDATA_EXPORT logstream& log() {
  	//static logstream logstrm(std::cerr);
  	static logstream *logstrm = 0;
***************
*** 72,76 ****
  # define SIMDATA_LOG(C,P,M)
  #else
! # define SIMDATA_LOG(C,P,M) simdata::log() << simdata::loglevel(C,P) << M << std::endl
  #endif
  
--- 70,76 ----
  # define SIMDATA_LOG(C,P,M)
  #else
! # define SIMDATA_LOG(C,P,M) simdata::log() << simdata::loglevel(C,P) \
!                                            << "(" << __FILE__ << ":" << __LINE__ << ") " \
!                                            << M << std::endl
  #endif
  

Index: Noise.i
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Noise.i,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Noise.i	23 Jul 2003 05:07:50 -0000	1.2
--- Noise.i	14 Mar 2004 04:19:23 -0000	1.3
***************
*** 24,29 ****
  %}
  
- %include "std_vector.i"
- 
  // HACK!
  #ifndef VFLOAT
--- 24,27 ----

Index: cSimData.i
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/cSimData.i,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** cSimData.i	1 Feb 2004 12:06:44 -0000	1.13
--- cSimData.i	14 Mar 2004 04:19:23 -0000	1.14
***************
*** 32,35 ****
--- 32,36 ----
  %}
  
+ // standard includes
  %include "std_string.i"
  %include "std_vector.i"
***************
*** 43,46 ****
--- 44,48 ----
  %include "SimData/Log.i"
  
+ // not currently used (will be directors).
  %feature("polymorphic") SIMDATA(InterfaceProxy);
  %feature("polymorphic") SIMDATA(Object);

[Csp-commits] APPLICATIONS/CSPSim/VisualStudio/CSPSimDLL CSPSimDLL.vcproj,1.17,1.18

[<de...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPSim/VisualStudio/CSPSimDLL
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3166

Modified Files:
	CSPSimDLL.vcproj 
Log Message:
no message

Index: CSPSimDLL.vcproj
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/VisualStudio/CSPSimDLL/CSPSimDLL.vcproj,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** CSPSimDLL.vcproj	1 Jan 2004 22:32:48 -0000	1.17
--- CSPSimDLL.vcproj	7 Feb 2004 17:56:51 -0000	1.18
***************
*** 24,28 ****
  				Optimization="0"
  				ImproveFloatingPointConsistency="FALSE"
! 				AdditionalIncludeDirectories="C:/Python23/include;../../Include;../../../../THIRDPARTYLIBS/demeter;../../../../THIRDPARTYLIBS/CSPChunkLod/include"
  				PreprocessorDefinitions="WIN32;_USRDLL;CSPSIMDLL_EXPORTS"
  				StringPooling="FALSE"
--- 24,28 ----
  				Optimization="0"
  				ImproveFloatingPointConsistency="FALSE"
! 				AdditionalIncludeDirectories="$(PYTHONPATH)/include;../../Include;../../../../THIRDPARTYLIBS/demeter;../../../../THIRDPARTYLIBS/CSPChunkLod/include"
  				PreprocessorDefinitions="WIN32;_USRDLL;CSPSIMDLL_EXPORTS"
  				StringPooling="FALSE"
***************
*** 45,53 ****
  				Name="VCLinkerTool"
  				AdditionalOptions="/MACHINE:I386"
! 				AdditionalDependencies="osgChunkLodd.lib osgFXd.lib sigc-1.2d.lib producerd.lib opengl32.lib SDL.lib osgDBd.lib DemeterVisualC6d.lib osgTextd.lib osgUtild.lib osgParticled.lib osgd.lib _cSimData.lib"
  				OutputFile="../../Bin/_cCSP.dll"
  				LinkIncremental="2"
  				SuppressStartupBanner="TRUE"
! 				AdditionalLibraryDirectories="C:/Python23/Lib/site-packages/SimData,C:/Python23/libs, ../../../../THIRDPARTYLIBS/lib"
  				IgnoreDefaultLibraryNames=""
  				GenerateDebugInformation="TRUE"
--- 45,53 ----
  				Name="VCLinkerTool"
  				AdditionalOptions="/MACHINE:I386"
! 				AdditionalDependencies="OpenThreadsWin32d.lib osgChunkLodd.lib osgFXd.lib sigc-1.2d.lib producerd.lib opengl32.lib SDL.lib osgDBd.lib DemeterVisualC6d.lib osgTextd.lib osgUtild.lib osgParticled.lib osgd.lib _cSimData.lib"
  				OutputFile="../../Bin/_cCSP.dll"
  				LinkIncremental="2"
  				SuppressStartupBanner="TRUE"
! 				AdditionalLibraryDirectories="$(PYTHONPATH)/Lib/site-packages/SimData,$(PYTHONPATH)/libs, ../../../../THIRDPARTYLIBS/lib"
  				IgnoreDefaultLibraryNames=""
  				GenerateDebugInformation="TRUE"
***************
*** 64,68 ****
  			<Tool
  				Name="VCPostBuildEventTool"
! 				CommandLine="copy /Y cCSP.py ..\..\Bin"/>
  			<Tool
  				Name="VCPreBuildEventTool"/>
--- 64,68 ----
  			<Tool
  				Name="VCPostBuildEventTool"
! 				CommandLine="copy /Y ..\..\Source\cCSP.py ..\..\Bin"/>
  			<Tool
  				Name="VCPreBuildEventTool"/>
***************
*** 100,104 ****
  				FavorSizeOrSpeed="1"
  				OptimizeForProcessor="0"
! 				AdditionalIncludeDirectories="C:/Python23/include;../../Include;../../../../THIRDPARTYLIBS/demeter;../../../../THIRDPARTYLIBS/CSPChunkLod/include"
  				PreprocessorDefinitions="WIN32;NDEBUG;_USRDLL;CSPSIMDLL_EXPORTS"
  				StringPooling="TRUE"
--- 100,104 ----
  				FavorSizeOrSpeed="1"
  				OptimizeForProcessor="0"
! 				AdditionalIncludeDirectories="$(PYTHONPATH)/include;../../Include;../../../../THIRDPARTYLIBS/demeter;../../../../THIRDPARTYLIBS/CSPChunkLod/include"
  				PreprocessorDefinitions="WIN32;NDEBUG;_USRDLL;CSPSIMDLL_EXPORTS"
  				StringPooling="TRUE"
***************
*** 142,146 ****
  			<Tool
  				Name="VCPostBuildEventTool"
! 				CommandLine="copy /Y cCSP.py ..\..\Bin"/>
  			<Tool
  				Name="VCPreBuildEventTool"/>
--- 142,146 ----
  			<Tool
  				Name="VCPostBuildEventTool"
! 				CommandLine="copy /Y ..\..\Source\cCSP.py ..\..\Bin"/>
  			<Tool
  				Name="VCPreBuildEventTool"/>
***************
*** 658,662 ****
  				<Tool
  					Name="VCCustomBuildTool"
! 					CommandLine="C:\progra~1\SWIG-1.3.17\swig -c++ -python -noexcept -DWIN32 -I..\..\Include -IC:\Python23\include -o ..\..\Source\$(InputName)_wrap.cpp ..\..\Source\$(InputName).i
  "
  					Outputs="..\..\Source\$(InputName)_wrap.cpp"/>
--- 658,662 ----
  				<Tool
  					Name="VCCustomBuildTool"
! 					CommandLine="$(SWIG)\swig -runtime -c++ -python -noexcept -I..\..\Include -IC:\Python23\include -o ..\..\Source\$(InputName)_wrap.cpp ..\..\Source\$(InputName).i
  "
  					Outputs="..\..\Source\$(InputName)_wrap.cpp"/>
***************
*** 666,670 ****
  				<Tool
  					Name="VCCustomBuildTool"
! 					CommandLine="C:\progra~1\SWIG-1.3.17\swig -c++ -python -noexcept -DWIN32 -I..\..\Include -IC:\Python23\include -o ..\..\Source\$(InputName)_wrap.cpp ..\..\Source\$(InputName).i
  "
  					Outputs="..\..\Source\$(InputName)_wrap.cpp"/>
--- 666,670 ----
  				<Tool
  					Name="VCCustomBuildTool"
! 					CommandLine="$(SWIG)\swig -runtime -c++ -python -noexcept -I..\..\Include -IC:\Python23\include -o ..\..\Source\$(InputName)_wrap.cpp ..\..\Source\$(InputName).i
  "
  					Outputs="..\..\Source\$(InputName)_wrap.cpp"/>

[Csp-commits] APPLICATIONS/SimData CHANGES.current,1.97,1.98

[<de...@us...>]

Update of /cvsroot/csp/APPLICATIONS/SimData
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31122

Modified Files:
	CHANGES.current 
Log Message:
no message

Index: CHANGES.current
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/CHANGES.current,v
retrieving revision 1.97
retrieving revision 1.98
diff -C2 -d -r1.97 -r1.98
*** CHANGES.current	1 Feb 2004 12:06:43 -0000	1.97
--- CHANGES.current	3 Feb 2004 19:49:56 -0000	1.98
***************
*** 1,4 ****
--- 1,20 ----
  Version 0.4.0 (in progress)
  ===========================
+ 2004-02-03: delta
+   * Added a quick hack in Exception.h to fix a weird 
+   behaviour of swig1.3.21 when it parses this file on
+   windows/vc++7.1.
+   
+   * (vc++7.1) Added a -lexceptions.i in swig command line 
+   such that it uses this dependency instead of 
+   SimData/Exception.i on windows. Removed -DWIN32 to the 
+   command line. The path to swig executable is no more 
+   hardcoded in the custom build step but instead it relies 
+   on an environment variable (SWIG) the user must define. 
+   
+   * (vc++7.1) Removed PostBuilt.bat; user must install and 
+   test by command line the SimData site-package installation 
+   as before.
+   
  2003-01-31: onsight
    * Added debian packaging files (experimental).

[Csp-commits] APPLICATIONS/SimData/VisualStudio2003 SimData.sln,1.1,1.2 SimData.vcproj,1.7,1.8

[<de...@us...>]

Update of /cvsroot/csp/APPLICATIONS/SimData/VisualStudio2003
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26527

Modified Files:
	SimData.sln SimData.vcproj 
Log Message:
see CHANGES.current

Index: SimData.sln
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/VisualStudio2003/SimData.sln,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SimData.sln	10 Aug 2003 18:34:15 -0000	1.1
--- SimData.sln	3 Feb 2004 19:44:39 -0000	1.2
***************
*** 10,15 ****
  	EndGlobalSection
  	GlobalSection(ProjectConfiguration) = postSolution
! 		{F9948756-70B5-4328-8A6A-F4BE5A521A27}.Debug.ActiveCfg = Debug|Win32
! 		{F9948756-70B5-4328-8A6A-F4BE5A521A27}.Debug.Build.0 = Debug|Win32
  		{F9948756-70B5-4328-8A6A-F4BE5A521A27}.Release.ActiveCfg = Release|Win32
  		{F9948756-70B5-4328-8A6A-F4BE5A521A27}.Release.Build.0 = Release|Win32
--- 10,15 ----
  	EndGlobalSection
  	GlobalSection(ProjectConfiguration) = postSolution
! 		{F9948756-70B5-4328-8A6A-F4BE5A521A27}.Debug.ActiveCfg = Release|Win32
! 		{F9948756-70B5-4328-8A6A-F4BE5A521A27}.Debug.Build.0 = Release|Win32
  		{F9948756-70B5-4328-8A6A-F4BE5A521A27}.Release.ActiveCfg = Release|Win32
  		{F9948756-70B5-4328-8A6A-F4BE5A521A27}.Release.Build.0 = Release|Win32

Index: SimData.vcproj
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/VisualStudio2003/SimData.vcproj,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** SimData.vcproj	1 Jan 2004 19:21:33 -0000	1.7
--- SimData.vcproj	3 Feb 2004 19:44:39 -0000	1.8
***************
*** 72,76 ****
  			<Tool
  				Name="VCPostBuildEventTool"
! 				CommandLine="PostBuilt.bat"/>
  			<Tool
  				Name="VCPreBuildEventTool"/>
--- 72,77 ----
  			<Tool
  				Name="VCPostBuildEventTool"
! 				CommandLine="copy /Y ..\Source\cSimData.py ..\SimData"
! 				ExcludedFromBuild="FALSE"/>
  			<Tool
  				Name="VCPreBuildEventTool"/>
***************
*** 137,141 ****
  				TypeLibraryName=".\Debug/SimData.tlb"/>
  			<Tool
! 				Name="VCPostBuildEventTool"/>
  			<Tool
  				Name="VCPreBuildEventTool"/>
--- 138,144 ----
  				TypeLibraryName=".\Debug/SimData.tlb"/>
  			<Tool
! 				Name="VCPostBuildEventTool"
! 				CommandLine="copy /Y ..\Source\cSimData.py ..\SimData"
! 				ExcludedFromBuild="FALSE"/>
  			<Tool
  				Name="VCPreBuildEventTool"/>
***************
*** 170,183 ****
  				RelativePath="..\Source\cSimData_wrap.cpp">
  				<FileConfiguration
- 					Name="Release|Win32">
- 					<Tool
- 						Name="VCCLCompilerTool"
- 						PreprocessorDefinitions="SWIG_GLOBAL"/>
- 				</FileConfiguration>
- 				<FileConfiguration
  					Name="Debug|Win32">
  					<Tool
  						Name="VCCLCompilerTool"
- 						PreprocessorDefinitions="SWIG_GLOBAL"
  						UndefinePreprocessorDefinitions="_DEBUG"/>
  				</FileConfiguration>
--- 173,179 ----
***************
*** 341,344 ****
--- 337,343 ----
  			</File>
  			<File
+ 				RelativePath="..\Include\SimData\Namespace.h">
+ 			</File>
+ 			<File
  				RelativePath="..\Include\SimData\ns-simdata.h">
  			</File>
***************
*** 390,396 ****
  				<Tool
  					Name="VCCustomBuildTool"
! 					CommandLine="C:\progra~1\SWIG-1.3.17\swig -c++ -python -noexcept -DWIN32 -I..\Include -o ..\Source\$(InputName)_wrap.cpp ..\Source\$(InputName).i
! "
! 					Outputs="..\Source\$(InputName)_wrap.cpp"/>
  			</FileConfiguration>
  			<FileConfiguration
--- 389,394 ----
  				<Tool
  					Name="VCCustomBuildTool"
! 					CommandLine="$(SWIG)\swig -runtime -c++ -python -noexcept -lexception.i -I..\Include -o ..\Source\$(InputName)_wrap.cpp ..\Source\$(InputName).i"
! 					Outputs="..\..\Source\$(InputName)_wrap.cpp"/>
  			</FileConfiguration>
  			<FileConfiguration
***************
*** 398,404 ****
  				<Tool
  					Name="VCCustomBuildTool"
! 					CommandLine="C:\progra~1\SWIG-1.3.17\swig -c++ -python -noexcept -DWIN32 -I..\Include -o ..\Source\$(InputName)_wrap.cpp ..\Source\$(InputName).i
! "
! 					Outputs="..\Source\$(InputName)_wrap.cpp"/>
  			</FileConfiguration>
  		</File>
--- 396,401 ----
  				<Tool
  					Name="VCCustomBuildTool"
! 					CommandLine="$(SWIG)\swig -runtime -c++ -python -noexcept -lexception.i -I..\Include -o ..\Source\$(InputName)_wrap.cpp ..\Source\$(InputName).i"
! 					Outputs="..\..\Source\$(InputName)_wrap.cpp"/>
  			</FileConfiguration>
  		</File>