yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 1711
committer: Václav Šmilauer <vaclav@flux>
branch nick: trunk
timestamp: Thu 2009-08-20 15:48:46 +0200
message:
  Fix GTS features (thanks for spotting that; we need regression tests for all the modules)
modified:
  py/SConscript
  scripts/pbuilder-test-distributions.sh


--
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 'py/SConscript'
--- py/SConscript	2009-08-10 10:32:23 +0000
+++ py/SConscript	2009-08-20 13:48:46 +0000
@@ -15,7 +15,7 @@
 			]),
 		env.SharedLibrary('_packPredicates',['_packPredicates.cpp'],SHLIBPREFIX='',
 			# link to the symlink to the python module (created in lib/SConstruct; see explanation there)
-			LIBS=env['LIBS']+(['_gts__python-module'] if 'GTS' in env['features'] else []),
+			LIBS=env['LIBS']+(['_gts__python-module'] if 'YADE_GTS' in env['CPPDEFINES'] else []),
 			),
 		env.SharedLibrary('_packSpheres',['_packSpheres.cpp'],SHLIBPREFIX='',LIBS=env['LIBS']+[
 			linkPlugins(['Shop','SpherePack']),
@@ -43,7 +43,7 @@
 		env.SharedLibrary('boost_python_indexing_suite_v2',['3rd-party/boost-python-indexing-suite-v2-noSymlinkHeaders/indexing_slice.cpp','3rd-party/boost-python-indexing-suite-v2-noSymlinkHeaders/python_iterator.cpp'])
 	])
 
-	if 'GTS' in env['features']:
+	if 'YADE_GTS' in env['CPPDEFINES']:
 		env.Install('$PREFIX/lib/yade$SUFFIX/py/gts',[
 			env.SharedLibrary('_gts',['3rd-party/pygts-0.3.1/cleanup.c','3rd-party/pygts-0.3.1/edge.c','3rd-party/pygts-0.3.1/face.c','3rd-party/pygts-0.3.1/object.c','3rd-party/pygts-0.3.1/point.c','3rd-party/pygts-0.3.1/pygts.c','3rd-party/pygts-0.3.1/segment.c','3rd-party/pygts-0.3.1/surface.c','3rd-party/pygts-0.3.1/triangle.c','3rd-party/pygts-0.3.1/vertex.c'],SHLIBPREFIX='',CPPDEFINES=env['CPPDEFINES']+['PYGTS_HAS_NUMPY']),
 			env.File('3rd-party/pygts-0.3.1/__init__.py'),

=== modified file 'scripts/pbuilder-test-distributions.sh'
--- scripts/pbuilder-test-distributions.sh	2009-08-20 13:40:30 +0000
+++ scripts/pbuilder-test-distributions.sh	2009-08-20 13:48:46 +0000
@@ -17,4 +17,4 @@
 	sudo pbuilder --build --basetgz $BASETGZ --debbuildopts "-j5 -Zlzma" $DSC  || FAILED="$FAILED $DIST"
 done
 rm -rf $TMP
-if [ '$FAILED' ]; then echo "Build failed for $FAILED"; exit 1; fi
+if [ '$FAILED' ]; then echo "***************** Build failed for $FAILED"; exit 1; fi