svn commit: r1934267 - in apr/apr/trunk: . build

Author: ivan
Date: Sat May 16 16:52:13 2026
New Revision: 1934267

Log:
Remove support for generating Visual C++ 6.0 and NMake files.

* build.conf
  (): Remove `dsp = libapr.dsp`.

* build/cvtdsp.pl: Delete.

* build/fixwin32mak.pl: Delete.

* build/gen-build.py
  (main): Remove support for updating .dsp files.

Deleted:
   apr/apr/trunk/build/cvtdsp.pl
   apr/apr/trunk/build/fixwin32mak.pl
Modified:
   apr/apr/trunk/build.conf
   apr/apr/trunk/build/gen-build.py

Modified: apr/apr/trunk/build.conf
==============================================================================
--- apr/apr/trunk/build.conf	Sat May 16 16:14:40 2026	(r1934266)
+++ apr/apr/trunk/build.conf	Sat May 16 16:52:13 2026	(r1934267)
@@ -56,8 +56,6 @@ headers = include/*.h
 # we have a recursive makefile for the test files (for now)
 # test/*.c
 
-dsp = libapr.dsp
-
 modules =
   crypto_openssl crypto_nss crypto_commoncrypto dbd_pgsql
   dbd_sqlite2 dbd_sqlite3 dbd_oracle dbd_mysql dbd_odbc

Modified: apr/apr/trunk/build/gen-build.py
==============================================================================
--- apr/apr/trunk/build/gen-build.py	Sat May 16 16:14:40 2026	(r1934266)
+++ apr/apr/trunk/build/gen-build.py	Sat May 16 16:52:13 2026	(r1934267)
@@ -2,7 +2,7 @@
 #
 # USAGE: gen-build.py TYPE
 #
-# where TYPE is one of: make, dsp, vcproj
+# where TYPE is one of: make
 #
 # It reads build.conf from the current directory, and produces its output
 # into the current directory.
@@ -43,11 +43,6 @@ 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
@@ -75,24 +70,7 @@ def main():
     # record the object symbols to build for each platform
     group = [ '$(OBJECTS_all)' ]
 
-    # 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' and dsp_file:
-      for line in open(dsp_file).readlines():
-        if line[:7] != 'SOURCE=':
-          continue
-        if line[7:].find('unix') != -1:
-          # skip the leading .\ and split it out
-          inherit_files = line[9:].strip().split('\\')
-          # change the .c to .lo
-          assert inherit_files[-1][-2:] == '.c'
-          inherit_files[-1] = inherit_files[-1][:-2] + '.lo'
-          # replace the \\'s with /'s
-          inherit_line = '/'.join(inherit_files)
-          if inherit_files[0] not in inherit_parent:
-            inherit_parent[inherit_files[0]] = []
-          inherit_parent[inherit_files[0]].append(inherit_line)
 
     for subdir in parser.get('options', 'platform_dirs').split():
       path = '%s/%s' % (subdir, platform)