diff options
| author | Joe Orton <jorton@apache.org> | 2006-07-12 14:10:25 +0000 |
|---|---|---|
| committer | Joe Orton <jorton@apache.org> | 2006-07-12 14:10:25 +0000 |
| commit | 1cbc8c9908560de948f7f68553b5641a79385127 (patch) | |
| tree | 7f97eaf948cdec717de64f4acc9eaeab5bbdce7f | |
| parent | 05bb282ad78d734707a4cc8864607e0a031dc2be (diff) | |
| download | apr-1cbc8c9908560de948f7f68553b5641a79385127.tar.gz | |
* build/gen-build.py: Make location of DSP file configurable and its
use optional (hopefully fixes apr-util build).
* build.conf: Define DSP file location.
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@421276 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | build.conf | 2 | ||||
| -rwxr-xr-x | build/gen-build.py | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/build.conf b/build.conf index 0522a1bb7..36121883f 100644 --- a/build.conf +++ b/build.conf @@ -24,3 +24,5 @@ headers = include/*.h # we have a recursive makefile for the test files (for now) # test/*.c + +dsp = libapr.dsp diff --git a/build/gen-build.py b/build/gen-build.py index 09161d6d7..2d127185c 100755 --- a/build/gen-build.py +++ b/build/gen-build.py @@ -39,6 +39,11 @@ def main(): parser = ConfigParser.ConfigParser() parser.read('build.conf') + if parser.has_option('options', 'dsp'): + dsp_file = parser.get('options', 'dsp') + else: + dsp_file = None + headers = get_files(parser.get('options', 'headers')) # compute the relevant headers, along with the implied includes @@ -69,8 +74,8 @@ def main(): # If we're doing win32, we're going to look in the libapr.dsp file # for those files that we have to manually add to our list. inherit_parent = { } - if platform == 'win32': - for line in open('libapr.dsp').readlines(): + if platform == 'win32' and dsp_file: + for line in open(dsp_file).readlines(): if line[:7] != 'SOURCE=': continue if line[7:].find('unix') != -1: |