From 7c09eebae58501478b18501e27b365e81a39a3dd Mon Sep 17 00:00:00 2001 From: Thomas Leonard Date: Thu, 1 Jan 2009 13:13:04 +0000 Subject: [PATCH] Name the distribution directory after the program --- support.py | 2 +- tests/testcompile.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/support.py b/support.py index 621d6f8..8771612 100644 --- a/support.py +++ b/support.py @@ -163,7 +163,7 @@ class BuildEnv: @property def distdir(self): - distdir_name = 'dist-' + get_arch_name().lower() + distdir_name = '%s-%s' % (self.iface_name.lower(), get_arch_name().lower()) assert '/' not in distdir_name return os.path.realpath(distdir_name) diff --git a/tests/testcompile.py b/tests/testcompile.py index 2c10bef..1ba1b27 100755 --- a/tests/testcompile.py +++ b/tests/testcompile.py @@ -65,7 +65,7 @@ class TestCompile(unittest.TestCase): compile('build', expect = 'Executing: "$SRCDIR/configure"') - target_dir = 'dist-%s' % support.get_arch_name().lower() + target_dir = 'gnu-hello-%s' % support.get_arch_name().lower() archive_stem = 'gnu-hello-%s-1.3' % support.get_arch_name().lower() assert os.path.isdir(target_dir), '%s not a directory' % target_dir @@ -77,7 +77,7 @@ class TestCompile(unittest.TestCase): compile('setup', local_hello_path, self.hello_dir, expect = 'Created directory') os.chdir(self.hello_dir) compile('build', expect = 'Executing: ls -l') - target_dir = 'dist-%s' % support.get_arch_name().lower() + target_dir = 'hello2-%s' % support.get_arch_name().lower() assert os.path.isdir(target_dir), '%s not a directory' % target_dir run('0launch', '%s/0install/hello2.xml' % target_dir, expect = 'ROX-Lib') @@ -100,7 +100,7 @@ class TestCompile(unittest.TestCase): # 'src' exists, but no changes compile('diff') compile('--verbose', 'build', expect = 'Hello from C') - target_dir = 'dist-%s' % support.get_arch_name().lower() + target_dir = 'cprog-%s' % support.get_arch_name().lower() patch_file = os.path.join(target_dir, '0install/from-0.1.patch') assert not os.path.exists(patch_file) -- 2.11.4.GIT