You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by jo...@apache.org on 2006/07/12 16:10:26 UTC
svn commit: r421276 - in /apr/apr/trunk: build.conf build/gen-build.py
Author: jorton
Date: Wed Jul 12 07:10:25 2006
New Revision: 421276
URL: http://svn.apache.org/viewvc?rev=421276&view=rev
Log:
* 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.
Modified:
apr/apr/trunk/build.conf
apr/apr/trunk/build/gen-build.py
Modified: apr/apr/trunk/build.conf
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build.conf?rev=421276&r1=421275&r2=421276&view=diff
==============================================================================
--- apr/apr/trunk/build.conf (original)
+++ apr/apr/trunk/build.conf Wed Jul 12 07:10:25 2006
@@ -24,3 +24,5 @@
# we have a recursive makefile for the test files (for now)
# test/*.c
+
+dsp = libapr.dsp
Modified: apr/apr/trunk/build/gen-build.py
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/gen-build.py?rev=421276&r1=421275&r2=421276&view=diff
==============================================================================
--- apr/apr/trunk/build/gen-build.py (original)
+++ apr/apr/trunk/build/gen-build.py Wed Jul 12 07:10:25 2006
@@ -39,6 +39,11 @@
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 @@
# 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:
Re: svn commit: r421276 - in /apr/apr/trunk: build.conf build/gen-build.py
Posted by Justin Erenkrantz <ju...@erenkrantz.com>.
On 7/12/06, jorton@apache.org <jo...@apache.org> wrote:
> Author: jorton
> Date: Wed Jul 12 07:10:25 2006
> New Revision: 421276
>
> URL: http://svn.apache.org/viewvc?rev=421276&view=rev
> Log:
> * 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.
Oops. I didn't think as to how this would affect APR-util.
Thanks! -- justin
Re: svn commit: r421276 - in /apr/apr/trunk: build.conf build/gen-build.py
Posted by Justin Erenkrantz <ju...@erenkrantz.com>.
On 7/12/06, jorton@apache.org <jo...@apache.org> wrote:
> Author: jorton
> Date: Wed Jul 12 07:10:25 2006
> New Revision: 421276
>
> URL: http://svn.apache.org/viewvc?rev=421276&view=rev
> Log:
> * 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.
Oops. I didn't think as to how this would affect APR-util.
Thanks! -- justin