Hey Katya,
I incorporated your unittests changes into the template Makefile, that should make it easier to update the Makefiles of any lib you are adding unittests too. I don't know if you've used opendiff/FileMerge.app much, but it makes things like updating a libs Makefile from the template really easy. You can use 'meld' on GNU/Linux or 'opendiff' on Mac OS X, which opens FileMerge.app. Here's an example with opendiff:
opendiff Makefile ../template/Makefile -ancestor ~/code/pure-data/tags/externals/template/1.0.11/Makefile -merge Makefile
Makefile = the file to be updated ../template/Makefile = the most recent template Makefile ~/code/pure-data/tags/externals/template/1.0.11/Makefile = the "ancestor" template Makefile, use the version that is on the top of the current 'Makefile' and replace 1.0.11.
Basically, you'll want to choose the left side for the variables at the top (SOURCES, PD_OBJECTS, EXTRA_DIST, etc.) And everything else should be pointing right. Then hit Save, and it'll save into 'Makefile'.
.hc
----------------------------------------------------------------------------
Access to computers should be unlimited and total. - the hacker ethic
On Thu, Nov 17, 2011 at 5:34 AM, Hans-Christoph Steiner hans@at.or.at wrote:
I incorporated your unittests changes into the template Makefile, that should make it easier to update the Makefiles of any lib you are adding unittests too.
Thanks. I'd already hacked a simple patch file from the diff between old and new smlib Makefile, to patch the non-user section of any template-style Makefile. This seems to work well but I don't know where to store that patch file in svn.
Katja
On Nov 17, 2011, at 6:24 AM, katja wrote:
On Thu, Nov 17, 2011 at 5:34 AM, Hans-Christoph Steiner hans@at.or.at wrote:
I incorporated your unittests changes into the template Makefile, that should make it easier to update the Makefiles of any lib you are adding unittests too.
Thanks. I'd already hacked a simple patch file from the diff between old and new smlib Makefile, to patch the non-user section of any template-style Makefile. This seems to work well but I don't know where to store that patch file in svn.
The problem there is that it then is a version out of sync with the template because it'll have some features of 1.0.12, but not all. If you want to keep doing it that way, I just ask that you mark the version at the top of the Makefile something like 1.0.9-unittests
.hc
----------------------------------------------------------------------------
"[T]he greatest purveyor of violence in the world today [is] my own government." - Martin Luther King, Jr.
-
Hans-Christoph Steiner -
katja