changing Quantum-GIS to QGIS according to new repository

Author: mach0

fabgis/common.py

@@ -47,7 +47,7 @@ def setup_env():
         env.fg.home = os.path.join('/home/', env.fg.user)
         env.fg.workspace = os.path.join(env.fg.home, 'dev')
         env.fg.inasafe_git_url = 'git://github.com/AIFDR/inasafe.git'
-        env.fg.qgis_git_url = 'git://github.com/qgis/Quantum-GIS.git'
+        env.fg.qgis_git_url = 'git://github.com/qgis/QGIS.git'
         env.fg.kandan_git_url = 'git://github.com/kandanapp/kandan.git'
         env.fg.gdal_svn_url = 'https://svn.osgeo.org/gdal/trunk/gdal'
         env.fg.tilemill_tarball_url = (

fabgis/qgis.py

@@ -30,12 +30,12 @@ def clone_qgis(branch='master', delete_local_branches=False):
     #run('git config --global push.default simple')
 
     code_base = '%s/cpp' % env.fg.workspace
-    code_path = '%s/Quantum-GIS' % code_base
+    code_path = '%s/QGIS' % code_base
 
     update_git_checkout(
         code_base,
         env.fg.qgis_git_url,
-        'Quantum-GIS',
+        'QGIS',
         branch)
     if exists(code_path):
         with cd(code_path):
@@ -49,7 +49,7 @@ def compile_qgis(build_path, build_prefix, gdal_from_source=False):
 
     :param build_path: Path to the cmake build dir that should be used. Path
         must point to under the QGIS git checkout dir. e.g.
-        Quantum-GIS/build-fabgis.
+        QGIS/build-fabgis.
     :type build_path: str
 
     :param build_prefix: Path where the QGIS binaries should be installed to.
@@ -119,7 +119,7 @@ def install_qgis1_8(gdal_from_source=False):
     sudo('apt-get build-dep -y qgis')
     clone_qgis(branch='release-1_8')
     workspace = '%s/cpp' % env.fg.workspace
-    code_path = '%s/Quantum-GIS' % workspace
+    code_path = '%s/QGIS' % workspace
     build_path = '%s/build-qgis18-fabgis' % code_path
     build_prefix = '/usr/local/qgis-1.8'
     compile_qgis(build_path, build_prefix, gdal_from_source)
@@ -149,7 +149,7 @@ def install_qgis2(gdal_from_source=False):
 
     clone_qgis(branch='release-2_0')
     workspace = '%s/cpp' % env.fg.workspace
-    code_path = '%s/Quantum-GIS' % workspace
+    code_path = '%s/QGIS' % workspace
     build_path = '%s/build-qgis2-fabgis' % code_path
     build_prefix = '/usr/local/qgis-2.0'
     compile_qgis(build_path, build_prefix, gdal_from_source)
@@ -179,7 +179,7 @@ def install_master(gdal_from_source=False):
 
     clone_qgis(branch='master')
     workspace = '%s/cpp' % env.fg.workspace
-    code_path = '%s/Quantum-GIS' % workspace
+    code_path = '%s/QGIS' % workspace
     build_path = '%s/build-master-fabgis' % code_path
     build_prefix = '/usr/local/qgis-master'
     compile_qgis(build_path, build_prefix, gdal_from_source)

scrap.py

@@ -49,7 +49,7 @@ def all():
                                      'dev',
                                      'python')
         env.inasafe_git_url = 'git://github.com/AIFDR/inasafe.git'
-        env.qgis_git_url = 'git://github.com/qgis/Quantum-GIS.git'
+        env.qgis_git_url = 'git://github.com/qgis/QGIS.git'
         env.repo_alias = 'inasafe-test'
         env.code_path = os.path.join(env.workspace, env.repo_alias)