瀏覽代碼

Further svn2git updates

Markus Neteler 5 年之前
父節點
當前提交
47e02fc12c
共有 10 個文件被更改,包括 55 次插入80 次删除
  1. 3 3
      AUTHORS
  2. 13 11
      INSTALL
  3. 2 2
      REQUIREMENTS.html
  4. 1 1
      Vagrantfile
  5. 23 50
      doc/howto_release.txt
  6. 3 3
      doc/infrastructure.txt
  7. 6 6
      gui/wxpython/gmodeler/g.gui.gmodeler.html
  8. 1 1
      lib/cdhc/README
  9. 1 1
      tools/vagrant/compile.sh
  10. 2 2
      vector/v.in.ogr/v.in.ogr.html

+ 3 - 3
AUTHORS

@@ -35,13 +35,13 @@ Email addresses below have been spam-proofed to protect the innocent;
 add "@" and "." as needed.
 add "@" and "." as needed.
 
 
 A list of contributors with write access is available in
 A list of contributors with write access is available in
-https://svn.osgeo.org/grass/grass/trunk/contributors.csv
+https://github.com/OSGeo/grass/blob/master/contributors.csv
 
 
 A list of contributors without write access is available in
 A list of contributors without write access is available in
-https://svn.osgeo.org/grass/grass/trunk/contributors_extra.csv
+https://github.com/OSGeo/grass/blob/master/contributors_extra.csv
 
 
 A list of translators is available in
 A list of translators is available in
-https://svn.osgeo.org/grass/grass/trunk/translators.csv
+https://github.com/OSGeo/grass/blob/master/translators.csv
 
 
 
 
 Summary view:
 Summary view:

+ 13 - 11
INSTALL

@@ -11,13 +11,13 @@ PREREQUISITES
 (D) INSTALLATION (first time)
 (D) INSTALLATION (first time)
 (E) INSTALLATION ON MACOSX
 (E) INSTALLATION ON MACOSX
 (F) RUNNING GRASS
 (F) RUNNING GRASS
-(G) UPDATE OF SOURCE CODE (SVN or SVN snapshot only)
+(G) UPDATE OF SOURCE CODE
 (H) COMPILING INDIVIDUAL MODULES - OWN MODULES
 (H) COMPILING INDIVIDUAL MODULES - OWN MODULES
 (I) CODE OPTIMIZATION
 (I) CODE OPTIMIZATION
 (J) DEBUGGING OPTIONS
 (J) DEBUGGING OPTIONS
 (K) LARGE FILE SUPPORT (for raster maps)
 (K) LARGE FILE SUPPORT (for raster maps)
 (L) SUPPORT
 (L) SUPPORT
-(M) GRASS PROGRAMMER'S MANUAL
+(M) GRASS GIS PROGRAMMER'S MANUAL
 (N) CONTRIBUTING CODE AND PATCHES
 (N) CONTRIBUTING CODE AND PATCHES
 (O) DRAFT TUTORIAL
 (O) DRAFT TUTORIAL
 
 
@@ -47,13 +47,13 @@ GRASS source code is currently distributed in 2 forms:
   package) and the version is composed of 3 numbers, e.g. 7.2.0, 7.2.1
   package) and the version is composed of 3 numbers, e.g. 7.2.0, 7.2.1
   etc.
   etc.
 
 
