Sfoglia il codice sorgente

svn refs changed to git (#93)

Markus Neteler 5 anni fa
parent
commit
a157e45d35

+ 1 - 1
db/drivers/mysql/grass-mesql.html

@@ -83,6 +83,6 @@ Radim Blazek
 
 <hr class="header">
 <p><a href="index.html">Main index</a> - <a href="database.html">Database index</a> - <a href="topics.html">Topics index</a> - <a href="keywords.html">Keywords Index</a> - <a href="full_index.html">Full index</a></p>
-<p>&copy; 2003-2013 <a href="http://grass.osgeo.org">GRASS Development Team</a>, GRASS GIS 7.0.svn Reference Manual</p>
+<p>&copy; 2003-2019 <a href="https://grass.osgeo.org">GRASS Development Team</a>, GRASS GIS 7.9 Reference Manual</p>
 </body>
 </html>

+ 1 - 1
gui/wxpython/image2target/ii2t_gis_set.py

@@ -108,7 +108,7 @@ class GRASSStartup(wx.Frame):
         versionFile.close()
         try:
             grassVersion, grassRevision = versionLine.split(' ', 1)
-            if grassVersion.endswith('svn'):
+            if grassVersion.endswith('dev'):
                 grassRevisionStr = ' (%s)' % grassRevision
             else:
                 grassRevisionStr = ''

+ 1 - 1
gui/wxpython/image2target/ii2t_menustrings.py

@@ -250,7 +250,7 @@ menustrings_menudata.LayerManagerMenuData = [
     _('Converts coordinates from one projection to another (cs2cs frontend).'),
     _('Addons extensions'),
     _('Install extension from addons'),
-    _('Installs new extension from GRASS AddOns SVN repository.'),
+    _('Installs new extension from GRASS AddOns repository.'),
     _('Manage installed extension'),
     _('Updates or removes installed GRASS AddOns extension(s).'),
     _('Preferences'),

+ 1 - 1
gui/wxpython/lmgr/frame.py

@@ -1797,7 +1797,7 @@ class GMFrame(wx.Frame):
         dlg.Show()
 
     def OnInstallExtension(self, event):
-        """Install extension from GRASS Addons SVN repository"""
+        """Install extension from GRASS Addons repository"""
         from modules.extensions import InstallExtensionWindow
         win = InstallExtensionWindow(
             self, giface=self._giface, size=(650, 550))

+ 2 - 2
gui/wxpython/modules/extensions.py

@@ -113,7 +113,7 @@ class InstallExtensionWindow(wx.Frame):
         # self.btnFetch = Button(parent=self.panel, id=wx.ID_ANY,
         #                        label=_("&Fetch"))
         # self.btnFetch.SetToolTip(_("Fetch list of available modules "
-        #                            "from GRASS Addons SVN repository"))
+        #                            "from GRASS Addons repository"))
         self.btnClose = Button(parent=self.panel, id=wx.ID_CLOSE)
         self.btnInstall = Button(parent=self.panel, id=wx.ID_ANY,
                                  label=_("&Install"))
@@ -209,7 +209,7 @@ class InstallExtensionWindow(wx.Frame):
         """Fetch list of available extensions"""
         wx.BeginBusyCursor()
         self.SetStatusText(
-            _("Fetching list of modules from GRASS-Addons SVN (be patient)..."), 0)
+            _("Fetching list of modules from GRASS-Addons (be patient)..."), 0)
         try:
             self.thread.Run(
                 callable=self.modelBuilder.Load,

+ 1 - 1
gui/wxpython/startup/guiutils.py

@@ -100,7 +100,7 @@ def GetVersion():
     versionFile.close()
     try:
         grassVersion, grassRevision = versionLine.split(' ', 1)
-        if grassVersion.endswith('svn'):
+        if grassVersion.endswith('dev'):
             grassRevisionStr = ' (%s)' % grassRevision
         else:
             grassRevisionStr = ''

+ 1 - 1
gui/wxpython/xml/wxgui_items.xml

@@ -327,7 +327,7 @@
     <label>Install extension from addons</label>
     <handler>OnInstallExtension</handler>
     <related-module>g.extension</related-module>
-    <description>Installs new extension from GRASS AddOns SVN repository.</description>
+    <description>Installs new extension from GRASS AddOns repository.</description>
     <keywords>general,installation,extensions</keywords>
   </wxgui-item>
   <wxgui-item name="ManageExtension">

+ 3 - 3
imagery/i.ortho.photo/README

@@ -4,15 +4,15 @@ STATUS:
 	Vask library and interactive XDRIVER monitors, both of which
 	have been removed. As the modules are rewritten to run in non-
 	interactive mode or with a wxPython frontend, they will be
-	added back into GRASS 7. This work will be undertaken in the
-	trunk SVN.
+	added back into GRASS 7. This work has been undertaken in the
+	to some extent in the development branch.
 
 AUTHORS:
 	The orthophoto rectification programs went out under alpha in 4.0.
 	It has since had bug fixes performed by OGI (Shapiro?) and also by
 	the original programmer - Mike Baba of DBA Systems, Fairfax, VA.
 
-COPYRIGHT:    (C) 1999-2013 by the GRASS Development Team
+COPYRIGHT:    (C) 1999-2019 by the GRASS Development Team
 
                This program is free software under the GNU General Public
                License (>=v2). Read the file COPYING that comes with GRASS

+ 1 - 1
include/Make/Install.make

@@ -199,7 +199,7 @@ srcdist: distclean
 	@ # do not include the debian control files:
 	-mv ./grass-$(GRASS_VERSION_NUMBER)/debian .
 	@ #we use -h to get the linked files into as real files:
-	tar cvfzh grass-$(GRASS_VERSION_NUMBER).tar.gz ./grass-$(GRASS_VERSION_NUMBER)/* --exclude=.svn
+	tar cvfzh grass-$(GRASS_VERSION_NUMBER).tar.gz ./grass-$(GRASS_VERSION_NUMBER)/* --exclude=.git
 	@ # restore src code location:
 	-mv ./grass-$(GRASS_VERSION_NUMBER)/* .
 	-rmdir ./grass-$(GRASS_VERSION_NUMBER)

+ 2 - 4
lib/proj/README.txt

@@ -1,10 +1,8 @@
 Projection string management: GRASS GIS relies on GDAL/PROJ.
 
-The EPGS DB is transformed into suitable CSV data for GDAL/PROJ
-according to this procedure:
-http://svn.osgeo.org/metacrs/geotiff/trunk/libgeotiff/csv/README
+EPGS DB management: see https://github.com/OSGeo/libgeotiff/tree/master/libgeotiff
 
-The EPSG CSV files are used via GDAL/OGR API from
+The EPSG data are used via GDAL/OGR API from
 gdal-config --datadir
 
 The datum shift grids are also used from GDAL/PROJ (proj-nad package).

+ 1 - 1
lib/proj/projlib.dox

@@ -48,7 +48,7 @@ If a warning appears that a certain datum is not recognised by GRASS and
 no parameters found, the datum transformation parameters have to be
 added to $GISBASE/etc/proj/datum.table (and also $GISBASE/etc/proj/datumtransform.table
 if you have 7-parameter transformation parameters). No need to re-compile
-though. When adding to SVN, currently these files are still in lib/gis/. 
+though. When adding to git, currently these files are still in lib/gis/. 
 <p>
 
 A list of datum equivalents is included in convert.c for geospatial files that

+ 1 - 1
lib/python/docs/src/gunittest_running_tests.rst

@@ -117,7 +117,7 @@ Example Bash script to run be used as a cron job
     # compile current source code from scratch
     cd $GRASSSRC
     make distclean -j4
-    svn up
+    git pull
     ./configure ...  # or a script containing all the flags
     make -j4
 

+ 2 - 2
man/sphinx/conf.py

@@ -41,7 +41,7 @@ master_doc = 'index'
 
 # General information about the project.
 project = u'GRASS 7.9 Documentation'
-copyright = u'2017, GRASS Development Team'
+copyright = u'2019, GRASS Development Team'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -50,7 +50,7 @@ copyright = u'2017, GRASS Development Team'
 # The short X.Y version.
 version = '7.9'
 # The full version, including alpha/beta/rc tags.
-release = 'svn'
+release = 'dev'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

+ 1 - 1
mswindows/osgeo4w/setup_x86.hint.tmpl

@@ -1,5 +1,5 @@
 sdesc: "GRASS GIS - daily builds of development version"
-ldesc: "Geographic Resources Analysis Support System (GRASS GIS) - daily builds of SVN trunk"
+ldesc: "Geographic Resources Analysis Support System (GRASS GIS) - daily builds of git master"
 category: Desktop
 requires: liblas avce00 gpsbabel gs python3-gdal python3-matplotlib msvcrt msvcrt2013 msvcrt2015 iconv libtiff gdal proj freetype-mingw pdcurses zlib fftw libpng python3-wx python3-numpy python3-pillow python3-pip python3-ply python3-pyopengl cairo python3-psycopg2 python3-six rbatch zstd zstd-bin python3-pywin32
 maintainer: MartinLanda

+ 1 - 1
mswindows/osgeo4w/setup_x86_64.hint.tmpl

@@ -1,5 +1,5 @@
 sdesc: "GRASS GIS - daily builds of development version"
-ldesc: "Geographic Resources Analysis Support System (GRASS GIS) - daily builds of SVN trunk"
+ldesc: "Geographic Resources Analysis Support System (GRASS GIS) - daily builds of git master"
 category: Desktop
 requires: liblas avce00 gpsbabel gs python3-gdal python3-matplotlib msvcrt msvcrt2013 msvcrt2015 iconv libtiff gdal proj pdcurses zlib fftw libpng python3-wx python3-numpy python3-pillow python3-pip python3-ply python3-pyopengl cairo python3-psycopg2 python3-six rbatch zstd zstd-bin python3-pywin32
 maintainer: MartinLanda

+ 4 - 3
scripts/g.extension/g.extension.html

@@ -59,9 +59,9 @@ in GRASS GIS is in this case in the responsibility of the user.
 
 <h3>Source code sources and repositories</h3>
 
-<h4>GRASS GIS Addons SVN repository</h4>
+<h4>GRASS GIS Addons repository on GitHub</h4>
 By default, <em>g.extension</em> installs extensions from the official
-GRASS GIS Addons SVN repository. However, different sources can be specified
+GRASS GIS Addons GitHub repository. However, different sources can be specified
 using the <b>url</b> option.
 
 <p>
@@ -104,7 +104,8 @@ or group of modules.
 
 <h4>Needed directory layout</h4>
 When none of the above sources is identified, <em>g.extension</em> assumes
-that the source is a Subversion repository and uses the <em>svn</em> command
+<!-- TODO: update this description -->
+that the source is in a GitHub repository and uses the <em>svn</em> command
 line tool to obtain the source code. The expected structure of the repository
 should be the same as the one of the official repository.
 

+ 1 - 1
testsuite/examples/test_framework_GRASS_GIS_with_NC.sh

@@ -112,7 +112,7 @@ if [ "$COMPILE" = "yes" ] ; then
    ## compile current source code from scratch
    cd $GRASSSRC
    make distclean -j$GCCTHREADS
-   svn update
+   git pull
    ./$CONFIGURE ...  # configure meta script containing all the compiler flags
    make -j$GCCTHREADS
 fi