yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 1795
committer: Václav Šmilauer <eudoxos@xxxxxxxx>
branch nick: trunk
timestamp: Wed 2009-11-18 15:06:42 +0100
message:
  Remove 'deprecated' features from SCons files since they're not in the codebase anymore.
modified:
  SConstruct
  core/SConscript
  gui/SConscript


--
lp:yade
https://code.launchpad.net/~yade-dev/yade/trunk

Your team Yade developers is subscribed to branch lp:yade.
To unsubscribe from this branch go to https://code.launchpad.net/~yade-dev/yade/trunk/+edit-subscription.

=== modified file 'SConstruct'
--- SConstruct	2009-11-18 11:26:46 +0000
+++ SConstruct	2009-11-18 14:06:42 +0000
@@ -138,7 +138,7 @@
 	ListVariable('exclude','Yade components that will not be built','none',names=['qt3','gui','extra','common','dem','lattice','snow']),
 	EnumVariable('PGO','Whether to "gen"erate or "use" Profile-Guided Optimization','',['','gen','use'],{'no':'','0':'','false':''},1),
 	# OK, dummy prevents bug in scons: if one selects all, it says all in scons.config, but without quotes, which generates error.
-	ListVariable('features','Optional features that are turned on','python,log4cxx,opengl,gts,openmp',names=['opengl','python','log4cxx','cgal','openmp','gts','vtk','deprecated','shape']),
+	ListVariable('features','Optional features that are turned on','python,log4cxx,opengl,gts,openmp',names=['opengl','python','log4cxx','cgal','openmp','gts','vtk','shape']),
 	('jobs','Number of jobs to run at the same time (same as -j, but saved)',4,None,int),
 	#('extraModules', 'Extra directories with their own SConscript files (must be in-tree) (whitespace separated)',None,None,Split),
 	('buildPrefix','Where to create build-[version][variant] directory for intermediary files','..'),

=== modified file 'core/SConscript'
--- core/SConscript	2009-11-15 09:32:52 +0000
+++ core/SConscript	2009-11-18 14:06:42 +0000
@@ -25,8 +25,7 @@
 			'TimeStepper.cpp',
 			'yade.cpp',
 			'containers/BodyVector.cpp',
-			'containers/InteractionVecMap.cpp',
-			]+(['containers/BodyRedirectionVector.cpp',] if 'deprecated' in env['features'] else [])
+			'containers/InteractionVecMap.cpp']
 			),
 		LIBS=env['LIBS']+[
 			'yade-support',

=== modified file 'gui/SConscript'
--- gui/SConscript	2009-11-17 08:55:09 +0000
+++ gui/SConscript	2009-11-18 14:06:42 +0000
@@ -17,12 +17,10 @@
 				'qt3/QtGeneratedSimulationController.ui',
 				'qt3/QtGeneratedMessageDialog.ui',
 				'qt3/YadeQtGeneratedMainWindow.ui',
-				'qt3/QtFileGeneratorController.ui',
-				]+(['qt3/QtSimulationPlayer.cpp','qt3/GLSimulationPlayerViewer.cpp','qt3/QtGeneratedSimulationPlayer.ui',] if 'deprecated' in env['features'] else [])
-				,
+				'qt3/QtFileGeneratorController.ui'],
 			LIBS=(['PythonUI'] if 'YADE_PYTHON' in env['CPPDEFINES'] else [])+[
 				'yade-serialization-qt',
-				linkPlugins(['GravityEngines','OpenGLRenderingEngine','PositionOrientationRecorder']+(['FilterEngine'] if 'deprecated' in env['features'] else [])),
+				linkPlugins(['GravityEngines','OpenGLRenderingEngine','PositionOrientationRecorder']),
 				'$QGLVIEWER_LIB'],
 			CPPPATH=env['CPPPATH']+['qt3']
 		),
@@ -32,8 +30,8 @@
 	### HACK that works around https://bugs.launchpad.net/yade/+bug/406343
 	### (not clear why scons is not picking up the dependency automatically, though)
 	###
-	#gens=['$buildDir/gui/qt3/'+h for h in 'QtGeneratedSimulationController.h','QtGeneratedMessageDialog.h','YadeQtGeneratedMainWindow.h','QtFileGeneratorController.h']+(['QtGeneratedSimulationPlayer.h'] if 'deprecated' in env['features'] else [])
-	#env.Depends(['qt3/FileDialog.cpp','qt3/GLViewer.cpp','qt3/MessageDialog.cpp','qt3/QtFileGenerator.cpp','qt3/QtGUI.cpp','qt3/QtGUIPreferences.cpp','qt3/SimulationController.cpp','qt3/YadeQtMainWindow.cpp','qt3/YadeCamera.cpp']+(['qt3/GLSimulationPlayerViewer.cpp','qt3/QtSimulationPlayer.cpp'] if 'deprecated' in env['features'] else []),gens)
+	#gens=['$buildDir/gui/qt3/'+h for h in 'QtGeneratedSimulationController.h','QtGeneratedMessageDialog.h','YadeQtGeneratedMainWindow.h','QtFileGeneratorController.h']
+	#env.Depends(['qt3/FileDialog.cpp','qt3/GLViewer.cpp','qt3/MessageDialog.cpp','qt3/QtFileGenerator.cpp','qt3/QtGUI.cpp','qt3/QtGUIPreferences.cpp','qt3/SimulationController.cpp','qt3/YadeQtMainWindow.cpp','qt3/YadeCamera.cpp'],gens)
 
 import os.path