← Back to team overview

yade-dev team mailing list archive

  1. yade-dev team
  2. Mailing list archive
  3. Message #01456

[svn] r1855 - in trunk: . debian doc py scripts

  Thread Previous • Date Previous • • Thread Next 
Author: eudoxos
Date: 2009-07-11 18:09:39 +0200 (Sat, 11 Jul 2009)
New Revision: 1855

Removed:
   trunk/doc/removed/
Modified:
   trunk/SConstruct
   trunk/debian/control-template
   trunk/debian/rules
   trunk/doc/Doxyfile
   trunk/py/SConscript
   trunk/scripts/debian-prep
Log:
1. Remove doc/removed, it is in SVN history
2. Tune debian scripts to install docs+examples+scripts instead of headers (targets https://bugs.launchpad.net/yade/+bug/398174, but not yet finished)
3. Add depends on python-numpy instead of python-scientific packages for debian
4. Add ../py directory to doxygen (targets bug #398190)


Modified: trunk/SConstruct
===================================================================
--- trunk/SConstruct	2009-07-11 13:52:26 UTC (rev 1854)
+++ trunk/SConstruct	2009-07-11 16:09:39 UTC (rev 1855)
@@ -370,6 +370,7 @@
 	env.Replace(CXXCOMSTR='C ${SOURCES}', # → ${TARGET.file}')
 		CCOMSTR='C ${SOURCES}',
 		SHCXXCOMSTR='C ${SOURCES}', 
+		SHCCCOMSTR='C ${SOURCES}', 
 		SHLINKCOMSTR='L ${TARGET.file}',
 		LINKCOMSTR='L ${TARGET.file}',
 		INSTALLSTR='⇒ $TARGET',
@@ -556,4 +557,9 @@
 			print "Deleting extra plugin", ff
 			os.remove(ff)
 
+#################################################################################
+#### DOCUMENTATION ##############################################################
+#################################################################################
+env.Install('$PREFIX/share/doc/yade$SUFFIX-doc/',['examples','scripts','doc'])
+
 #Progress('.', interval=100, file=sys.stderr)

Modified: trunk/debian/control-template
===================================================================
--- trunk/debian/control-template	2009-07-11 13:52:26 UTC (rev 1854)
+++ trunk/debian/control-template	2009-07-11 16:09:39 UTC (rev 1855)
@@ -2,13 +2,13 @@
 Section: x11
 Priority: optional
 Maintainer: Vaclav Smilauer <eudoxos@xxxxxxxx>
-Build-Depends: debhelper (>= 5), scons, libqt3-mt-dev, qt3-dev-tools, freeglut3-dev, libboost-dev (>=1.34), libboost-date-time-dev (>=1.34), libboost-filesystem-dev (>=1.34), libboost-thread-dev (>=1.34), libboost-regex-dev (>=1.34), libboost-python-dev (>=1.34), libboost-iostreams-dev (>=1.34), liblog4cxx9-dev, docbook-to-man, python-scientific, libsqlite3-dev
+Build-Depends: debhelper (>= 5), scons, libqt3-mt-dev, qt3-dev-tools, freeglut3-dev, libboost-dev (>=1.34), libboost-date-time-dev (>=1.34), libboost-filesystem-dev (>=1.34), libboost-thread-dev (>=1.34), libboost-regex-dev (>=1.34), libboost-python-dev (>=1.34), libboost-iostreams-dev (>=1.34), liblog4cxx9-dev, docbook-to-man, python-scientific, libsqlite3-dev, libgts-dev, g++(>4.0)
 Standards-Version: 3.7.2
 
 Package: yade@_VERSION@
 Architecture: any
 Provides: yade@SNAPSHOT@
-Depends: ${shlibs:Depends}, ${misc:Depends}, python-scientific, ipython, python-matplotlib
+Depends: ${shlibs:Depends}, ${misc:Depends}, python-numpy, ipython, python-matplotlib
 Description: Platform for dynamical modeling.
  Yet Another Dynamic Engine. etc.
  .
@@ -17,20 +17,18 @@
 Package: yade@_VERSION@-dbg
 Architecture: any
 Provides: yade@SNAPSHOT@-dbg
-Depends: ${shlibs:Depends}, ${misc:Depends}, python-scientific, ipython, gdb, python-matplotlib
+Depends: ${shlibs:Depends}, ${misc:Depends}, python-numpy, ipython, gdb, python-matplotlib
 Description: Platform for dynamical modeling.
  Yet Another Dynamic Engine. etc.
  .
  This package contains debug build of yade.
 
-
-Package: yade@_VERSION@-dev
+Package: yade@_VERSION@-doc
 Architecture: all
-Provides: yade@SNAPSHOT@-dev
+Provides: yade@SNAPSHOT@-doc
 Recommends: yade@_VERSION@ | yade@_VERSION@-dbg
-Depends: pkg-config
+Depends: 
 Description: Platform for dynamical modeling.
  Yet Another Dynamic Engine. etc.
  .
- This package contains headers for yade.
-
+ This package contains examples, test scripts and documentation

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2009-07-11 13:52:26 UTC (rev 1854)
+++ trunk/debian/rules	2009-07-11 16:09:39 UTC (rev 1855)
@@ -57,14 +57,15 @@
 	### WARNING: !!!! with jobs>1, fakeroot may hang; 2 workarounds:
 	###   (a) use fakeroot-tcp instead of fakeroot
 	###   (b) say jobs=1
-	#install headers
-	NO_SCONS_GET_RECENT= scons jobs=1 buildPrefix=debian runtimePREFIX=/usr PREFIX=debian/yade${_VERSION}-dev/usr variant='' version=${VERSION} exclude=realtime-rigidbody,mass-spring,snow debian/yade${_VERSION}-dev/usr/include
 	#debug build
-	NO_SCONS_GET_RECENT= scons jobs=1 PREFIX=debian/yade${_VERSION}-dbg/usr variant=-dbg optimize=0 debug=1
+	NO_SCONS_GET_RECENT= scons jobs=4 buildPrefix=debian runtimePREFIX=/usr version=${VERSION} features=GTS,python,log4cxx,openGL openmp=True exclude=realtime-rigidbody,mass-spring,snow,fem PREFIX=debian/yade${_VERSION}-dbg/usr variant=-dbg optimize=0 debug=1 
 	#optimized build
-	NO_SCONS_GET_RECENT= scons jobs=1 PREFIX=debian/yade${_VERSION}/usr variant="" optimize=1 debug=0
+	NO_SCONS_GET_RECENT= scons jobs=4 PREFIX=debian/yade${_VERSION}/usr variant='' optimize=1 debug=0
+	#install platform-independent files (docs, scripts, examples)
+	NO_SCONS_GET_RECENT= scons PREFIX=debian/yade${_VERSION}/usr debian/yade${_VERSION}/usr/share/doc/yade-${_VERSION}-doc
 
 
+
 # Build architecture-independent files here.
 binary-indep: build install
 # We have nothing to do by default.

Modified: trunk/doc/Doxyfile
===================================================================
--- trunk/doc/Doxyfile	2009-07-11 13:52:26 UTC (rev 1854)
+++ trunk/doc/Doxyfile	2009-07-11 16:09:39 UTC (rev 1855)
@@ -547,8 +547,11 @@
 INPUT                  = ../core/ \
                          ../extra/ \
                          ../gui/ \
-                         ../pkg/
+                         ../pkg/ \
+								 ../py/
 
+								# ../lib/ ... ?
+
 # This tag can be used to specify the character encoding of the source files 
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is 
 # also the default input encoding. Doxygen uses libiconv (or the iconv built 

Modified: trunk/py/SConscript
===================================================================
--- trunk/py/SConscript	2009-07-11 13:52:26 UTC (rev 1854)
+++ trunk/py/SConscript	2009-07-11 16:09:39 UTC (rev 1855)
@@ -11,7 +11,9 @@
 			# if we compile with GTS, link to the python module, as inGtsSurface uses some of its symbols.
 			# because the module doesn't have the lib- suffix, we put it directly to SHLINKFLAGS
 			# using the -l: syntax (see man ld) and declare the dependency below
-			SHLINKFLAGS=env['SHLINKFLAGS']+(['-l:$PREFIX/lib/yade$SUFFIX/py/gts/_gts.so'] if 'GTS' in env['features'] else [])),
+			SHLINKFLAGS=env['SHLINKFLAGS']+(['-l:$PREFIX/lib/yade$SUFFIX/py/gts/_gts.so'] if 'GTS' in env['features'] else []),
+			RPATH=env['RPATH']+(['$PREFIX/lib/yade$SUFFIX/py/gts'] if 'GTS' in env['features'] else []),	
+			),
 		env.SharedLibrary('_packSpheres',['_packSpheres.cpp'],SHLIBPREFIX='',LIBS=env['LIBS']+['Shop']),
 		env.File('utils.py'),
 		env.File('eudoxos.py'),

Modified: trunk/scripts/debian-prep
===================================================================
--- trunk/scripts/debian-prep	2009-07-11 13:52:26 UTC (rev 1854)
+++ trunk/scripts/debian-prep	2009-07-11 16:09:39 UTC (rev 1855)
@@ -24,7 +24,7 @@
 cat <<EOF > debian/changelog
 yade$_VERSION (1) $DISTRIBUTION; urgency=low
 
-  * Mandatory debian changelog entry
+  * Automatic debian changelog entry for yade$_VERSION
 
  -- Václav Šmilauer <eudoxos@xxxxxxxx>  $DEBDATE
 EOF
  Thread Previous • Date Previous • • Thread Next