csp-commits — Mailing list for CVS commit messages.

[Csp-commits] svn:csp r1903 - in trunk/csp: cspsim data/models/aircraft/f16 data/models/aircraft/m2k data/xml/vehicles/aircraft/f16dj data/xml/vehicles/aircraft/m2k

[<sv...@ww...>]

Author: mkrose
Date: 2006-04-20 21:59:54 -0700 (Thu, 20 Apr 2006)
New Revision: 1903

Added:
   trunk/csp/data/models/aircraft/f16/f16dj-shadow.osg
   trunk/csp/data/models/aircraft/m2k/m2k-shadow.osg
Modified:
   trunk/csp/cspsim/DynamicObject.cpp
   trunk/csp/cspsim/ObjectModel.cpp
   trunk/csp/cspsim/ObjectModel.h
   trunk/csp/cspsim/SceneModel.cpp
   trunk/csp/cspsim/SceneModel.h
   trunk/csp/cspsim/VirtualScene.cpp
   trunk/csp/data/xml/vehicles/aircraft/f16dj/model.xml
   trunk/csp/data/xml/vehicles/aircraft/m2k/model.xml
Log:
Add support for planar ground shadows of dynamic objects.  To add a
ground shadow to an object, create a 2D model of the shadow (black
with alpha 0.6) and set the ground_shadow_path attribute of the
ObjectModel.  For example, see the m2k and f16dj xml changes in
this revision.

Add ground shadows for the f16dj and m2k.

Fix reversed animations of the m2k elevrons.

Split the terrain, flat static objects, and shadows into separate
render bins to ensure proper render order.

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1903

Diff omitted (26985 bytes).

[Csp-commits] svn:csp r1902 - trunk/csp/tools

[<sv...@ww...>]

Author: mkrose
Date: 2006-04-20 21:48:22 -0700 (Thu, 20 Apr 2006)
New Revision: 1902

Modified:
   trunk/csp/tools/build.py
Log:
Minor cleanup of build messages.

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1902

Modified: trunk/csp/tools/build.py
===================================================================
--- trunk/csp/tools/build.py	2006-04-18 19:37:30 UTC (rev 1901)
+++ trunk/csp/tools/build.py	2006-04-21 04:48:22 UTC (rev 1902)
@@ -185,7 +185,10 @@
 	def printer(target, source, env, phrase=phrase, suffix=suffix):
 		if type(target) == type([]):
 			target = map(str, target)
-			if len(target) == 1: target = target[0]
+			if len(target) == 1:
+				target = target[0]
+			else:
+				target = ', '.join(target)
 		print '- %s %s%s' % (phrase, target, suffix)
 	return printer
 
@@ -1312,7 +1315,7 @@
 			dll = shlib[0]
 			assert dll.get_suffix() == '.dll'
 			CMD = '"%s" /nologo /manifest ${TARGET}.manifest /outputresource:${TARGET};#2' % SharedLibrary.MT_BIN
-			MSG = 'Binding manifest to %s' % dll.name
+			MSG = '- Binding manifest to %s' % dll.name
 			self._env.AddPostAction(dll, SimpleCommand(CMD, MSG))
 
 	def _makeVisualStudioProject(self, shlib):

[Csp-commits] svn:csp r1901 - in trunk/csp: . csp_visual_studio csp_visual_studio/CSP_VS csp_visual_studio/cspsim

[<sv...@ww...>]

Author: stormbringer
Date: 2006-04-18 12:37:30 -0700 (Tue, 18 Apr 2006)
New Revision: 1901

Added:
   trunk/csp/csp_visual_studio/
   trunk/csp/csp_visual_studio/CSP_VS.sln
   trunk/csp/csp_visual_studio/CSP_VS/
   trunk/csp/csp_visual_studio/CSP_VS/CSP_VS.vcproj
   trunk/csp/csp_visual_studio/README.txt
   trunk/csp/csp_visual_studio/cspsim/
   trunk/csp/csp_visual_studio/cspsim/Debug/
   trunk/csp/csp_visual_studio/cspsim/cspsim.vcproj
Log:
Added a Visual Studio 2005 solution file. This is not meant for building the sim, just for convenience when navigating through the code.

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1901

Diff omitted (41064 bytes).

[Csp-commits] svn:csp r1900 - in trunk/csp/csplib: data net numeric spatial util

[<sv...@ww...>]

Author: mkrose
Date: 2006-04-15 17:22:09 -0700 (Sat, 15 Apr 2006)
New Revision: 1900

Modified:
   trunk/csp/csplib/data/Date.cpp
   trunk/csp/csplib/data/Date.h
   trunk/csp/csplib/net/StopWatch.h
   trunk/csp/csplib/net/TaggedRecord.h
   trunk/csp/csplib/numeric/NumericalMethod.cpp
   trunk/csp/csplib/numeric/VectorField.h
   trunk/csp/csplib/spatial/QuadTree.h
   trunk/csp/csplib/util/Cache.h
   trunk/csp/csplib/util/LogStream.cpp
   trunk/csp/csplib/util/StringTools.cpp
Log:
Fix a few minor warnings (/W4) under Windows.

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1900

Modified: trunk/csp/csplib/data/Date.cpp
===================================================================
--- trunk/csp/csplib/data/Date.cpp	2006-04-16 00:20:46 UTC (rev 1899)
+++ trunk/csp/csplib/data/Date.cpp	2006-04-16 00:22:09 UTC (rev 1900)
@@ -318,15 +318,15 @@
 	return buffer;
 }
 
-#define SEC2RAD 7.272205216643039903848712e-5L
-#define EPOCH   2451545.0e+0L
-#define DAYSEC  86400.0e+0L
-#define CENDAY  36525.0e+0L
-#define PI      3.141592653e+0L
-#define COEFF0  24110.54841e+0L
-#define COEFF1  8640184.812866e+0L
-#define COEFF2  0.093104e+0L
-#define COEFF3  -6.2e-6L
+#define SEC2RAD 7.272205216643039903848712e-5
+#define EPOCH   2451545.0e+0
+#define DAYSEC  86400.0e+0
+#define CENDAY  36525.0e+0
+#define PI      3.141592653e+0
+#define COEFF0  24110.54841e+0
+#define COEFF1  8640184.812866e+0
+#define COEFF2  0.093104e+0
+#define COEFF3  -6.2e-6
 
 /* DEPRECATED
 double DateZulu::getAccurateMST(radian_t longitude) const {

Modified: trunk/csp/csplib/data/Date.h
===================================================================
--- trunk/csp/csplib/data/Date.h	2006-04-16 00:20:46 UTC (rev 1899)
+++ trunk/csp/csplib/data/Date.h	2006-04-16 00:22:09 UTC (rev 1900)
@@ -63,10 +63,10 @@
 CSP_NAMESPACE
 
 
-#define CSP_F1p0_60p0      0.016666666666666667L
-#define CSP_F1p0_24p0      0.041666666666666667L
-#define CSP_F1p0_36525p0   0.000027378507871321L
-#define CSP_F1p0_86400p0   0.000011574074074074L
+#define CSP_F1p0_60p0      0.016666666666666667
+#define CSP_F1p0_24p0      0.041666666666666667
+#define CSP_F1p0_36525p0   0.000027378507871321
+#define CSP_F1p0_86400p0   0.000011574074074074
 
 
 typedef double radian_t;

Modified: trunk/csp/csplib/net/StopWatch.h
===================================================================
--- trunk/csp/csplib/net/StopWatch.h	2006-04-16 00:20:46 UTC (rev 1899)
+++ trunk/csp/csplib/net/StopWatch.h	2006-04-16 00:22:09 UTC (rev 1900)
@@ -25,6 +25,7 @@
 #ifndef __CSPLIB_NET_STOPWATCH_H__
 #define __CSPLIB_NET_STOPWATCH_H__
 
+#include <csp/csplib/util/Properties.h>
 #include <csp/csplib/util/Timing.h>
 
 CSP_NAMESPACE
@@ -60,7 +61,7 @@
  *
  *  @ingroup net
  */
