[GRASS5] r.terraflow

Laura Toma ltoma at bowdoin.edu
Thu Sep 18 15:11:44 EDT 2003


I downloaded grass-5.0.3rc2 and looked at the code in 
src.contrib.DUKE/r.terraflow/ and there dont seem to be many changes:

$diff grass-5.0.3rc2/src.contrib/DUKE/r.terraflow/Gmakefile 
~/r.terraflow.1.5/Gmakefile
45c45
< CFLAGS += -Wall -I$(IOSTREAM_INC)
-------
 > CFLAGS += -Wall -I$(IOSTREAM_INC) -Wno-deprecated
$


$diff grass-5.0.3rc2/src.contrib/DUKE/r.terraflow/Gmakefile 
~/r.terraflow.1.4/Gmakefile
59,60c59,60
<            -mkdir $(OBJARCH)/FLOAT ; true
<            -mkdir $(OBJARCH)/SHORT ; true
-------
<            -mkdir $(OBJARCH)/FLOAT
<            -mkdir $(OBJARCH)/FLOAT
$

Are these all the fixes?  Where is the patch located? How can i look at 
the fixes? Do I need to compile grass to see them?  Does r.terraflow get 
compiled when installing grass, or,  one has to run Gmakefile in 
r.terraflwo directory (this is the way it used to be) ?

thanks,
Laura

Glynn Clements wrote:

>Laura Toma wrote:
>
>  
>
>>I am not sure I understand what the problem is.. This is the update 
>>about r.terraflow:
>>-version 1.4 does not compile with gcc3.2.
>>-version 1.5 does.
>>-functionality is the same, some files in 1.5 have changed to gcc3.2 
>>requirements
>>-the only difference in the Gmakefiles  is that 1.5 contains the 
>>additional compile flag Wno-deprecated
>>    
>>
>
>It appears that Hamish made the patch between the version in GRASS CVS
>and the 1.5 tarball. The CVS version includes some fixes to the
>original version (presumably 1.4), so his patch would effectively undo
>those fixes.
>
>What should be done is to produce a patch between the unmodified 1.4
>and 1.5 versions, then to apply that patch to the CVS version. That
>should produce a version which includes both the fixes and the
>1.4->1.5 changes.
>
>  
>





More information about the grass-dev mailing list