[websites/build-kde-org/production] /: Revert "Add support for invoking special 'SCM Correction' commands, such as git submodule updates in the case of qt5."

[Ben Cooksley]

Git commit 3c9af38533402955048caa3d120f0c09bdc84b80 by Ben Cooksley.
Committed on 17/03/2013 at 20:47.
Pushed by bcooksley into branch 'production'.

Revert "Add support for invoking special 'SCM Correction' commands, such as git submodule updates in the case of qt5."

This reverts commit 47684f2138d93b7dcf4d22ceb8ef4314942f9698.

CCMAIL: kde-frameworks-devel at kde.org

M  +0    -1    config/build/global.cfg
M  +0    -4    config/build/qt5/project.cfg
M  +0    -12   tools/kdecilib.py
M  +1    -4    tools/perform-build.py

http://commits.kde.org/websites/build-kde-org/3c9af38533402955048caa3d120f0c09bdc84b80

diff --git a/config/build/global.cfg b/config/build/global.cfg
index 7f3eb2b..c6d4faf 100644
--- a/config/build/global.cfg
+++ b/config/build/global.cfg
@@ -33,7 +33,6 @@ gitSetBranchCommand=%(gitExecutable)s branch --set-upstream --force jenkins orig
 gitCleanCommand=%(gitExecutable)s reset --hard && %(gitExecutable)s clean -dfx
 svnRevertCommand=%(svnExecutable)s revert -R .
 bzrCleanCommand=%(bzrExecutable)s revert --no-backup && %(bzrExecutable)s clean-tree --force
-useLatestGitSubmodules=False
 patchCommand=%(patchExecutable)s -p0 -i
 
 [Build]
diff --git a/config/build/qt5/project.cfg b/config/build/qt5/project.cfg
index df54a93..571d624 100644
--- a/config/build/qt5/project.cfg
+++ b/config/build/qt5/project.cfg
@@ -2,10 +2,6 @@
 systemBase=qt5
 configureExecutable={sources}/configure
 
-[Source]
-useLatestGitSubmodules=True
-gitSubmoduleLatestCommand=%(gitExecutable)s submodule foreach 'git fetch; git reset --hard origin/dev || git reset --hard origin/master || true'
-
 [Build]
 inSourceBuild=True
 configureCommand=%(configureExecutable)s -confirm-license -opensource -dbus -xcb -nomake examples -nomake tests -nomake demos -prefix {instPrefix}
\ No newline at end of file
diff --git a/tools/kdecilib.py b/tools/kdecilib.py
index f82678e..31af1cf 100644
--- a/tools/kdecilib.py
+++ b/tools/kdecilib.py
@@ -518,18 +518,6 @@ class BuildManager(object):
 
 		return
 
-	def apply_scm_corrections(self):
-		# Maybe we are correcting out of date Git submodules?
-		if self.config.getboolean('Source', 'useLatestGitSubmodules'):
-			# Execute the command to update the submodules
-			command = self.config.get('Source', 'gitSubmoduleLatestCommand')
-			try:
-				subprocess.check_call( shlex.split(command), cwd=self.projectSources )
-			except subprocess.CalledProcessError:
-				return False
-
-		return True
-
 	def apply_patches(self):
 		# Do we have anything to apply?
 		patchesDir = os.path.join( self.config.get('General', 'scriptsLocation'), 'patches', self.project.identifier, self.projectBranch )
diff --git a/tools/perform-build.py b/tools/perform-build.py
index 82b8c8d..b7b84ac 100644
--- a/tools/perform-build.py
+++ b/tools/perform-build.py
@@ -73,12 +73,9 @@ print "== Build Dependencies:"
 for dependency, dependencyBranch in manager.dependencies:
 	print "==== %s - Branch %s" %(dependency.identifier, dependencyBranch)
 
-# Cleanup the source tree, apply any scm corrections, then apply any necessary patches if we have them
+# Cleanup the source tree and apply any necessary patches if we have them
 print "\n== Cleaning Source Tree\n"
 manager.cleanup_sources()
-print "\n== Applying SCM Corrections\n"
-if not manager.apply_scm_corrections():
-	sys.exit("Applying SCM corrections to project %s failed." % project.identifier)
 print "\n== Applying Patches\n"
 if not manager.apply_patches():
 	sys.exit("Applying patches to project %s failed." % project.identifier)