summaryrefslogtreecommitdiffstats
path: root/tools/scripts
diff options
context:
space:
mode:
authorJocelyn Turcotte <jocelyn.turcotte@digia.com>2014-09-09 15:58:55 +0200
committerJocelyn Turcotte <jocelyn.turcotte@digia.com>2014-09-10 13:02:12 +0200
commitbe2a90afd34a8c851a6d49b6c1dffc8546263aab (patch)
tree4a663d8cc7eae8ce57db8df7af255f60d8dc07ce /tools/scripts
parenta4eb4ab50eab0ab91e6c4cacfc23232d6a0a2081 (diff)
Run dos2unix on all files when taking snapshots
This fixes Qt's packaging scripts that use the --to-crlf switch of zip, which doesn't work when files already contain CRLF. The script now takes much longer to run and a progress indicator was added to the console. Change-Id: I459c0d95f67b40ab57ff3b337210847cc60debc7 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'tools/scripts')
-rwxr-xr-xtools/scripts/take_snapshot.py31
1 files changed, 24 insertions, 7 deletions
diff --git a/tools/scripts/take_snapshot.py b/tools/scripts/take_snapshot.py
index a2608fb1..c08887e1 100755
--- a/tools/scripts/take_snapshot.py
+++ b/tools/scripts/take_snapshot.py
@@ -49,6 +49,7 @@ import imp
import errno
import shutil
+from distutils.version import StrictVersion
import git_submodule as GitSubmodule
qtwebengine_root = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..'))
@@ -214,7 +215,11 @@ def isInChromiumBlacklist(file_path):
return True
return False
-def createHardLinkForFile(src, dst):
+def printProgress(current, total):
+ sys.stdout.write("\r{} of {}".format(current, total))
+ sys.stdout.flush()
+
+def copyFile(src, dst):
src = os.path.abspath(src)
dst = os.path.abspath(dst)
dst_dir = os.path.dirname(dst)
@@ -227,6 +232,8 @@ def createHardLinkForFile(src, dst):
try:
os.link(src, dst)
+ # Qt uses LF-only but Chromium isn't.
+ subprocess.call(['dos2unix', '--keep-bom', '--quiet', dst])
except OSError as exception:
if exception.errno == errno.ENOENT:
print 'file does not exist:' + src
@@ -263,10 +270,13 @@ def exportNinja():
print 'exporting contents of:' + third_party_upstream_ninja
os.chdir(third_party_upstream_ninja)
files = listFilesInCurrentRepository()
- print 'creating hardlinks in ' + third_party_ninja
- for f in files:
+ print 'copying files to ' + third_party_ninja
+ for i in xrange(len(files)):
+ printProgress(i+1, len(files))
+ f = files[i]
if not isInGitBlacklist(f):
- createHardLinkForFile(f, os.path.join(third_party_ninja, f))
+ copyFile(f, os.path.join(third_party_ninja, f))
+ print("")
def exportChromium():
third_party_upstream_chromium = os.path.join(third_party_upstream, 'chromium')
@@ -278,10 +288,17 @@ def exportChromium():
# Add LASTCHANGE files which are not tracked by git.
files.append('build/util/LASTCHANGE')
files.append('build/util/LASTCHANGE.blink')
- print 'creating hardlinks in ' + third_party_chromium
- for f in files:
+ print 'copying files to ' + third_party_chromium
+ for i in xrange(len(files)):
+ printProgress(i+1, len(files))
+ f = files[i]
if not isInChromiumBlacklist(f) and not isInGitBlacklist(f):
- createHardLinkForFile(f, os.path.join(third_party_chromium, f))
+ copyFile(f, os.path.join(third_party_chromium, f))
+ print("")
+
+dos2unixVersion = StrictVersion(subprocess.Popen(['dos2unix', '-V'], stdout=subprocess.PIPE).communicate()[0].splitlines()[0].split()[1])
+if dos2unixVersion < StrictVersion('6.0.6'):
+ raise Exception("You need dos2unix version 6.0.6 minimum.")
clearDirectory(third_party)