-2) SVN or SVN Snapshots of source code (SVN or SVN snapshot)
+2) Snapshots of source code (generated from GitHub)
 
 
-  This version of the source code can be acquired either from the SVN
-  repository (https://svn.osgeo.org/grass/) or as a snapshot
-  (*.tar.gz package) of that SVN repository. The SVN snapshot name
+  This version of the source code can be acquired either from the GitHub
+  repository (https://github.com/OSGeo/grass/) or as a auto-generated snapshot
+  (*.tar.gz package) of the GitHub repository. The snapshot name
   contains the date when the snapshot was created (checked out from
   contains the date when the snapshot was created (checked out from
-  the SVN repository), e.g. grass-7.7.svn_src_snapshot_2016_06_11.tar.gz
+  the GitHub repository), e.g. grass-7.7.git_src_snapshot_2019_06_11.tar.gz
   from https://grass.osgeo.org/grass77/source/snapshot/
   from https://grass.osgeo.org/grass77/source/snapshot/
   Further instructions at https://trac.osgeo.org/grass/wiki/DownloadSource
   Further instructions at https://trac.osgeo.org/grass/wiki/DownloadSource
 
 
@@ -179,22 +179,24 @@ GRASS GIS startup menu to the extracted directory.
 Enjoy.
 Enjoy.
 
 
 
 
-(G) UPDATE OF SOURCE CODE (SVN or SVN snapshot only)
+(G) UPDATE OF SOURCE CODE
 
 
 Assuming that you want to update your current installation from
 Assuming that you want to update your current installation from
-SVN, you have to perform a few steps. In general:
+GitHub, you have to perform a few steps. In general:
 
 
-- update from SVN
+- update from GitHub
 - configure, compile
 - configure, compile
 
 
 In detail:
 In detail:
 
 
     cd /where/your/grass7sourcecode/lives/
     cd /where/your/grass7sourcecode/lives/
-    svn update
+    git fetch --all
+    git merge upstream/master
     ./configure ...
     ./configure ...
     make
     make
     make install
     make install
 
 
+For details, see https://trac.osgeo.org/grass/wiki/HowToGit
 
 
 (H) COMPILING INDIVIDUAL MODULES - OWN MODULES
 (H) COMPILING INDIVIDUAL MODULES - OWN MODULES
 
 

+ 2 - 2
REQUIREMENTS.html

@@ -203,8 +203,8 @@ newer versions are named "python-pillow"
 <a href="http://avce00.maptools.org">http://avce00.maptools.org</a>
 <a href="http://avce00.maptools.org">http://avce00.maptools.org</a>
 </li>
 </li>
 
 
-<li><b>Subversion</b> (svn for g.extension)<br>
-<a href="https://subversion.apache.org/">https://subversion.apache.org/</a><br>
+<li><b>git</b> (git for g.extension)<br>
+<a href="https://git-scm.com/">https://git-scm.com/</a><br>
 </li>
 </li>
 
 
 </ul>
 </ul>

+ 1 - 1
Vagrantfile

@@ -1,7 +1,7 @@
 # -*- mode: ruby -*-
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 # vi: set ft=ruby :
 
 
-### Inspired by https://svn.osgeo.org/gdal/trunk/gdal/Vagrantfile
+### Inspired by https://github.com/OSGeo/gdal/blob/master/Vagrantfile
 
 
 require 'socket'
 require 'socket'
 
 

+ 23 - 50
doc/howto_release.txt

@@ -24,7 +24,7 @@ Contents
 tools/fix_typos.sh
 tools/fix_typos.sh
 
 
 # i18N: sync from Transifex (https://www.transifex.com/grass-gis/grass7/dashboard/)
 # i18N: sync from Transifex (https://www.transifex.com/grass-gis/grass7/dashboard/)
-#  - except for Latvian; Latvian is directly edited in SVN and then sync'ed from trunk .po files
+#  - except for Latvian; Latvian is directly edited in git and then sync'ed from master .po files
 cd locale
 cd locale
 sh ~/software/grass-addons/tools/transifex_merge.sh
 sh ~/software/grass-addons/tools/transifex_merge.sh
 make
 make
@@ -49,14 +49,16 @@ make verify
 rm -f config.guess config.sub
 rm -f config.guess config.sub
 wget http://git.savannah.gnu.org/cgit/config.git/plain/config.guess
 wget http://git.savannah.gnu.org/cgit/config.git/plain/config.guess
 wget http://git.savannah.gnu.org/cgit/config.git/plain/config.sub
 wget http://git.savannah.gnu.org/cgit/config.git/plain/config.sub
-svn diff config.guess config.sub
+git diff config.guess config.sub
 autoconf-2.13
 autoconf-2.13
-# check and submit to SVN:
-svn ci -m"config.guess + config.sub: updated from http://git.savannah.gnu.org/cgit/config.git/plain/" config.guess config.sub configure
+# check and submit to git:
+git add config.guess config.sub configure
+git commit -m"config.guess + config.sub: updated from http://git.savannah.gnu.org/cgit/config.git/plain/" config.guess config.sub configure
 # test by running ./configure 
 # test by running ./configure 
 
 
-# update from SVN
-svn up
+# update from git
+git fetch --all --prune
+git push origin master
 
 
 # cleanup rubbish:
 # cleanup rubbish:
 rm -f locale/templates/*.pot
 rm -f locale/templates/*.pot
@@ -74,8 +76,7 @@ rm -f gui/wxpython/menustrings.py gui/wxpython/build_ext.pyc gui/wxpython/xml/me
 chmod -R a+r *
 chmod -R a+r *
 
 
 # double check
 # double check
-svn status --no-ignore
-svn status
+git status
 
 
 # Create release branch (only if not yet existing)
 # Create release branch (only if not yet existing)
 # ... see below
 # ... see below
@@ -106,8 +107,10 @@ RELEASE=`cat include/VERSION | head -3 | tail -1`
 VERSION=${MAJOR}.${MINOR}.${RELEASE}
 VERSION=${MAJOR}.${MINOR}.${RELEASE}
 echo $VERSION
 echo $VERSION
 
 
-svn ci -m"GRASS GIS $VERSION" include/VERSION
-svn up
+TODO: add feature_branch...
+
+git add include/VERSION
+git commit -m"GRASS GIS $VERSION" include/VERSION
 
 
 # Create Changelog file on release branch:
 # Create Changelog file on release branch:
 python tools/gitlog2changelog.py
 python tools/gitlog2changelog.py
@@ -115,43 +118,40 @@ mv ChangeLog ChangeLog_$VERSION
 head ChangeLog_$VERSION
 head ChangeLog_$VERSION
 gzip ChangeLog_$VERSION
 gzip ChangeLog_$VERSION
 
 
-# Tag release (http://trac.osgeo.org/grass/browser/grass/tags):
-# see http://svnbook.red-bean.com/en/1.4/svn.branchmerge.tags.html
+# TODO:
+# Tag release ...
 
 
 TODAY=`date +"%Y%m%d"`
 TODAY=`date +"%Y%m%d"`
 RELEASETAG=release_${TODAY}_grass_${MAJOR}_${MINOR}_${RELEASE}
 RELEASETAG=release_${TODAY}_grass_${MAJOR}_${MINOR}_${RELEASE}
 echo $RELEASETAG
 echo $RELEASETAG
 
 
-URL=https://svn.osgeo.org/grass
-svn copy $URL/grass/branches/releasebranch_7_4 \
-	$URL/grass/tags/$RELEASETAG \
-	-m "Tagging release grass_${MAJOR}_${MINOR}_${RELEASE}"
-      
-      
+TODO...
+
 # create source package (in the source directory):
 # create source package (in the source directory):
 echo grass-${VERSION}
 echo grass-${VERSION}
 
 
 mkdir grass-${VERSION}
 mkdir grass-${VERSION}
 mv * grass-${VERSION}/
 mv * grass-${VERSION}/
 # create the package:
 # create the package:
-tar cvfzh grass-${VERSION}.tar.gz --exclude=.svn grass-${VERSION}/*
+tar cvfzh grass-${VERSION}.tar.gz --exclude-vcs grass-${VERSION}/*
 # restore src code location:
 # restore src code location:
 mv ./grass-${VERSION}/* .
 mv ./grass-${VERSION}/* .
 rmdir ./grass-${VERSION}
 rmdir ./grass-${VERSION}
 # Calculating MD5 sum:
 # Calculating MD5 sum:
 md5sum grass-${VERSION}.tar.gz > grass-${VERSION}.md5sum
 md5sum grass-${VERSION}.tar.gz > grass-${VERSION}.md5sum
 
 
-# reset include/VERSION file to SVN version:
+# reset include/VERSION file to git version:
 vim include/VERSION
 vim include/VERSION
 
 
 #example
 #example
 7
 7
 4
 4
-1svn
+1dev
 2018
 2018
 
 
 rm -f include/VERSION~
 rm -f include/VERSION~
-svn ci -m"back to SVN" include/VERSION
+git add include/VERSION
+git commit -m"back to git" include/VERSION
 
 
 
 
 # Store the source tarball (twice) in (use scp -p FILES grass:):
 # Store the source tarball (twice) in (use scp -p FILES grass:):
@@ -192,6 +192,7 @@ vim grass-addons/tools/addons/grass-addons.sh
   - https://grass.osgeo.org/download/software/sources/
   - https://grass.osgeo.org/download/software/sources/
   - https://grass.osgeo.org/download/software/linux/
   - https://grass.osgeo.org/download/software/linux/
   - https://grass.osgeo.org/home/history/releases/
   - https://grass.osgeo.org/home/history/releases/
+# TODO: git tags
   - https://grass.osgeo.org/development/svn/svn-tags/ (add tag): echo $RELEASETAG
   - https://grass.osgeo.org/development/svn/svn-tags/ (add tag): echo $RELEASETAG
 
 
 # write announcement
 # write announcement
@@ -302,31 +303,3 @@ vim grass-addons/tools/addons/grass-addons.sh
 
 
    See also: https://grass.osgeo.org/wiki/Contact_Databases
    See also: https://grass.osgeo.org/wiki/Contact_Databases
    ... anywhere else? Please add here.
    ... anywhere else? Please add here.
-
-###########################################
-(B) HOWTO create a branch
-
-1. see SVN book:
-   http://svnbook.red-bean.com/en/1.1/ch04s07.html
-
-   GRASS 7.6 release branch:
-
-# see below for real example
-#          BRANCH=releasebranch_7_6
-#          URL=https://svn.osgeo.org/grass
-#          svn copy $URL/grass/trunk \
-#                   $URL/grass/branches/$BRANCH \
-#                   -m "Release branch for GRASS 7.6.x"
-
-Branch creation example: GRASS GIS 7.6 release branch creation
-
-svn copy https://svn.osgeo.org/grass/grass/trunk/ \
-    https://svn.osgeo.org/grass/grass/branches/releasebranch_7_6 \
-    -m "Release branch for GRASS GIS 7.6.x"
-
-----------
-Switching current local copy to above development branch:
-   (http://svnbook.red-bean.com/en/1.1/ch04s05.html)
-
-           cd /path/to/your/local/copy/trunk
-           svn switch https://svn.osgeo.org/grass/grass/branches/releasebranch_7_6 .

+ 3 - 3
doc/infrastructure.txt

@@ -1,7 +1,7 @@
 How the GRASS Webserver and related infrastructure works
 How the GRASS Webserver and related infrastructure works
 
 
 written by M. Neteler
 written by M. Neteler
-Last changed: $Date$
+Last changed: June 2019
 
 
 
 
 Related Wiki documents:
 Related Wiki documents:
@@ -229,7 +229,7 @@ Maintainer: Martin Landa
 * https://travis-ci.org/GRASS-GIS
 * https://travis-ci.org/GRASS-GIS
 * https://github.com/OSGeo/grass
 * https://github.com/OSGeo/grass
 * OLD: https://github.com/GRASS-GIS/grass-ci
 * OLD: https://github.com/GRASS-GIS/grass-ci
-* https://svn.osgeo.org/grass/grass-addons/tools/grass-ci/
+* https://github.com/OSGeo/grass-addons/tree/master/tools/grass-ci/
 
 
 Travis CI control files:
 Travis CI control files:
  trunk/.travis/
  trunk/.travis/
@@ -238,7 +238,7 @@ Travis CI control files:
    linux.script.sh
    linux.script.sh
 
 
 Maintenance script:
 Maintenance script:
-* https://svn.osgeo.org/grass/grass-addons/tools/grass-ci/grass-ci.sh
+* https://github.com/OSGeo/grass-addons/tree/master/tools/grass-ci/grass-ci.sh
 
 
 The github update is run as a cronjob on server "geo102" (CTU, CZ).
 The github update is run as a cronjob on server "geo102" (CTU, CZ).
 
 

+ 6 - 6
gui/wxpython/gmodeler/g.gui.gmodeler.html

@@ -151,8 +151,8 @@ to predict landslides in the area of interest.</i>
 
 
 In this example the <tt>zipcodes_wake</tt> vector data and the
 In this example the <tt>zipcodes_wake</tt> vector data and the
 <tt>elev_state_500m</tt> raster data from the North Carolina
 <tt>elev_state_500m</tt> raster data from the North Carolina
-sample dataset (original <a href="http://grass.osgeo.org/sampledata/north_carolina/nc_rast_geotiff.zip">raster</a> and
-<a href="http://grass.osgeo.org/sampledata/north_carolina/nc_shape.zip">vector</a>
+sample dataset (original <a href="https://grass.osgeo.org/sampledata/north_carolina/nc_rast_geotiff.zip">raster</a> and
+<a href="https://grass.osgeo.org/sampledata/north_carolina/nc_shape.zip">vector</a>
 data) are used to calculate average elevation for every
 data) are used to calculate average elevation for every
 zone. The important part of the process is the Graphical Modeler, namely its
 zone. The important part of the process is the Graphical Modeler, namely its
 possibilities of process automation.
 possibilities of process automation.
@@ -358,7 +358,7 @@ The result is shown in the Figure below:
 </center>
 </center>
 
 
 <h3>Defining loops</h3>
 <h3>Defining loops</h3>
-In the example below the <a href="http://e4ftl01.cr.usgs.gov/MOLT/MOD13Q1.006/">MODIS MOD13Q1</a>
+In the example below the <a href="https://e4ftl01.cr.usgs.gov/MOLT/MOD13Q1.006/">MODIS MOD13Q1</a>
 (NDVI) satellite data products are used in a loop. The original data are 
 (NDVI) satellite data products are used in a loop. The original data are 
 stored as coded integer values that need to be multiplied by the
 stored as coded integer values that need to be multiplied by the
 value <tt>0.0001</tt> to represent real <i>ndvi values</i>. Moreover, GRASS GIS
 value <tt>0.0001</tt> to represent real <i>ndvi values</i>. Moreover, GRASS GIS
@@ -431,12 +431,12 @@ r.colors = map = %map color = ndvi
 
 
 <p>
 <p>
 See also selected user models available from this 
 See also selected user models available from this 
-<a href="http://svn.osgeo.org/grass/grass-addons/grass7/models">SVN repository</a>.
+<a href="https://github.com/OSGeo/grass-addons/blob/master/grass7/models/">git repository</a>.
 
 
 <p>
 <p>
 See also
 See also
-the <a href="http://grasswiki.osgeo.org/wiki/WxGUI_Graphical_Modeler">wiki</a> page
-(especially various <a href="http://grasswiki.osgeo.org/wiki/WxGUI_Graphical_Modeler#Video_tutorials">video
+the <a href="https://grasswiki.osgeo.org/wiki/WxGUI_Graphical_Modeler">wiki</a> page
+(especially various <a href="https://grasswiki.osgeo.org/wiki/WxGUI_Graphical_Modeler#Video_tutorials">video
 tutorials</a>).
 tutorials</a>).
 
 
 <h2>AUTHORS</h2>
 <h2>AUTHORS</h2>

+ 1 - 1
lib/cdhc/README

@@ -28,4 +28,4 @@ Comments    : Draft docs at ftp://pasture.ecn.purdue.edu/pub/mccauley/grass/tuto
               Includes D'Agostino's D, Anderson-Darling, Cramer-Von Mises W^2,
               Includes D'Agostino's D, Anderson-Darling, Cramer-Von Mises W^2,
               Kolmogorov-Smirnov, Chi-Square, Shapiro-Wilk, many others.
               Kolmogorov-Smirnov, Chi-Square, Shapiro-Wilk, many others.
               Expands and fixes bugs in general/cdh in statlib.
               Expands and fixes bugs in general/cdh in statlib.
-              Other document: http://svn.osgeo.org/grass/grass/branches/releasebranch_5_0/src/sites/cdhc/doc/goodness.ps
+              Other document: https://github.com/OSGeo/grass-legacy/blob/releasebranch_5_0/src/sites/cdhc/doc/goodness.ps

+ 1 - 1
tools/vagrant/compile.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #!/bin/sh
 
 
-### inspired by https://svn.osgeo.org/gdal/trunk/gdal/scripts/vagrant/gdal.sh
+### inspired by https://github.com/OSGeo/gdal/blob/master/gdal/scripts/vagrant/gdal.sh
 
 
 # abort install if any errors occur and enable tracing
 # abort install if any errors occur and enable tracing
 set -o errexit
 set -o errexit

+ 2 - 2
vector/v.in.ogr/v.in.ogr.html

@@ -302,7 +302,7 @@ db.select table=river
 
 
 <h3>OpenStreetMap (OSM)</h3>
 <h3>OpenStreetMap (OSM)</h3>
 
 
-<a href="http://gdal.org/drv_osm.html">OSM data</a> are available in 
+<a href="https://gdal.org/drv_osm.html">OSM data</a> are available in
 .osm (XML based) and .pbf (optimized binary) formats. The .pbf format 
 .osm (XML based) and .pbf (optimized binary) formats. The .pbf format 
 is recommended because file sizes are smaller. The OSM driver will 
 is recommended because file sizes are smaller. The OSM driver will 
 categorize features into 5 layers :
 categorize features into 5 layers :
@@ -344,7 +344,7 @@ where an OSM connection to another line exists.
 <p>
 <p>
 Import of OSM data requires a configuration file, defined with the 
 Import of OSM data requires a configuration file, defined with the 
 OSM_CONFIG_FILE configuration option. In the data folder of the GDAL 
 OSM_CONFIG_FILE configuration option. In the data folder of the GDAL 
-distribution, you can find a <a href="https://svn.osgeo.org/gdal/trunk/gdal/data/osmconf.ini">osmconf.ini file</a>
+distribution, you can find a <a href="https://github.com/OSGeo/gdal/blob/master/gdal/data/osmconf.ini">osmconf.ini file</a>
 that can be customized to fit your needs. See 
 that can be customized to fit your needs. See 
 <a href="http://wiki.openstreetmap.org/wiki/Map_Features">OSM map features</a> 
 <a href="http://wiki.openstreetmap.org/wiki/Map_Features">OSM map features</a> 
 for keys and their values. You should set &quot;other_tags=no&quot; to 
 for keys and their values. You should set &quot;other_tags=no&quot; to