From 1b29a99e45a7c74a2e05b26db808ba658d07ace0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <daniel.marjamaki@gmail.com>
Date: Fri, 21 Aug 2015 15:46:10 +0200
Subject: [PATCH] tools: refactoring daca2

---
 tools/daca2-addons.py    |  4 +--
 tools/rundaca2-addons.py | 60 ----------------------------------------
 tools/rundaca2.py        | 10 +++++++
 3 files changed, 12 insertions(+), 62 deletions(-)
 delete mode 100644 tools/rundaca2-addons.py

diff --git a/tools/daca2-addons.py b/tools/daca2-addons.py
index 8921cdc3f..340d738f7 100644
--- a/tools/daca2-addons.py
+++ b/tools/daca2-addons.py
@@ -230,9 +230,9 @@ if len(archives) == 0:
 print('Sleep for 10 seconds..')
 time.sleep(10)
 
-workdir = os.path.expanduser('~/daca2-addons/')
+workdir = os.path.expanduser('~/daca2/')
 
-print('~/daca2-addons/' + FOLDER)
+print('~/daca2/' + FOLDER)
 if not os.path.isdir(workdir + FOLDER):
     os.makedirs(workdir + FOLDER)
 os.chdir(workdir + FOLDER)
diff --git a/tools/rundaca2-addons.py b/tools/rundaca2-addons.py
deleted file mode 100644
index c42c4eb46..000000000
--- a/tools/rundaca2-addons.py
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/usr/bin/python
-
-import subprocess
-import pexpect
-import os
-import shutil
-import time
-import sys
-
-PASSWORD = ''
-if len(sys.argv) == 2:
-    PASSWORD = sys.argv[1]
-
-# Upload file to sourceforge web server using scp
-
-
-def upload(file_to_upload, destination):
-    if not os.path.isfile(file_to_upload):
-        return
-
-    try:
-        child = pexpect.spawn(
-            'scp ' + file_to_upload + ' upload@trac.cppcheck.net:' + destination)
-        child.expect('upload@trac.cppcheck.net\'s password:')
-        child.sendline(PASSWORD)
-        child.interact()
-    except IOError:
-        pass
-    except OSError:
-        pass
-    except pexpect.TIMEOUT:
-        pass
-
-
-def daca2(foldernum):
-    folders = '0123456789abcdefghijklmnopqrstuvwxyz'
-    folder = folders[foldernum % len(folders)]
-
-    print('Daca2 folder=' + folder)
-
-    os.chdir(os.path.expanduser('~/cppcheck'))
-    subprocess.call(['git', 'pull'])
-    p = subprocess.Popen(['git', 'show', '--format=%h'],
-                         stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-    comm = p.communicate()
-    rev = comm[0]
-    rev = rev[:rev.find('\n')]
-
-    subprocess.call(['nice', 'make', 'SRCDIR=build', 'CFGDIR=' + os.path.expanduser('~/cppcheck/cfg'), 'CXXFLAGS=-O2', 'CPPFLAGS=-DMAXTIME=600'])
-    subprocess.call(['mv', 'cppcheck', os.path.expanduser('~/daca2-addons/cppcheck-O2')])
-
-    subprocess.call(['nice', '--adjustment=19', 'python', os.path.expanduser('~/cppcheck/tools/daca2-addons.py'), folder, '--rev=' + rev])
-    upload(os.path.expanduser('~/daca2-addons/' + folder + '/results.txt'), 'evidente/addons-' + folder + '.txt')
-    subprocess.call(['nice', '--adjustment=19', 'python', os.path.expanduser('~/cppcheck/tools/daca2-addons.py'), 'lib' + folder, '--rev=' + rev])
-    upload(os.path.expanduser('~/daca2-addons/lib' + folder + '/results.txt'), 'evidente/addons-lib' + folder + '.txt')
-
-foldernum = 0
-while True:
-    daca2(foldernum)
-    foldernum = foldernum + 1
diff --git a/tools/rundaca2.py b/tools/rundaca2.py
index 2b593357d..9b60e4d1a 100644
--- a/tools/rundaca2.py
+++ b/tools/rundaca2.py
@@ -46,15 +46,25 @@ def daca2(foldernum):
     rev = comm[0]
     rev = rev[:rev.find('\n')]
 
+    # compile cppcheck
     subprocess.call(['nice', 'make', 'SRCDIR=build', 'CFGDIR=' + os.path.expanduser('~/cppcheck/cfg'), 'CXXFLAGS=-O2', 'CPPFLAGS=-DMAXTIME=600'])
     subprocess.call(['mv', 'cppcheck', os.path.expanduser('~/daca2/cppcheck-O2')])
 
+    # run cppcheck
     subprocess.call(['nice', '--adjustment=19', 'python', os.path.expanduser('~/cppcheck/tools/daca2.py'), folder, '--rev=' + rev])
     upload(os.path.expanduser('~/daca2/' + folder + '/results.txt'), 'evidente/results-' + folder + '.txt')
     subprocess.call(['nice', '--adjustment=19', 'python', os.path.expanduser('~/cppcheck/tools/daca2.py'), 'lib' + folder, '--rev=' + rev])
     upload(os.path.expanduser('~/daca2/lib' + folder + '/results.txt'), 'evidente/results-lib' + folder + '.txt')
 
+    # run cppcheck addons
+    subprocess.call(['nice', '--adjustment=19', 'python', os.path.expanduser('~/cppcheck/tools/daca2-addons.py'), folder, '--rev=' + rev])
+    upload(os.path.expanduser('~/daca2/'+folder+'/results.txt'), 'evidente/addons-'+folder+'.txt')
+    subprocess.call(['nice', '--adjustment=19', 'python', os.path.expanduser('~/cppcheck/tools/daca2-addons.py'), 'lib' + folder, '--rev=' + rev])
+    upload(os.path.expanduser('~/daca2/lib'+folder+'/results.txt'), 'evidente/addons-lib'+folder+'.txt')
+
 foldernum = 0
 while True:
     daca2(foldernum)
     foldernum = foldernum + 1
+
+