subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bre...@apache.org
Subject svn commit: r1560864 - in /subversion/trunk: build/generator/gen_win.py build/generator/gen_win_dependencies.py build/generator/templates/build_zlib.ezt gen-make.py
Date Fri, 24 Jan 2014 01:03:20 GMT
Author: breser
Date: Fri Jan 24 01:03:19 2014
New Revision: 1560864

URL: http://svn.apache.org/r1560864
Log:
On further thought just remove support for ASM Zlib entirely.

Since the ASM implementations of Zlib have bugs that we run into there's
no reason anyone should use them.  If that changes we can revert this
in the future.

* gen-make.py
  (_usage_exit, __main__): Remove enable-ml option.
* build/generator/gen_win_dependencies.py
  (GenDependenciesBase.parse_options): Remove enable-ml option
  (GenDependenciesBase._find_ml): Remove
  (GenDependenciesBase._find_zlib): Remove call to _find_ml

* build/generator/gen_win.py
  (WinGeneratorBase.__init__, WinGeneratorBase.write_zlib_project_file):
    remove use_ml from data sent to ezt.
* build/generator/templates/build_zlib.ezt
  (): Remove the code to use the assembler from bat file


Modified:
    subversion/trunk/build/generator/gen_win.py
    subversion/trunk/build/generator/gen_win_dependencies.py
    subversion/trunk/build/generator/templates/build_zlib.ezt
    subversion/trunk/gen-make.py

Modified: subversion/trunk/build/generator/gen_win.py
URL: http://svn.apache.org/viewvc/subversion/trunk/build/generator/gen_win.py?rev=1560864&r1=1560863&r2=1560864&view=diff
==============================================================================
--- subversion/trunk/build/generator/gen_win.py (original)
+++ subversion/trunk/build/generator/gen_win.py Fri Jan 24 01:03:19 2014
@@ -117,8 +117,7 @@ class WinGeneratorBase(gen_win_dependenc
     # Generate the build_zlib.bat file
     if self._libraries['zlib'].is_src:
       data = {'zlib_path': os.path.relpath(self.zlib_path, self.projfilesdir),
-              'zlib_version': self.zlib_version,
-              'use_ml': self.have_ml and 1 or None}
+              'zlib_version': self.zlib_version}
       bat = os.path.join(self.projfilesdir, 'build_zlib.bat')
       self.write_with_template(bat, 'templates/build_zlib.ezt', data)
 
@@ -981,7 +980,6 @@ class WinGeneratorBase(gen_win_dependenc
                          ('zlib_headers', zlib_headers),
                          ('zlib_version', self.zlib_version),
                          ('project_guid', self.makeguid('zlib')),
-                         ('use_ml', self.have_ml and 1 or None),
                         ))
 
   def write_serf_project_file(self, name):

