[MOAB-dev] r3927 - in MOAB/trunk: MeshFiles MeshFiles/unittest test

[Jason Kraftcheck]

A few other thoughts about automake and mesh files:

o I added the files in the top MeshFiles directory to EXTRA_DIST as
  a part of the check-in below.  But perhaps you didn't want the
  mesh files that are not required for unit tests or examples to be
  included in the tarball?

o We'll probably eventually want a MeshFiles/examples dir too

o Rather than putting all the files in an EXTRA_DIST variable in a
  Makefile.am in MeshFiles/unittests (and MeshFiles/examples, and
  MeshFiles/unittests/io), it should work to remove those from
  the top-level subdirs variable, get rid of the makefiles entirely,
  and just put 'EXTRA_DIST = unittests examples' in MeshFiles/Makefile.am

- jason



Tim Tautges wrote:
> Thanks Jason, that was definitely my bad.
> 
> - tim
> 
> On 05/20/2010 09:27 AM, kraftche at cae.wisc.edu wrote:
>> Author: kraftche
>> Date: 2010-05-20 09:27:49 -0500 (Thu, 20 May 2010)
>> New Revision: 3927
>>
>> Modified:
>>     MOAB/trunk/MeshFiles/Makefile.am
>>     MOAB/trunk/MeshFiles/unittest/Makefile.am
>>     MOAB/trunk/test/Makefile.am
>> Log:
>> uncompress exodus files used by MBTest into ${top_builddir}/test
>> because it \
>> a) fixes failing moab_test and \
>> b) keeps the the source dir read-only when it is not the same as the
>> build dir
>>
>> Modified: MOAB/trunk/MeshFiles/Makefile.am
>> ===================================================================
>> --- MOAB/trunk/MeshFiles/Makefile.am    2010-05-20 14:26:06 UTC (rev
>> 3926)
>> +++ MOAB/trunk/MeshFiles/Makefile.am    2010-05-20 14:27:49 UTC (rev
>> 3927)
>> @@ -1 +1,2 @@
>>   SUBDIRS = unittest
>> +EXTRA_DIST = singlecyl.cub cinglecyl.h5m README
>>
>> Modified: MOAB/trunk/MeshFiles/unittest/Makefile.am
>> ===================================================================
>> --- MOAB/trunk/MeshFiles/unittest/Makefile.am    2010-05-20 14:26:06
>> UTC (rev 3926)
>> +++ MOAB/trunk/MeshFiles/unittest/Makefile.am    2010-05-20 14:27:49
>> UTC (rev 3927)
>> @@ -22,7 +22,3 @@
>>             ptest.cub \
>>                 64bricks_512hex.h5m
>>
>> -CLEANFILES = mb_big_test.g \
>> -             cell1.gen \
>> -             cell2.gen
>> -
>>
>> Modified: MOAB/trunk/test/Makefile.am
>> ===================================================================
>> --- MOAB/trunk/test/Makefile.am    2010-05-20 14:26:06 UTC (rev 3926)
>> +++ MOAB/trunk/test/Makefile.am    2010-05-20 14:27:49 UTC (rev 3927)
>> @@ -60,9 +60,9 @@
>>
>>   moab_test_SOURCES = MBTest.cpp
>>   moab_test_DEPENDENCIES = \
>> -    $(top_srcdir)/MeshFiles/unittest/mb_big_test.g \
>> -    $(top_srcdir)/MeshFiles/unittest/cell1.gen \
>> -    $(top_srcdir)/MeshFiles/unittest/cell2.gen \
>> +    mb_big_test.g \
>> +    cell1.gen \
>> +    cell2.gen \
>>       $(LDADD)
>>
>>   homxform_test_SOURCES = $(top_srcdir)/src/HomXform.cpp
>> @@ -131,16 +131,20 @@
>>
>>   bsp_tree_poly_test_SOURCES = bsp_tree_poly_test.cpp
>>
>> -$(MESHDIR)/mb_big_test.g: $(MESHDIR)/mb_big_test.g.gz
>> +mb_big_test.g: $(MESHDIR)/mb_big_test.g.gz
>>       $(ZCAT) $<  >  $@
>>
>> -$(MESHDIR)/cell1.gen: $(MESHDIR)/cell1.gen.gz
>> +cell1.gen: $(MESHDIR)/cell1.gen.gz
>>       $(ZCAT) $<  >  $@
>>
>> -$(MESHDIR)/cell2.gen: $(MESHDIR)/cell2.gen.gz
>>
> 


-- 
"A foolish consistency is the hobgoblin of little minds" - Ralph Waldo Emerson