summaryrefslogtreecommitdiff
path: root/script/scons-time
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2019-12-28 14:18:55 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2019-12-28 14:18:55 +0100
commit6298ea00640a74af4eecbf3528ea87bd191a2eba (patch)
tree6f9badf5b8f69055849260093eb76ce184e746ef /script/scons-time
parent0809a628a8aa042fe6bb225d4d70e63f289eaafb (diff)
parent5d14e9e6b9aa6c884d8a4787cd248c9ab3612962 (diff)
Konflikte behobendebian/3.1.2-1
Diffstat (limited to 'script/scons-time')
-rw-r--r--script/scons-time26
1 files changed, 2 insertions, 24 deletions
diff --git a/script/scons-time b/script/scons-time
index 15e3700..c371d59 100644
--- a/script/scons-time
+++ b/script/scons-time
@@ -31,7 +31,7 @@
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
from __future__ import division, print_function
-__revision__ = "src/script/scons-time.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/script/scons-time.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import getopt
import glob
@@ -274,8 +274,6 @@ class SConsTimer(object):
return kw
default_settings = makedict(
- aegis = 'aegis',
- aegis_project = None,
chdir = None,
config_file = None,
initial_commands = [],
@@ -1113,7 +1111,6 @@ class SConsTimer(object):
help = """\
Usage: scons-time run [OPTIONS] [FILE ...]
- --aegis=PROJECT Use SCons from the Aegis PROJECT
--chdir=DIR Name of unpacked directory for chdir
-f FILE, --file=FILE Read configuration from specified FILE
-h, --help Print this help and exit
@@ -1138,7 +1135,6 @@ class SConsTimer(object):
short_opts = '?f:hnp:qs:v'
long_opts = [
- 'aegis=',
'file=',
'help',
'no-exec',
@@ -1157,9 +1153,7 @@ class SConsTimer(object):
opts, args = getopt.getopt(argv[1:], short_opts, long_opts)
for o, a in opts:
- if o in ('--aegis',):
- self.aegis_project = a
- elif o in ('-f', '--file'):
+ if o in ('-f', '--file'):
self.config_file = a
elif o in ('-?', '-h', '--help'):
self.do_help(['help', 'run'])
@@ -1211,8 +1205,6 @@ class SConsTimer(object):
prepare = None
if self.subversion_url:
prepare = self.prep_subversion_run
- elif self.aegis_project:
- prepare = self.prep_aegis_run
for run_number in run_number_list:
self.individual_run(run_number, self.archive_list, prepare)
@@ -1234,20 +1226,6 @@ class SConsTimer(object):
def scons_lib_dir_path(self, dir):
return os.path.join(dir, 'src', 'engine')
- def prep_aegis_run(self, commands, removals):
- self.aegis_tmpdir = tempfile.mkdtemp(prefix=self.name + '-aegis-')
- removals.append((shutil.rmtree, 'rm -rf %%s', self.aegis_tmpdir))
-
- self.aegis_parent_project = os.path.splitext(self.aegis_project)[0]
- self.scons = self.scons_path(self.aegis_tmpdir)
- self.scons_lib_dir = self.scons_lib_dir_path(self.aegis_tmpdir)
-
- commands.extend([
- (lambda: os.chdir(self.aegis_tmpdir), 'cd %(aegis_tmpdir)s'),
- '%(aegis)s -cp -ind -p %(aegis_parent_project)s .',
- '%(aegis)s -cp -ind -p %(aegis_project)s -delta %(run_number)s .',
- ])
-
def prep_subversion_run(self, commands, removals):
self.svn_tmpdir = tempfile.mkdtemp(prefix=self.name + '-svn-')
removals.append((shutil.rmtree, 'rm -rf %%s', self.svn_tmpdir))