Modified: subversion/trunk/build/generator/gen_win_dependencies.py
URL: http://svn.apache.org/viewvc/subversion/trunk/build/generator/gen_win_dependencies.py?rev=1560864&r1=1560863&r2=1560864&view=diff
==============================================================================
--- subversion/trunk/build/generator/gen_win_dependencies.py (original)
+++ subversion/trunk/build/generator/gen_win_dependencies.py Fri Jan 24 01:03:19 2014
@@ -168,9 +168,6 @@ class GenDependenciesBase(gen_base.Gener
     # NLS options
     self.enable_nls = None
 
-    # ML (assembler) is disabled by default; use --enable-ml to detect
-    self.enable_ml = None
-
     for opt, val in options:
       if opt == '--with-berkeley-db':
         self.bdb_path = val
@@ -215,8 +212,6 @@ class GenDependenciesBase(gen_base.Gener
         self.enable_nls = 1
       elif opt == '--enable-bdb-in-apr-util':
         self.configure_apr_util = 1
-      elif opt == '--enable-ml':
-        self.enable_ml = 1
       elif opt == '--disable-shared':
         self.disable_shared = 1
       elif opt == '--with-static-apr':
@@ -733,8 +728,6 @@ class GenDependenciesBase(gen_base.Gener
                                                 self.zlib_version,
                                                 debug_lib_name=debug_lib_name,
                                                 is_src=is_src)
-    if is_src:
-      self._find_ml()
 
   def _find_bdb(self, show_warnings):
     "Find the Berkeley DB library and version"
@@ -1146,25 +1139,6 @@ class GenDependenciesBase(gen_base.Gener
                                                swig_ver)
     return True
 
-  def _find_ml(self):
-    "Check if the ML assembler is in the path"
-    if not self.enable_ml:
-      self.have_ml = 0
-      return
-    fp = os.popen('ml /help', 'r')
-    try:
-      line = fp.readline()
-      if line:
-        msg = 'Found ML, ZLib build will use ASM sources\n' + \
-              'WARNING: ASM sources have known bugs and are not recommended!'
-        self.have_ml = 1
-      else:
-        msg = 'Could not find ML, ZLib build will not use ASM sources'
-        self.have_ml = 0
-      print('%s\n' % (msg,))
-    finally:
-      fp.close()
-
   def _get_serf_version(self, inc_dir):
     "Retrieves the serf version from serf.h"
 

Modified: subversion/trunk/build/generator/templates/build_zlib.ezt
URL: http://svn.apache.org/viewvc/subversion/trunk/build/generator/templates/build_zlib.ezt?rev=1560864&r1=1560863&r2=1560864&view=diff
==============================================================================
--- subversion/trunk/build/generator/templates/build_zlib.ezt (original)
+++ subversion/trunk/build/generator/templates/build_zlib.ezt Fri Jan 24 01:03:19 2014
@@ -44,25 +44,6 @@ if /i "%2" == "x64" goto PX64
 goto pIIerr
 
 :checkrebuild
-
-[if-any use_ml]
-@rem **************************************************************************
-@rem Compile ASM sources with ML
-set ASFLAGS=-nologo -Zi -coff
-set LOC=-DASMV -DASMINF
-[is zlib_version "1.2.4"]
-set OBJA=contrib\masmx86\gvmat32c.obj contrib\masmx86\gvmat32.obj contrib\masmx86\inffas32.obj
-set ASM_OPTS=ASFLAGS="%ASFLAGS%" LOC="%LOC%" OBJA="%OBJA%"
-[else]
-if /i "%2" == "Win32" (
-  set ASM_OPTS=LOC="-DASMV -DASMINF" OBJA="inffas32.obj match686.obj" "AS=ml -safeseh"
-) else if /i "%2" == "x64" (
-  set ASM_OPTS=LOC="-DASMV -DASMINF" OBJA="inffasx64.obj gvmat64.obj inffas8664.obj" AS=ml64

-)
-[end]
-[end]
-
-
 if /i "%3" == "rebuild" goto rebuild
 if /i "%3" == "clean" goto clean
 if not "%3" == "" goto pIIIerr

Modified: subversion/trunk/gen-make.py
URL: http://svn.apache.org/viewvc/subversion/trunk/gen-make.py?rev=1560864&r1=1560863&r2=1560864&view=diff
==============================================================================
--- subversion/trunk/gen-make.py (original)
+++ subversion/trunk/gen-make.py Fri Jan 24 01:03:19 2014
@@ -196,9 +196,6 @@ def _usage_exit(err=None):
   print("  --enable-bdb-in-apr-util")
   print("           configure APR-Util to use Berkeley DB")
   print("")
-  print("  --enable-ml")
-  print("           enable use of ML assembler with zlib")
-  print("")
   print("  --disable-shared")
   print("           only build static libraries")
   print("")
@@ -262,7 +259,6 @@ if __name__ == '__main__':
                             'enable-quantify',
                             'enable-nls',
                             'enable-bdb-in-apr-util',
-                            'enable-ml',
                             'disable-shared',
                             'installed-libs=',
                             'vsnet-version=',



Mime
View raw message