apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jor...@apache.org
Subject svn commit: r421276 - in /apr/apr/trunk: build.conf build/gen-build.py
Date Wed, 12 Jul 2006 14:10:26 GMT
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:



Mime
View raw message