From aa0d967512f930f24c05ef1e227d070dd12f9528 Mon Sep 17 00:00:00 2001 From: Mathieu Lacage Date: Thu, 17 May 2007 11:46:33 +0200 Subject: [PATCH] improve dist support --- SConstruct | 7 +++++++ build.py | 4 +++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/SConstruct b/SConstruct index d070a5315..6a187c7af 100644 --- a/SConstruct +++ b/SConstruct @@ -6,8 +6,15 @@ ns3 = build.Ns3() ns3.build_dir = 'build-dir' ns3.version = '0.2' ns3.name = 'ns3' +ns3.distname = 'ns-3' ns3.doxygen_config = os.path.join('doc', 'doxygen.conf') ns3.add_extra_dist(os.path.join('doc', 'main.txt')) +ns3.add_extra_dist ('doc/contributing.txt') +ns3.add_extra_dist ('doc/build.txt') +ns3.add_extra_dist ('doc/mercurial.txt') +ns3.add_extra_dist ('README') +ns3.add_extra_dist ('RELEASE_NOTES') +ns3.add_extra_dist ('AUTHORS') # diff --git a/build.py b/build.py index e7b871dcc..25a38e4fa 100644 --- a/build.py +++ b/build.py @@ -138,6 +138,7 @@ class Ns3: self.build_dir = 'build' self.version = '0.0.1' self.name = 'noname' + self.distname = 'noname' self.doxygen_config = '' def add(self, module): self.__modules.append(module) @@ -516,11 +517,12 @@ class Ns3: dist_list.append(os.path.join(module.dir, f)) for f in self.extra_dist: dist_list.append(f) + dist_list.append (self.doxygen_config) dist_list.append('SConstruct') dist_list.append('build.py') targets = [] - basename = self.name + '-' + self.version + basename = self.distname + '-' + self.version for src in dist_list: tgt = os.path.join(basename, src) targets.append(dist_env.MyCopyBuilder(target=tgt, source=src))