-class CSPLIB_EXPORT StopWatch {
+class CSPLIB_EXPORT StopWatch: NonCopyable {
 public:
 
 	/** Internal timing data.  Declare separate, persistent Data instance for each

Modified: trunk/csp/csplib/net/TaggedRecord.h
===================================================================
--- trunk/csp/csplib/net/TaggedRecord.h	2006-04-16 00:20:46 UTC (rev 1899)
+++ trunk/csp/csplib/net/TaggedRecord.h	2006-04-16 00:22:09 UTC (rev 1900)
@@ -42,8 +42,9 @@
 #define __CSPLIB_NET_TAGGED_RECORD_H__
 
 #include <csp/csplib/data/Archive.h>
+#include <csp/csplib/util/Namespace.h>
+#include <csp/csplib/util/Properties.h>
 #include <csp/csplib/util/Ref.h>
-#include <csp/csplib/util/Namespace.h>
 
 #include <string>
 #include <stack>
@@ -140,7 +141,7 @@
  *  of nested records.
  *  @ingroup net
  */
-class CSPLIB_EXPORT TagBase {
+class CSPLIB_EXPORT TagBase: NonCopyable {
  protected:
 	std::stack<int> _tagstack;
 	enum { TAG_END = 0 };

Modified: trunk/csp/csplib/numeric/NumericalMethod.cpp
===================================================================
--- trunk/csp/csplib/numeric/NumericalMethod.cpp	2006-04-16 00:20:46 UTC (rev 1899)
+++ trunk/csp/csplib/numeric/NumericalMethod.cpp	2006-04-16 00:22:09 UTC (rev 1900)
@@ -245,7 +245,7 @@
 	static Vectord ytemp(m_Dimension);
 
 	unsigned short i = 0;
-	register short int const dim = m_Dimension;
+	register short int const dim = static_cast<short int>(m_Dimension);
 	for (; i < dim; ++i) {
 		ytemp[i] = y[i] + b21 * h * dydx[i];
 	}

Modified: trunk/csp/csplib/numeric/VectorField.h
===================================================================
--- trunk/csp/csplib/numeric/VectorField.h	2006-04-16 00:20:46 UTC (rev 1899)
+++ trunk/csp/csplib/numeric/VectorField.h	2006-04-16 00:22:09 UTC (rev 1900)
@@ -26,7 +26,7 @@
 #define __CSPSIM_VECTORFIELD_H__
 
 #include <csp/csplib/util/Export.h>
-#include <csp/csplib/util/Namespace.h>
+#include <csp/csplib/util/Properties.h>
 #include <csp/csplib/numeric/Vector.h>
 
 CSP_NAMESPACE
@@ -40,7 +40,7 @@
  * field describing the kinetic parameters of a dynamical
  * system.
  */
-class CSPLIB_EXPORT VectorField {
+class CSPLIB_EXPORT VectorField: NonCopyable {
 protected:
 	typedef size_t size_type;
 	size_type const m_Dimension;

Modified: trunk/csp/csplib/spatial/QuadTree.h
===================================================================
--- trunk/csp/csplib/spatial/QuadTree.h	2006-04-16 00:20:46 UTC (rev 1899)
+++ trunk/csp/csplib/spatial/QuadTree.h	2006-04-16 00:22:09 UTC (rev 1900)
@@ -283,8 +283,9 @@
  *  when traversing the tree.
  */
 class CSPLIB_EXPORT TreeConstraint {
-	const uint32 _max_depth;
-	const uint32 _leaf_limit;
+	uint32 _max_depth;
+	uint32 _leaf_limit;
+
 public:
 
 	/** Construct a new TreeConstraint.

Modified: trunk/csp/csplib/util/Cache.h
===================================================================
--- trunk/csp/csplib/util/Cache.h	2006-04-16 00:20:46 UTC (rev 1899)
+++ trunk/csp/csplib/util/Cache.h	2006-04-16 00:22:09 UTC (rev 1900)
@@ -57,8 +57,8 @@
 #include <cassert>
 #include <list>
 
-#include <csp/csplib/util/Namespace.h>
 #include <csp/csplib/util/HashUtility.h>
+#include <csp/csplib/util/Properties.h>
 
 
 CSP_NAMESPACE
@@ -71,7 +71,7 @@
  *  items in the collection.
  */
 template <typename KEY, typename TYPE, typename HASH_COMPARE = HashCompare<KEY> >
-class MostRecentlyUsedCache {
+class MostRecentlyUsedCache: NonCopyable {
 	typedef TYPE DataType;
 	typedef KEY CacheKey;
 	typedef std::list<CacheKey> MostRecentlyUsedList;

Modified: trunk/csp/csplib/util/LogStream.cpp
===================================================================
--- trunk/csp/csplib/util/LogStream.cpp	2006-04-16 00:20:46 UTC (rev 1899)
+++ trunk/csp/csplib/util/LogStream.cpp	2006-04-16 00:22:09 UTC (rev 1900)
@@ -68,8 +68,8 @@
 	LogStreamRegistry *NamedLogStreamRegistry = 0;
 
 	inline void writeDigits(char *&buffer, int value) {
-		*buffer++ = '0' + value / 10;
-		*buffer++ = '0' + value % 10;
+		*buffer++ = '0' + static_cast<char>(value / 10);
+		*buffer++ = '0' + static_cast<char>(value % 10);
 	}
 
 	// Replaced gmtime_r and strftime with logTime, mainly because gmtime_r isn't

Modified: trunk/csp/csplib/util/StringTools.cpp
===================================================================
--- trunk/csp/csplib/util/StringTools.cpp	2006-04-16 00:20:46 UTC (rev 1899)
+++ trunk/csp/csplib/util/StringTools.cpp	2006-04-16 00:22:09 UTC (rev 1900)
@@ -283,9 +283,9 @@
 	char *fill = fmt;
 	*fill++ = '%';
 	*fill++ = '.';
-	if (precision > 100) *fill++ = '0' + (precision / 100) % 10;
-	if (precision > 10) *fill++ = '0' + (precision / 10) % 10;
-	*fill++ = '0' + (precision % 10);
+	if (precision > 100) *fill++ = '0' + static_cast<char>((precision / 100) % 10);
+	if (precision > 10) *fill++ = '0' + static_cast<char>((precision / 10) % 10);
+	*fill++ = '0' + static_cast<char>(precision % 10);
 	*fill++ = style;
 	*fill = 0;
 	// 128 bytes should be more than enough since we are doing alignment by hand.

[Csp-commits] svn:csp r1899 - in trunk/csp/modules: chunklod demeter

[<sv...@ww...>]

Author: mkrose
Date: 2006-04-15 17:20:46 -0700 (Sat, 15 Apr 2006)
New Revision: 1899

Modified:
   trunk/csp/modules/chunklod/SConscript
   trunk/csp/modules/demeter/SConscript
Log:
Fix extension module prefixes under Linux.

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1899

Modified: trunk/csp/modules/chunklod/SConscript
===================================================================
--- trunk/csp/modules/chunklod/SConscript	2006-04-15 17:41:57 UTC (rev 1898)
+++ trunk/csp/modules/chunklod/SConscript	2006-04-16 00:20:46 UTC (rev 1899)
@@ -39,6 +39,7 @@
 		'Version.cpp',
 	],
 	deps = ['cspsim', 'jpeg'],
-	aliases = ['all', 'clod'])
+	aliases = ['all', 'clod'],
+	SHLIBPREFIX='')
 
 

Modified: trunk/csp/modules/demeter/SConscript
===================================================================
--- trunk/csp/modules/demeter/SConscript	2006-04-15 17:41:57 UTC (rev 1898)
+++ trunk/csp/modules/demeter/SConscript	2006-04-16 00:20:46 UTC (rev 1899)
@@ -30,6 +30,7 @@
 		'TerrainTextureFactory.cpp',
 	],
 	deps = ['cspsim'],
-	aliases = 'all')
+	aliases = 'all',
+	SHLIBPREFIX='')
 
 

[Csp-commits] svn:csp r1898 - in trunk/csp/tools: . hid

[<sv...@ww...>]

Author: mkrose
Date: 2006-04-15 10:41:57 -0700 (Sat, 15 Apr 2006)
New Revision: 1898

Modified:
   trunk/csp/tools/hid/README
   trunk/csp/tools/map2hid
Log:
Update the hid readme and add a default include path to
map2hid to make it easier to use.

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1898

Modified: trunk/csp/tools/hid/README
===================================================================
--- trunk/csp/tools/hid/README	2006-04-15 06:50:52 UTC (rev 1897)
+++ trunk/csp/tools/hid/README	2006-04-15 17:41:57 UTC (rev 1898)
@@ -1,63 +1,41 @@
 Input maps for CSPSim
-========================================================================
+==============================================================================
 
-Currently there are two important input maps that you must have for
-CSPSim to function properly.  One is called the "gamescreen" map,
-which handles commands like Exit, Pause, Change views, etc.  The
-other is the "vehicle" map which is used to control the current
-vehicle.  As the only vehicle right now is the Mirage 2000, the
-vehicle map you need is 'aircraft.map'.  The input mapping system
-is designed to be highly sophisticated and flexible, but here we
-just present some of the basics for getting started.  If you want
-to learn more about programming map files, see README.map.
+Currently there are two important input maps that you must have for CSPSim to
+function properly.  One is called the "gamescreen" map, which handles commands
+like Exit, Pause, Change views, etc.  The other is the "vehicle" map which is
+used to control the current vehicle.  As the only vehicle right now is the
+Mirage 2000, the vehicle map you need is 'aircraft.map'.  The input mapping
+system is designed to be highly sophisticated and flexible, but here we just
+present some of the basics for getting started.  If you want to learn more
+about programming map files, see README.map.
 
-The first this you must do is create "customized" maps.  The maps
-available in CVS are often updated with new functionality, so it
-is best to create your own maps that extend these basic maps.  This
-way whenever the CVS maps are updated you will then gain the new
-functionality without losing any of your customizations.
+The first this you must do is create "customized" maps.  The maps available in
+CVS are often updated with new functionality, so it is best to create your own
+maps that extend these basic maps.  This way whenever the CVS maps are updated
+you will then gain the new functionality without losing any of your
+customizations.
 
-To start, copy aircraft.map and gamescreen.map from the Examples
-directory to the current directory.  These will be your custom
-maps.  They automatically include the appropriate maps in the Maps
-directory, and these key bindings which should be fine to start
-with.   You should however modify the joystick axis binding to suit
-your particular stick and throttle.  There are some stick bindings
-in Examples/aircraft.map that may or may not work for you since
-the axis number vary from stick to stick.
+To start, copy aircraft.map and gamescreen.map from the Examples directory to
+the current directory.  These will be your custom maps.  They automatically
+include the appropriate maps in the Maps directory, and these key bindings
+which should be fine to start with.   You should however modify the joystick
+axis binding to suit your particular stick and throttle.  There are some stick
+bindings in Examples/aircraft.map that may or may not work for you since the
+axis number vary from stick to stick.
 
-Under Linux you can run the jstest utility (which is included in
-most distributions) to see which axis numbers your stick, throttle,
-and rudders map to.  I'm not sure of a simple way to determine this
-under Windows, but if all else fails you can resort to trial and
-error. /* can one of the windows developers please comment on
-this? */
+Under Linux you can run the jstest utility (which is included in most
+distributions) to see which axis numbers your stick, throttle, and rudders map
+to.  I'm not sure of a simple way to determine this under Windows, but if all
+else fails you can resort to trial and error. /* can one of the windows
+developers please comment on this? */
 
-After you modify a map file, you must create a corresponding "hid"
-(human interface device) file for use in the simulation.  To do so,
-use the cspinput tool in this directory.  The resulting hid files
-must be placed in the CSPSim Data/Input directory before they can
-be used.
+After you modify a map file, you must create a corresponding "hid" (human
+interface device) file for use in the simulation.  To do so, use the cspinput
+tool in this directory.  The resulting hid files must be placed in the CSPSim
+Data/Input directory before they can be used.
 
-Here are some examples for converting from map to hid under Linux:
+Here is an example for converting from map to hid:
 
-  $ ./compile.py aircraft.map
-  $ cp aircraft.hid ../../data/input
+$ python tools/map2hid tools/hid/examples/aircraft.map data/input/aircraft.hid
 
-or
-
-  $ ./compile aircraft.map - >../../data/input
-
-and under Windows:
-
-  > python compile.py aircraft.map
-  > copy aircraft.hid ..\..\data\input
-
-or
-
-  > python compile.py aircraft.map - >..\..\data\input
-
-Also under Windows you can usually just drag and drop your map
-file onto the cspinput icon, then drag the resulting hid file to
-the data\input directory.
-

Modified: trunk/csp/tools/map2hid
===================================================================
--- trunk/csp/tools/map2hid	2006-04-15 06:50:52 UTC (rev 1897)
+++ trunk/csp/tools/map2hid	2006-04-15 17:41:57 UTC (rev 1898)
@@ -22,9 +22,10 @@
 Converts interface definitions (.map) to a condensed format used by
 the simulation (.hid).
 
-Usage: %(prog)s [options] [infile|-] [outfile|-]
+Usage: %(prog)s [options] infile [outfile|-]
 """
 
+import os
 import sys
 
 from csp.base import app
@@ -36,6 +37,14 @@
 		app.usage()
 		return 1
 
+	include_path = app.options.include_path
+
+	# for convenience, add the default include path if the program appears
+	# to have been run from the tools directory.
+	program_path = os.path.dirname(app.programPath())
+	if program_path.lower().endswith('tools'):
+		include_path.append(os.path.join(program_path, 'hid'))
+
 	outfile = sys.stdout
 	if len(args) == 2 and args[1] != '-':
 		outfile = args[1]
@@ -43,10 +52,11 @@
 	if args:
 		infile = args[0]
 	else:
-		infile = '-'
+		app.usage()
+		return 1
 
 	try:
-		compiler.MapCompiler.compile(infile, outfile, include_path=app.options.include_path)
+		compiler.MapCompiler.compile(infile, outfile, include_path=include_path)
 	except compiler.Error, e:
 		print str(e)
 		return 1

[Csp-commits] svn:csp r1897 - in trunk/csp/dist/win/devpack: . build

[<sv...@ww...>]

Author: mkrose
Date: 2006-04-14 23:50:52 -0700 (Fri, 14 Apr 2006)
New Revision: 1897

Added:
   trunk/csp/dist/win/devpack/build/
   trunk/csp/dist/win/devpack/build/README
   trunk/csp/dist/win/devpack/build/SConscript.commoncpp2
   trunk/csp/dist/win/devpack/build/SConscript.freetype
   trunk/csp/dist/win/devpack/build/SConscript.libjpeg
   trunk/csp/dist/win/devpack/build/SConscript.libogg
   trunk/csp/dist/win/devpack/build/SConscript.libpng
   trunk/csp/dist/win/devpack/build/SConscript.libsigc++
   trunk/csp/dist/win/devpack/build/SConscript.libvorbis
   trunk/csp/dist/win/devpack/build/SConscript.openal
   trunk/csp/dist/win/devpack/build/SConscript.openalpp
   trunk/csp/dist/win/devpack/build/SConscript.openscenegraph
   trunk/csp/dist/win/devpack/build/SConscript.openthreads
   trunk/csp/dist/win/devpack/build/SConscript.producer
   trunk/csp/dist/win/devpack/build/SConscript.sdl
   trunk/csp/dist/win/devpack/build/SConscript.sdl_image
   trunk/csp/dist/win/devpack/build/SConscript.zlib
   trunk/csp/dist/win/devpack/build/SConstruct
   trunk/csp/dist/win/devpack/build/devpack.py
Log:
Add scons build scripts for third-party libraries in the windows
devpack.  These are fairly rough, and will require manual adjustment
to support new versions of each library, but provide a unified build
environment with consistent settings across all libraries.

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1897

Diff omitted (47413 bytes).

[Csp-commits] svn:csp r1896 - trunk/csp

[<sv...@ww...>]

Author: mkrose
Date: 2006-04-14 20:39:07 -0700 (Fri, 14 Apr 2006)
New Revision: 1896

Modified:
   trunk/csp/SConstruct
Log:
Quiet a few msvc warnings.

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1896

Modified: trunk/csp/SConstruct
===================================================================
--- trunk/csp/SConstruct	2006-04-15 03:38:10 UTC (rev 1895)
+++ trunk/csp/SConstruct	2006-04-15 03:39:07 UTC (rev 1896)
@@ -154,7 +154,7 @@
 class PlatformSettings:
 	def customize_win(self, env):
 		env['CXXFLAGS'] = Split('/GR /MD /O2 /EHsc /nologo')
-		env.AppendUnique(CPPDEFINES=Split('WIN32 __WIN32__ _USRDLL _DLL NDEBUG'))
+		env.AppendUnique(CPPDEFINES=Split('WIN32 __WIN32__ _USRDLL _DLL NDEBUG _CRT_SECURE_NO_DEPRECATE'))
 		env.AppendUnique(LINKFLAGS=Split('/INCREMENTAL:NO /RELEASE /nologo'))
 		env.AppendUnique(SHLINKFLAGS=Split('/INCREMENTAL:NO /RELEASE /nologo'))
 		# FIXME why is LIBPATH being overwritten?  quick hack for now is to add the path to linkflags.

[Csp-commits] svn:csp r1895 - trunk/csp/dist/win/devpack

[<sv...@ww...>]

Author: mkrose
Date: 2006-04-14 20:38:10 -0700 (Fri, 14 Apr 2006)
New Revision: 1895

Modified:
   trunk/csp/dist/win/devpack/devpack.nsi
Log:
Minor tweaks to devpack nsis script.

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1895

Modified: trunk/csp/dist/win/devpack/devpack.nsi
===================================================================
--- trunk/csp/dist/win/devpack/devpack.nsi	2006-04-14 16:46:29 UTC (rev 1894)
+++ trunk/csp/dist/win/devpack/devpack.nsi	2006-04-15 03:38:10 UTC (rev 1895)
@@ -17,7 +17,7 @@
   !define WriteEnvStr_RegKey 'HKCU "Environment"'
 
   Name "CSP Devpack ${VERSION}"
-  OutFile "cspdevpack-${VERSION}.exe"
+  OutFile "cspdevpack-${VERSION}-installer.exe"
 
   InstallDir "$PROGRAMFILES\cspdevpack-${VERSION}"
   InstallDirRegKey HKCU "Software\cspdevpack-${VERSION}" ""
@@ -36,11 +36,11 @@
 
   !insertmacro MUI_LANGUAGE "English"
 
-  VIProductVersion "0.6.0.1"
+  VIProductVersion "${VERSION}.0.0"
   VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "Combat Simulator Project Devpack"
   VIAddVersionKey /LANG=${LANG_ENGLISH} "Comments" "Visit http://csp.sf.net/wiki/Devpack for more information."
   VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "CSP Devpack Installer"
-  VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "0.6"
+  VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "${VERSION}"
 
 
 Section "Devpack" SecDevpack

[Csp-commits] svn:csp r1894 - in trunk/csp: . modules/chunklod

[<sv...@ww...>]

Author: mkrose
Date: 2006-04-14 09:46:29 -0700 (Fri, 14 Apr 2006)
New Revision: 1894

Modified:
   trunk/csp/SConstruct
   trunk/csp/modules/chunklod/SConscript
Log:
Remove msvcrt as an explicit library from the windows build.  Should
not be necessary any more and was causing link errors for ChunkLod.

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1894

Modified: trunk/csp/SConstruct
===================================================================
--- trunk/csp/SConstruct	2006-04-14 06:41:28 UTC (rev 1893)
+++ trunk/csp/SConstruct	2006-04-14 16:46:29 UTC (rev 1894)
@@ -78,7 +78,7 @@
 	name = 'windows',
 	config = [
 		build.WindowsLibConfig('advapi32'),
-		build.WindowsLibConfig('msvcrt', symbol='_toupper'),
+		#build.WindowsLibConfig('msvcrt', symbol='_toupper'),
 		build.WindowsLibConfig('ws2_32'),
 	])
 

Modified: trunk/csp/modules/chunklod/SConscript
===================================================================
--- trunk/csp/modules/chunklod/SConscript	2006-04-14 06:41:28 UTC (rev 1893)
+++ trunk/csp/modules/chunklod/SConscript	2006-04-14 16:46:29 UTC (rev 1894)
@@ -26,7 +26,7 @@
 
 # to remove conflicts with MSVCRT
 if env['PLATFORM'].startswith('win'):
-	env.AppendUnique(SHLINKFLAGS=Split('/NODEFAULTLIB:LIBC'))
+	env.AppendUnique(SHLINKFLAGS=Split('/NODEFAULTLIB:LIBCMT'))
 
 build.SharedLibrary(env,
 	name = 'chunklod',

[Csp-commits] svn:csp r1893 - trunk/csp/dist/win/devpack

[<sv...@ww...>]

Author: mkrose
Date: 2006-04-13 23:41:28 -0700 (Thu, 13 Apr 2006)
New Revision: 1893

Modified:
   trunk/csp/dist/win/devpack/README
Log:
Update compiler version.

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1893

Modified: trunk/csp/dist/win/devpack/README
===================================================================
--- trunk/csp/dist/win/devpack/README	2006-04-14 06:34:02 UTC (rev 1892)
+++ trunk/csp/dist/win/devpack/README	2006-04-14 06:41:28 UTC (rev 1893)
@@ -19,7 +19,7 @@
 
 All binary libraries included in this package were built under Microsoft
 Windows XP SP2 using the Microsoft 32-bit C/C++ Optimizing Compiler Version
-14.00.50215.44, with the exception of OpenAL, which was copied directly from
+14.00.50727.42, with the exception of OpenAL, which was copied directly from
 the OpenAL 1.1 SDK.  Unless otherwise noted, the /O2 and /MD compiler switches
 and the /RELEASE switch were used.  The libraries depend on standard system
 libraries, as well as Microsoft Visual C++ runtime libraries (msvcr80.dll and

[Csp-commits] svn:csp r1892 - in trunk/csp/dist/win: . devpack devpack/LICENSES

[<sv...@ww...>]

Author: mkrose
Date: 2006-04-13 23:34:02 -0700 (Thu, 13 Apr 2006)
New Revision: 1892

Added:
   trunk/csp/dist/win/devpack/
   trunk/csp/dist/win/devpack/COPYING
   trunk/csp/dist/win/devpack/LICENSES/
   trunk/csp/dist/win/devpack/LICENSES/GPL
   trunk/csp/dist/win/devpack/LICENSES/GPL-2
   trunk/csp/dist/win/devpack/LICENSES/LGPL
   trunk/csp/dist/win/devpack/LICENSES/LGPL-2
   trunk/csp/dist/win/devpack/LICENSES/LGPL-2.1
   trunk/csp/dist/win/devpack/LICENSES/libjpeg
   trunk/csp/dist/win/devpack/LICENSES/libpng
   trunk/csp/dist/win/devpack/LICENSES/openal
   trunk/csp/dist/win/devpack/LICENSES/osg
   trunk/csp/dist/win/devpack/LICENSES/python
   trunk/csp/dist/win/devpack/LICENSES/xiph
   trunk/csp/dist/win/devpack/LICENSES/zlib
   trunk/csp/dist/win/devpack/README
   trunk/csp/dist/win/devpack/devpack.nsi
   trunk/csp/dist/win/devpack/logo.bmp
Log:
Add devpack assembly files.

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1892

Diff omitted (156485 bytes).

[Csp-commits] svn:csp r1891 - trunk/csp

[<sv...@ww...>]

Author: mkrose
Date: 2006-04-13 23:20:42 -0700 (Thu, 13 Apr 2006)
New Revision: 1891

Removed:
   trunk/csp/demo/
Log:
Finish porting demo files to dist directory.

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1891

[Csp-commits] svn:csp r1890 - in trunk/csp/dist/win/demo: . template

[<sv...@ww...>]

Author: mkrose
Date: 2006-04-13 23:14:46 -0700 (Thu, 13 Apr 2006)
New Revision: 1890

Added:
   trunk/csp/dist/win/demo/makedemo.py
   trunk/csp/dist/win/demo/template/
   trunk/csp/dist/win/demo/template/COPYING
Removed:
   trunk/csp/dist/win/demo/template/COPYING
Log:
Begin porting demo files to the new path.

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1890

Copied: trunk/csp/dist/win/demo/makedemo.py (from rev 1884, trunk/csp/demo/win/makedemo.py)

Copied: trunk/csp/dist/win/demo/template (from rev 1872, trunk/csp/demo/win/template)

Deleted: trunk/csp/dist/win/demo/template/COPYING
===================================================================
--- trunk/csp/demo/win/template/COPYING	2006-04-03 06:58:13 UTC (rev 1872)
+++ trunk/csp/dist/win/demo/template/COPYING	2006-04-14 06:14:46 UTC (rev 1890)
@@ -1,90 +0,0 @@
-The package contains the main CSPSim application and several supporting
-libraries.  The following summarizes the copyright and licensing terms
-of the various components, with links to the associated websites where
-the source code can be obtained.  Licenses for data files can be found
-in the associated directories.  Please report any errors or ommisions
-on the forums at http://csp.sf.net/forum.
-
-CSPSim
-Copyright 2002-2005 The Combat Simulator Project
-Licensed under the terms of the GNU General Public License version 2 or
-later.
-http://csp.sf.net/forum
-
-SimData
-Copyright 2002-2005 Mark Rose <mk...@us...>
-Licensed under the terms of the GNU General Public License version 2 or
-later.
-http://csp.sf.net/forum
-
-SDL
-Copyright 1997-2002  Sam Lantinga
-Licensed under the terms of the GNU Library General Public License version
-2 or later.
-http://www.libsdl.org/
-
-SDL_image
-Copyright 1997-2001  Sam Lantinga
-Licensed under the terms of the GNU Library General Public License version
-2 or later.
-http://www.libsdl.org/projects/SDL_image/
-
-OpenThreads
-OpenThread library, Copyright 2002-2003 The Open Thread Group
-Licensed under the terms of the GNU Library General Public License version
-2.1 or later.
-http://openthreads.sourceforge.net/
-
-Producer
-Copyright 2002 Don Burns
-Licensed under the terms of the GNU Library General Public License.
-http://www.andesengineering.com/Producer/
-
-OpenSceneGraph
-Copyright 1998-2005 Robert Osfield
-Licensed under the terms of the OpenSceneGraph Public License (OSGPL) version
-0.0 or later.
-http://www.openscenegraph.org/
-
-Demeter
-Licensed under the terms of the GNU Library General Public License version
-2 or later.
-Copyright 2002 Clay Fowler
-http://sourceforge.net/projects/demeter/
-
-Python (executable and various core modules)
-Copyright 2001, 2002, 2003 Python Software Foundation.
-Copyright 2000 BeOpen.com.
-Copyright 1995-2001 Corporation for National Research Initiatives.
-Copyright 1991-1995 Stichting Mathematisch Centrum.
-Each copyright holder provides a different license, all of which are certified
-Open Source and GNU GPL-compatible; see LICENSES/python.
-http://python.org/
-
-GNU Common C++
-Copyright 1999-2003 Open Source Telecom Corporation.
-Licensed under the terms of the GNU General Public License version 2 or
-later.
-http://www.gnu.org/software/commoncpp/
-
-LibSigC++
-Copyright 2002, The libsigc++ Development Team
-Licensed under the terms of the GNU Library General Public License version
-2 or later.
-http://libsigc.sourceforge.net/
-
-zlib
-Copyright 1995-1998 Jean-loup Gailly and Mark Adler
-See LICENSES/zlib
-http://www.gzip.org/zlib/
-
-libjpeg
-Copyright 1991-1998, Thomas G. Lane
-See LICENSES/libjpeg for the license.
-http://www.ijg.org/
-
-libpng
-Copyright 1998-2004 Glenn Randers-Pehrson
-See LICENSES/libpng for the license.
-http://libpng.sourceforge.net/
-

Copied: trunk/csp/dist/win/demo/template/COPYING (from rev 1884, trunk/csp/demo/win/template/COPYING)

[Csp-commits] svn:csp r1889 - in trunk/csp: . dist dist/win

[<sv...@ww...>]

Author: mkrose
Date: 2006-04-13 23:13:34 -0700 (Thu, 13 Apr 2006)
New Revision: 1889

Added:
   trunk/csp/dist/
   trunk/csp/dist/win/
   trunk/csp/dist/win/demo/
Log:
Reorganize distribution related directories.

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1889

[Csp-commits] svn:csp r1888 - trunk/csp/tools

[<sv...@ww...>]

Author: mkrose
Date: 2006-04-13 20:25:24 -0700 (Thu, 13 Apr 2006)
New Revision: 1888

Modified:
   trunk/csp/tools/build.py
Log:
Fix typo.

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1888

Modified: trunk/csp/tools/build.py
===================================================================
--- trunk/csp/tools/build.py	2006-04-13 07:50:42 UTC (rev 1887)
+++ trunk/csp/tools/build.py	2006-04-14 03:25:24 UTC (rev 1888)
@@ -1291,7 +1291,7 @@
 		if self._aliases:
 			Alias(self._aliases, shlib)
 		if IsWindows(self._env):
-			self.__bindManifest(shlib)
+			self._bindManifest(shlib)
 			self._makeVisualStudioProject(shlib)
 		if self._doxygen:
 			self._env.Documentation(self._dox, self._doxygen, self._sources)

[Csp-commits] svn:csp r1887 - trunk/csp

[<sv...@ww...>]

Author: mkrose
Date: 2006-04-13 00:50:42 -0700 (Thu, 13 Apr 2006)
New Revision: 1887

Modified:
   trunk/csp/SConstruct
Log:
Used /MD flag for DLL's under windows!

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1887

Modified: trunk/csp/SConstruct
===================================================================
--- trunk/csp/SConstruct	2006-04-13 07:49:01 UTC (rev 1886)
+++ trunk/csp/SConstruct	2006-04-13 07:50:42 UTC (rev 1887)
@@ -153,10 +153,10 @@
 
 class PlatformSettings:
 	def customize_win(self, env):
-		env['CXXFLAGS'] = Split('/GR /MT /O2 /EHsc /nologo')
+		env['CXXFLAGS'] = Split('/GR /MD /O2 /EHsc /nologo')
 		env.AppendUnique(CPPDEFINES=Split('WIN32 __WIN32__ _USRDLL _DLL NDEBUG'))
 		env.AppendUnique(LINKFLAGS=Split('/INCREMENTAL:NO /RELEASE /nologo'))
-		env.AppendUnique(SHLINKFLAGS=Split('/INCREMENTAL:NO /NODEFAULTLIB:LIBCMT /RELEASE /nologo'))
+		env.AppendUnique(SHLINKFLAGS=Split('/INCREMENTAL:NO /RELEASE /nologo'))
 		# FIXME why is LIBPATH being overwritten?  quick hack for now is to add the path to linkflags.
 		env.AppendUnique(LIBPATH=[build.PYTHON_LIBRARY])
 		env.AppendUnique(LINKFLAGS=['/LIBPATH:%s' % build.PYTHON_LIBRARY])

[Csp-commits] svn:csp r1886 - trunk/csp/tools

[<sv...@ww...>]

Author: mkrose
Date: 2006-04-13 00:49:01 -0700 (Thu, 13 Apr 2006)
New Revision: 1886

Modified:
   trunk/csp/tools/build.py
Log:
Patch the build script to bind manifests to dll's under Windows.  This
is VC8 specific, and will need to be changed for backwards compatibility
with VC7.1.

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1886

Modified: trunk/csp/tools/build.py
===================================================================
--- trunk/csp/tools/build.py	2006-04-08 23:58:23 UTC (rev 1885)
+++ trunk/csp/tools/build.py	2006-04-13 07:49:01 UTC (rev 1886)
@@ -1291,6 +1291,7 @@
 		if self._aliases:
 			Alias(self._aliases, shlib)
 		if IsWindows(self._env):
+			self.__bindManifest(shlib)
 			self._makeVisualStudioProject(shlib)
 		if self._doxygen:
 			self._env.Documentation(self._dox, self._doxygen, self._sources)
@@ -1301,6 +1302,19 @@
 			Depends(shlib, bdeps)
 		return shlib[0]
 
+	MT_BIN = 0
+	def _bindManifest(self, shlib):
+		if SharedLibrary.MT_BIN == 0:
+			SharedLibrary.MT_BIN = SCons.Util.WhereIs('mt')
+			if not SharedLibrary.MT_BIN:
+				print 'WARNING: could not find mt.exe, will not bind manifests'
+		if SharedLibrary.MT_BIN:
+			dll = shlib[0]
+			assert dll.get_suffix() == '.dll'
+			CMD = '"%s" /nologo /manifest ${TARGET}.manifest /outputresource:${TARGET};#2' % SharedLibrary.MT_BIN
+			MSG = 'Binding manifest to %s' % dll.name
+			self._env.AddPostAction(dll, SimpleCommand(CMD, MSG))
+
 	def _makeVisualStudioProject(self, shlib):
 		if not hasattr(self._env, 'MSVSProject'):
 			Alias('vs', [])

[Csp-commits] svn:csp r1885 - trunk/csp/bin

[<sv...@ww...>]

Author: mkrose
Date: 2006-04-08 16:58:23 -0700 (Sat, 08 Apr 2006)
New Revision: 1885

Modified:
   trunk/csp/bin/sim.py
Log:
Force CSPDEVPACK to the start of PATH when running under windows
to ensure that the correct devpack dlls are found.

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1885

Modified: trunk/csp/bin/sim.py
===================================================================
--- trunk/csp/bin/sim.py	2006-04-08 21:12:45 UTC (rev 1884)
+++ trunk/csp/bin/sim.py	2006-04-08 23:58:23 UTC (rev 1885)
@@ -58,6 +58,24 @@
 	return os.path.join(*(['..'] * (len(a) - i) + list(b[i:])))
 
 
+def configureEnvironment():
+	os.environ.setdefault('CSPLOG_FILE', 'sim.log')
+	os.environ.setdefault('CSPLOG_PRIORITY', '2')
+
+	# for Windows, ensure that the devpack bin path is searched ahead of
+	# any other directories in PATH.
+	CSPDEVPACK=os.environ.get('CSPDEVPACK')
+	if CSPDEVPACK:
+		PATH = os.environ.get('PATH', '')
+		CSPDEVPACK_BIN = os.path.join(CSPDEVPACK, 'bin')
+		if not PATH.startswith(CSPDEVPACK_BIN):
+			print 'WARNING: placing %s at start of PATH' % CSPDEVPACK_BIN
+			os.environ['PATH'] = os.pathsep.join([CSPDEVPACK_BIN, PATH])
+	elif sys.platform.startswith('win'):
+		print 'WARNING: CSPDEVPACK environment variable not set; required libraries'
+		print 'may not be found.'
+
+
 def checkModuleSpace():
 	"""
 	Check that the bootstrap module works correctly and that the top-level csp
@@ -76,7 +94,6 @@
 	IS_FROZEN = hasattr(csp, '__loader__')
 
 
-
 def checkData():
 	"""Spot check some of the data to detect common problems."""
 	DATA = os.path.join('..', 'data')
@@ -331,8 +348,7 @@
 
 
 if __name__ == '__main__':
-	os.environ.setdefault('CSPLOG_FILE', 'sim.log')
-	os.environ.setdefault('CSPLOG_PRIORITY', '2')
+	configureEnvironment()
 	checkModuleSpace()
 	checkData()
 	importModules()

[Csp-commits] svn:csp r1884 - in trunk/csp: bin demo/win demo/win/template

[<sv...@ww...>]

Author: mkrose
Date: 2006-04-08 14:12:45 -0700 (Sat, 08 Apr 2006)
New Revision: 1884

Modified:
   trunk/csp/bin/sim.ini
   trunk/csp/demo/win/makedemo.py
   trunk/csp/demo/win/template/COPYING
Log:
Patch makedemo.py to work with the latest code and directory
layout.  Update copyright notices in the demo COPYING file and
add notices for new third-party dependencies.  Set the default
logging level to 2 (WARNING).

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1884

Modified: trunk/csp/bin/sim.ini
===================================================================
--- trunk/csp/bin/sim.ini	2006-04-08 21:10:34 UTC (rev 1883)
+++ trunk/csp/bin/sim.ini	2006-04-08 21:12:45 UTC (rev 1884)
@@ -1,7 +1,7 @@
 ; CSP configuration settings
 
 [Debug]
-LoggingLevel = 0
+LoggingLevel = 2
 Battlefield = 1
 Demeter = true
 
@@ -57,5 +57,3 @@
 IncomingBandwidth = 20000
 OutgoingBandwidth = 20000
 
-[Modules]
-StandardModules = ../modules/demeter/.bin/libdemeter.so

Modified: trunk/csp/demo/win/makedemo.py
===================================================================
--- trunk/csp/demo/win/makedemo.py	2006-04-08 21:10:34 UTC (rev 1883)
+++ trunk/csp/demo/win/makedemo.py	2006-04-08 21:12:45 UTC (rev 1884)
@@ -6,7 +6,12 @@
 import os.path
 import re
 import time
+from glob import glob
 
+def error(msg):
+	print >>sys.stderr, msg
+	sys.exit(1)
+
 USAGE = """\
 CSPSim demo generation script.
 
@@ -24,40 +29,53 @@
 # redirect csp log output if not otherwise specified.
 os.environ.setdefault('CSPLOG_FILE', 'makedemo.log')
 
-import csp
-import csp.csplib
-import csp.cspsim
+# ensure that the devpack binaries are found first in case the
+# PATH is not set properly.
+CSPDEVPACK = os.environ.get('CSPDEVPACK')
+if CSPDEVPACK:
+	CSPDEVPACK_BIN = os.path.join(CSPDEVPACK, 'bin')
+	PATH = os.environ.get('PATH', '')
+	if PATH.split(os.pathsep)[0] != CSPDEVPACK_BIN:
+		print >>sys.stderr, 'WARNING: placing %s at start of PATH' % CSPDEVPACK_BIN
+		os.environ['PATH'] = '%s;%s' % (CSPDEVPACK, os.environ.get('PATH', ''))
 
+try:
+	import csp
+	import csp.csplib
+	import csp.cspsim
+except ImportError, e:
+	error('ERROR: unable to import csp packages. %s\nHave you built everything?' % e)
+
 BASE = os.path.dirname(csp.__file__)
 DATA = os.path.join(BASE, 'data')
 BIN = os.path.join(BASE, 'bin')
 
-# not sure which if any of these and the AddPackagePath statements below are
-# needed for the new directory structure.  some experimentation will probably
-# be necessary.
+CSPSIM_BIN = os.path.join(BASE, 'cspsim', '.bin')
+CSPLIB_BIN = os.path.join(BASE, 'csplib', '.bin')
 
-#CSPLIB = os.path.join(BASE, 'csplib')
-#CSPSIM_BIN = os.path.join(BASE, 'cspsim', '.bin')
-#sys.path.append(CSPSIM_BIN)
-
 try:
 	import modulefinder
-	#modulefinder.AddPackagePath('csp.cspsim', BIN)
-	#modulefinder.AddPackagePath('csp.cspsim', CSPSIM_BIN)
-	#modulefinder.AddPackagePath('csp', CSPLIB)
-except ImportError:
-	print 'WARNING: unable to import modulefinder'
+except ImportError, e:
+	error('ERROR: unable to import modulefinder %s' % e)
 
+# modulefinder needs a bit of help to deal with the .bin __path__
+# redirections in csp.csplib and csp.cspsim.
+modulefinder.AddPackagePath('csp.cspsim', CSPSIM_BIN)
+modulefinder.AddPackagePath('csp.csplib', CSPLIB_BIN)
 
+# in addition to the package paths, sys.path needs to be tweaked
+# so that modulefinder can import the swig extensions in .bin.
+sys.path.append(CSPLIB_BIN)
+sys.path.append(CSPSIM_BIN)
+
 from distutils.core import setup
-import py2exe
 
+try:
+	import py2exe
+except ImportError, e:
+	error('ERROR: unable to import py2exe. %s\nIs it installed?' % e)
 
-def error(msg):
-	print >>sys.stderr, msg
-	sys.exit(1)
 
-
 def copy_tree(src, dst, symlinks=0, exclude=None):
 	"""Just like shutil.copytree, but allows files to be excluded based on a regexp."""
 	if isinstance(exclude, str): exclude = re.compile(exclude)
@@ -82,6 +100,7 @@
 		raise Error, errors
 
 
+# TODO force msvcrt80.dll and msvcrp80.dll to be included?
 def make_demo(version):
 	TEMPLATE = 'template'
 	DEMO = 'cspsim-demo-%s' % version
@@ -92,16 +111,24 @@
 	if os.path.exists(DEMO):
 		error('%s already exists!  Aborting.' % DEMO)
 
+	CSPDEVPACK = os.environ.get('CSPDEVPACK')
+	if CSPDEVPACK is None:
+		error('CSPDEVPACK environment variable is not set')
+	DP_BIN = os.path.join(CSPDEVPACK, 'bin')
+
 	print 'Copying data from %s to %s' % (TEMPLATE, DEMO)
 	copy_tree(TEMPLATE, DEMO, exclude=r'^\.svn$')
 
 	DIST_DIR = os.path.join(DEMO, 'bin')
 	print 'Running py2exe to create %s' % DIST_DIR
 
+	TEST_OBJECTS = os.path.join(BIN, 'test_objects.py')
+
 	opts = {
 		'py2exe': {
 			'excludes': ['dl'],
-			'dist_dir': DIST_DIR
+			'dist_dir': DIST_DIR,
+			'packages': ['encodings'],
 		}
 	}
 
@@ -110,6 +137,17 @@
 
 	setup(options=opts, console=[TARGET], data_files=[CONFIG])
 
+	# not all dependencies can be found by py2exe, so ensure that all
+	# dlls in the devpack are copied.  same for csp modules.
+	DEVPACK_DLLS = glob(os.path.join(DP_BIN, '*.dll'))
+	print os.path.join(BASE, 'modules', '*', '.bin', '*.dll')
+	MODULES = glob(os.path.join(BASE, 'modules', '*', '.bin', '*.dll'))
+	for src in MODULES + DEVPACK_DLLS:
+		dest = os.path.join(DIST_DIR, os.path.basename(src))
+		if not os.path.exists(dest) or os.path.getmtime(dest) < os.path.getmtime(src):
+			print 'Copying', src
+			shutil.copy2(src, DIST_DIR)
+
 	DATA_TARGET = os.path.join(DEMO, 'data')
 	if not os.path.exists(DATA_TARGET):
 		print 'Copying data from %s to %s' % (DATA, DATA_TARGET)

Modified: trunk/csp/demo/win/template/COPYING
===================================================================
--- trunk/csp/demo/win/template/COPYING	2006-04-08 21:10:34 UTC (rev 1883)
+++ trunk/csp/demo/win/template/COPYING	2006-04-08 21:12:45 UTC (rev 1884)
@@ -6,13 +6,13 @@
 on the forums at http://csp.sf.net/forum.
 
 CSPSim
-Copyright 2002-2005 The Combat Simulator Project
+Copyright 2002-2006 The Combat Simulator Project
 Licensed under the terms of the GNU General Public License version 2 or
 later.
 http://csp.sf.net/forum
 
-SimData
-Copyright 2002-2005 Mark Rose <mk...@us...>
+CSPLib (formerly SimData)
+Copyright 2002-2006 Mark Rose <mk...@us...>
 Licensed under the terms of the GNU General Public License version 2 or
 later.
 http://csp.sf.net/forum
@@ -68,11 +68,18 @@
 http://www.gnu.org/software/commoncpp/
 
 LibSigC++
-Copyright 2002, The libsigc++ Development Team
+Copyright 2002, the libsigc++ Development Team
 Licensed under the terms of the GNU Library General Public License version
 2 or later.
 http://libsigc.sourceforge.net/
 
+FreeType
+Copyright 2001, 2002, 2003, 2004, 2006, David Turner, Robert Wilhelm, and 
+Werner Lemberg.
+Licensed under the terms of the GNU General Public License version 2 or
+later.
+http://savannah.nongnu.org/projects/freetype
+
 zlib
 Copyright 1995-1998 Jean-loup Gailly and Mark Adler
 See LICENSES/zlib
@@ -88,3 +95,31 @@
 See LICENSES/libpng for the license.
 http://libpng.sourceforge.net/
 
+libogg
+Copyright 2002 Xiph.Org Foundation
+See LICENSES/xiph
+http://www.xiph.org/
+
+libvorbis
+Copyright 2002-2004 Xiph.Org Foundation
+See LICENSES/xiph
+http://www.xiph.org/
+
+openal
+Copyright 1999-2000 various authors (see LICENSES/openal)
+Licensed under the terms of the GNU Library General Public License version
+2 or later.
+http://www.openal.org
+
+openal++
+Copyright 2002 VRlab, Umeniversity
+Licensed under the terms of the GNU Library General Public License version
+2.1 or later.
+http://alpp.sourceforge.net
+
+osgAL
+Copyright 2004 VRlab, Umeniversity
+Licensed under the terms of the GNU Library General Public License version
+2.1 or later.
+http://www.vrlab.umu.se/research/osgAL/
+

[Csp-commits] svn:csp r1883 - in trunk/csp: . tools

[<sv...@ww...>]

Author: mkrose
Date: 2006-04-08 14:10:34 -0700 (Sat, 08 Apr 2006)
New Revision: 1883

Modified:
   trunk/csp/SConstruct
   trunk/csp/tools/build.py
Log:
Increase minimum devpack version to 0.6 and adjust paths for
the new directory layout (no 'usr' directory).

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1883

Modified: trunk/csp/SConstruct
===================================================================
--- trunk/csp/SConstruct	2006-04-08 21:07:24 UTC (rev 1882)
+++ trunk/csp/SConstruct	2006-04-08 21:10:34 UTC (rev 1883)
@@ -39,7 +39,7 @@
 
 build.CheckSConsVersion('0.96.1')
 build.CheckPythonVersion('2.2.2')
-build.DevpackConfig.SetMinimumVersion('0.5')
+build.DevpackConfig.SetMinimumVersion('0.6')
 
 
 # several global targets (e.g. 'all') are shared between copied subenvironments;

Modified: trunk/csp/tools/build.py
===================================================================
--- trunk/csp/tools/build.py	2006-04-08 21:07:24 UTC (rev 1882)
+++ trunk/csp/tools/build.py	2006-04-08 21:10:34 UTC (rev 1883)
@@ -1132,9 +1132,9 @@
 			print 'The installed devpack (%s) is too old; need version %s' % (path, version)
 			sys.exit(1)
 		DevpackConfig._checkPath(path)
-		DevpackConfig._checkPath(path, 'usr', 'bin')
-		DevpackConfig._checkPath(path, 'usr', 'lib')
-		DevpackConfig._checkPath(path, 'usr', 'include')
+		DevpackConfig._checkPath(path, 'bin')
+		DevpackConfig._checkPath(path, 'lib')
+		DevpackConfig._checkPath(path, 'include')
 		DevpackConfig.DEVPACK = path
 	_Find = staticmethod(_Find)
 
@@ -1152,16 +1152,16 @@
 			DevpackConfig._Find()
 			dp = DevpackConfig.DEVPACK
 			for dll in self._dlls:
-				self._checkPath(dp, 'usr', 'bin', dll + '.dll')
-				self._checkPath(dp, 'usr', 'lib', dll + '.lib')
+				self._checkPath(dp, 'bin', dll + '.dll')
+				self._checkPath(dp, 'lib', dll + '.lib')
 			for lib in self._libs:
-				self._checkPath(dp, 'usr', 'lib', lib + '.lib')
+				self._checkPath(dp, 'lib', lib + '.lib')
 			for header in self._headers:
 				if isinstance(header, tuple):
 					header = os.path.join(*header)
-				self._checkPath(os.path.join(dp, 'usr', 'include', header))
-			conf.env.AppendUnique(CPPPATH=[os.path.join(dp, 'usr', 'include')])
-			conf.env.AppendUnique(LIBPATH=[os.path.join(dp, 'usr', 'lib')])
+				self._checkPath(os.path.join(dp, 'include', header))
+			conf.env.AppendUnique(CPPPATH=[os.path.join(dp, 'include')])
+			conf.env.AppendUnique(LIBPATH=[os.path.join(dp, 'lib')])
 			conf.env.AppendUnique(LIBS=self._dlls + self._libs)
 		return 1
 

[Csp-commits] svn:csp r1882 - trunk/csp/bin

[<sv...@ww...>]

Author: mkrose
Date: 2006-04-08 14:07:24 -0700 (Sat, 08 Apr 2006)
New Revision: 1882

Modified:
   trunk/csp/bin/sim.py
Log:
Add a check for proper data installation, and clean up the
module import code.

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1882

Modified: trunk/csp/bin/sim.py
===================================================================
--- trunk/csp/bin/sim.py	2006-04-08 21:06:08 UTC (rev 1881)
+++ trunk/csp/bin/sim.py	2006-04-08 21:07:24 UTC (rev 1882)
@@ -28,6 +28,9 @@
 import os
 import os.path
 
+# this flag will be set to 1 after checkModuleSpace is called if
+# running as a py2exe executable.
+IS_FROZEN = 0
 
 def error(message, die=0):
 	sys.stderr.write(message + '\n')
@@ -67,22 +70,39 @@
 		     'setup.py successfully to initialize the workspace.')
 
 	global csp
+	global IS_FROZEN
 	csp = _csp
+	# check if we are running as a py2exe executable
+	IS_FROZEN = hasattr(csp, '__loader__')
 
 
+
+def checkData():
+	"""Spot check some of the data to detect common problems."""
+	DATA = os.path.join('..', 'data')
+	checks = (
+		('xml', 'theater', 'balkan.xml'),
+		('terrain', 'balkanMapElev.11-9.bmp'),
+		('images', 'moon.png'),
+		('models', 'aircraft', 'm2k', 'm2k.osg'),
+	)
+	for path in checks:
+		path = os.path.join(DATA, *list(path))
+		if not os.path.exists(path):
+			fail('Unable to find required data file: %s' % path)
+
+
 def importModules():
 	"""Import csplib and cspsim modules, checking for errors."""
 	try:
-		import csp.csplib as _csplib
+		import csp.csplib
 	except ImportError, e:
 		reportImportError(e, 'csp.csplib')
-	csp.csplib = _csplib
 
 	try:
-		import csp.cspsim as _cspsim
+		import csp.cspsim
 	except ImportError, e:
 		reportImportError(e, 'csp.cspsim')
-	csp.cspsim = _cspsim
 
 
 def reportImportError(exception, module):
@@ -165,6 +185,7 @@
 		if file.endswith('.py'): file = file[:-3]
 		try:
 			mod = __import__(file, {}, {}, [])
+			#import csp.test_objects as mod
 		except ImportError:
 			fail('Unable to import test objects file "%s"' % file)
 		try:
@@ -179,18 +200,18 @@
 	by the sim as part of the theater initialization, but this feature is not yet fully
 	implemented.  For now we load demeter and chunklod by hand at startup.
 	"""
-	if os.name == 'posix':
-		modules = [
-			'../modules/chunklod/.bin/libchunklod.so',
-			'../modules/demeter/.bin/libdemeter.so',
-		]
-	else:
-		modules = [
-			r'..\modules\chunklod\.bin\chunklod.dll',
-			r'..\modules\demeter\.bin\demeter.dll',
-		]
+	modules = ('chunklod', 'demeter')
+	extension = {
+		'posix' : '.so',
+		'nt' : '.dll',
+	}.get(os.name, '')
 	for module in modules:
-		if not csp.csplib.ModuleLoader.load(module):
+		module_path = os.path.join('..', 'modules', module, '.bin', module) + extension
+		# for windows demos, the modules are instead placed in the current directory.
+		# TODO move them to ../modules/*.dll?
+		if not os.path.exists(module_path):
+			module_path = os.path.join(module) + extension
+		if not csp.csplib.ModuleLoader.load(module_path):
 			fail('Unable to load required extension module "%s"' % module)
 
 
@@ -313,6 +334,7 @@
 	os.environ.setdefault('CSPLOG_FILE', 'sim.log')
 	os.environ.setdefault('CSPLOG_PRIORITY', '2')
 	checkModuleSpace()
+	checkData()
 	importModules()
 
 	import csp.base.app

[Csp-commits] svn:csp r1881 - trunk/csp/cspsim/sound

[<sv...@ww...>]

Author: mkrose
Date: 2006-04-08 14:06:08 -0700 (Sat, 08 Apr 2006)
New Revision: 1881

Modified:
   trunk/csp/cspsim/sound/SoundEngine.cpp
Log:
Add debug logging for SoundEngine initialization.

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1881

Modified: trunk/csp/cspsim/sound/SoundEngine.cpp
===================================================================
--- trunk/csp/cspsim/sound/SoundEngine.cpp	2006-04-08 21:05:20 UTC (rev 1880)
+++ trunk/csp/cspsim/sound/SoundEngine.cpp	2006-04-08 21:06:08 UTC (rev 1881)
@@ -24,6 +24,7 @@
 
 
 #include <csp/cspsim/sound/SoundEngine.h>
+#include <csp/csplib/util/Log.h>
 
 #include <osgAL/SoundManager>
 #include <osgAL/SoundRoot>
@@ -36,7 +37,10 @@
 
 SoundEngine &SoundEngine::getInstance() {
 	static SoundEngine *engine = 0;
-	if (!engine) engine = new SoundEngine;
+	if (!engine) {
+		CSPLOG(DEBUG, APP) << "Creating SoundEngine";
+		engine = new SoundEngine;
+	}
 	return *engine;
 }
 
@@ -52,13 +56,18 @@
 }
 
 void SoundEngine::initialize() {
+	CSPLOG(DEBUG, APP) << "SoundEngine::initialize";
 	osgAL::SoundManager *manager = getManager();
+	CSPLOG(DEBUG, APP) << "SoundEngine::initialize manager = " << manager;
 	assert(manager);
 	manager->init(32);
+	CSPLOG(DEBUG, APP) << "SoundEngine::initialize manager init";
+	CSPLOG(DEBUG, APP) << "SoundEngine::initialize env = " << manager->getEnvironment();
 	manager->getEnvironment()->setDistanceModel(openalpp::InverseDistanceClamped);
 	manager->getEnvironment()->setDopplerFactor(0.3);  // full doppler produces artifacts
 	manager->setMaxVelocity(200);
 	//manager->setClampVelocity(true);  (not available in 20041121-3 debian package)
+	CSPLOG(DEBUG, APP) << "SoundEngine::initialize done";
 }
 
 void SoundEngine::shutdown() {

[Csp-commits] svn:csp r1880 - trunk/csp/cspsim

[<sv...@ww...>]

Author: mkrose
Date: 2006-04-08 14:05:20 -0700 (Sat, 08 Apr 2006)
New Revision: 1880

Modified:
   trunk/csp/cspsim/Engine.cpp
Log:
Tweak debug logging for engine sound initialization.

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1880

Modified: trunk/csp/cspsim/Engine.cpp
===================================================================
--- trunk/csp/cspsim/Engine.cpp	2006-04-08 21:02:55 UTC (rev 1879)
+++ trunk/csp/cspsim/Engine.cpp	2006-04-08 21:05:20 UTC (rev 1880)
@@ -86,21 +86,22 @@
 
 void Engine::bindSounds(SoundModel* model, ResourceBundle* bundle) {
 	assert(model);
-	CSPLOG(INFO, AUDIO) << "Engine::bindSounds";
+	CSPLOG(DEBUG, AUDIO) << "Engine::bindSounds";
 	if (bundle) {
-		CSPLOG(INFO, AUDIO) << "Engine::bindSounds have bundle";
+		CSPLOG(DEBUG, AUDIO) << "Engine::bindSounds have bundle";
 		Ref<const SoundSample> sample(bundle->getSoundSample("engine"));
 		m_EngineSound = SoundEffect::ExternalSound(sample, model);
 		if (m_EngineSound.valid()) {
-			CSPLOG(INFO, AUDIO) << "Engine::bindSounds have sound";
+			CSPLOG(DEBUG, AUDIO) << "Engine::bindSounds have sound";
 			m_EngineSound->state()->setPosition(toOSG(m_EngineOffset));
 			m_EngineSound->state()->setDirection(toOSG(m_ThrustDirection));
-			CSPLOG(INFO, AUDIO) << "engine sound position " << m_EngineOffset;
-			CSPLOG(INFO, AUDIO) << "engine sound direction " << m_ThrustDirection;
+			CSPLOG(DEBUG, AUDIO) << "engine sound position " << m_EngineOffset;
+			CSPLOG(DEBUG, AUDIO) << "engine sound direction " << m_ThrustDirection;
 			m_EngineSound->state()->apply();
 			m_EngineSound->play();  // TODO rpm dependence
 		}
 	}
+	CSPLOG(DEBUG, AUDIO) << "Engine::bindSounds exit";
 }
 
 void Engine::updateThrust() {

[Csp-commits] svn:csp r1879 - trunk/csp

[<sv...@ww...>]

Author: mkrose
Date: 2006-04-08 14:02:55 -0700 (Sat, 08 Apr 2006)
New Revision: 1879

Modified:
   trunk/csp/SConstruct
Log:
Change configuration scripts to used libjpeg from the devpack
under windows.  Add configuration checks for libogg and
libvorbisfile.  Set the python libpath under windows.

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1879

Modified: trunk/csp/SConstruct
===================================================================
--- trunk/csp/SConstruct	2006-04-08 20:58:06 UTC (rev 1878)
+++ trunk/csp/SConstruct	2006-04-08 21:02:55 UTC (rev 1879)
@@ -63,7 +63,7 @@
 build.ExternalLibrary(
 	name = 'jpeg',
 	config = [
-		build.WindowsLibConfig('libjpeg'),
+		build.DevpackConfig(libs='libjpeg'),
 		build.WindowsLibConfig('user32'),
 	])
 
@@ -88,7 +88,8 @@
 		build.PkgConfig(package='openalpp', version='0.2'),
 		build.PkgConfig(package='vorbis', version='1.1.0'),
 		build.DevpackConfig(dlls='openalpp', headers=[('openalpp', 'sounddata.h')]),
-		build.DevpackConfig(dlls='vorbis', headers=[('vorbis', 'vorbisfile.h')]),
+		build.DevpackConfig(dlls=['libvorbis', 'libvorbisfile'], headers=[('vorbis', 'vorbisfile.h')]),
+		build.DevpackConfig(dlls='libogg', headers=[('ogg', 'ogg.h')]),
 	])
 
 build.ExternalLibrary(
@@ -156,6 +157,9 @@
 		env.AppendUnique(CPPDEFINES=Split('WIN32 __WIN32__ _USRDLL _DLL NDEBUG'))
 		env.AppendUnique(LINKFLAGS=Split('/INCREMENTAL:NO /RELEASE /nologo'))
 		env.AppendUnique(SHLINKFLAGS=Split('/INCREMENTAL:NO /NODEFAULTLIB:LIBCMT /RELEASE /nologo'))
+		# FIXME why is LIBPATH being overwritten?  quick hack for now is to add the path to linkflags.
+		env.AppendUnique(LIBPATH=[build.PYTHON_LIBRARY])
+		env.AppendUnique(LINKFLAGS=['/LIBPATH:%s' % build.PYTHON_LIBRARY])
 		env.CopyEnvironment(Split('PATH INCLUDE LIB')) # FIXME
 
 	def customize_linux(self, env):