[GRASS-dev] [GRASS GIS] #1946: wingrass: demolocation includes .svn/ cruft

[GRASS GIS]

#1946: wingrass: demolocation includes .svn/ cruft
-----------------------+----------------------------------------------------
 Reporter:  hamish     |       Owner:  grass-dev@…              
     Type:  defect     |      Status:  new                      
 Priority:  trivial    |   Milestone:  6.4.3                    
Component:  Packaging  |     Version:  svn-develbranch6         
 Keywords:  wingrass   |    Platform:  MSWindows XP             
      Cpu:  x86-32     |  
-----------------------+----------------------------------------------------

Comment(by hamish):

 Replying to [comment:12 glynn]:
 > Replying to [ticket:1946 hamish]:
 > > the nightly build wingrass installers ship '.svn/' files for the
 demolocation.
 >
 > I think that this isn't restricted to Windows; the "builddemolocation"
 > target in the top-level Makefile simply copies the demolocation
 directory
 > to dist.<arch> (using "tar c ... | tar x ...").

 that is correct, it's in all 'make install' for svn builds.

 > In 7.x, the demolocation directory has a Makefile which explicitly
 > creates target directories and copies files with $(INSTALL_DATA).

 since there's no `Other.make` in grass6 I'd just go with the cheap & dirty
 approach-of-least-change:

 {{{
 Index: Makefile
 ===================================================================
 --- Makefile    (revision 55903)
 +++ Makefile    (working copy)
 @@ -389,6 +389,13 @@
  builddemolocation:
         test -d ${ARCH_DISTDIR} || ${MAKE_DIR_CMD} ${ARCH_DISTDIR}
         -tar cBf - demolocation | (cd ${ARCH_DISTDIR}/ ; tar xBfo - )
 2>/dev/null
 +       -(cd ${ARCH_DISTDIR}/demolocation ; \
 +               rm -rf ".svn" ; \
 +               rm -rf "PERMANENT/.svn" ; \
 +               rm -rf "PERMANENT/vector/.svn" ; \
 +               rm -rf "PERMANENT/vector/mysites/.svn" ; \
 +               rm -rf "PERMANENT/vector/point/.svn" ; \
 +               rm -rf "PERMANENT/dbf/.svn" )
         @ echo "GISDBASE: ${RUN_GISBASE}" > ${RUN_GISRC}
         @ echo "LOCATION_NAME: demolocation" >> ${RUN_GISRC}
         @ echo "MAPSET: PERMANENT" >> ${RUN_GISRC}
 }}}


 I notice that the last part creates a file called demolocation/.grassrc65,
 when it should perhaps be .grassrc6? That's named by Platform.make.in:
 {{{
 RUN_GISRC           =
 ${ARCH_DISTDIR}/demolocation/.grassrc${GRASS_VERSION_MAJOR}${GRASS_VERSION_MINOR}
 }}}

 (RUN_GISRC is used by e.g. Man.make  at build time, with the GISRC=
 override set to the same variable, so it doesn't matter much what it's
 called)


 ?,
 Hamish

-- 
Ticket URL: <https://trac.osgeo.org/grass/ticket/1946#comment:14>
GRASS GIS <http://grass.osgeo.org>