[tor-commits] [tor-browser-bundle/master] Bug 18919: Remove swig dependencies and wine-wrapper.

[gk at torproject.org]

commit 4f80e41c593e5680bfe31fcb421d04fc7d875c89
Author: David Fifield <david at bamsoftware.com>
Date:   Sat Apr 23 09:30:15 2016 -0700

    Bug 18919: Remove swig dependencies and wine-wrapper.
    
    swig was only needed as a dependency of M2crypto, which was removed in
    969136e13861c1cc6d983a66a82736a1fae971c3.
---
 gitian/build-helpers/wine-wrappers/setup.py        |  2 +-
 gitian/build-helpers/wine-wrappers/swig.py         | 33 ----------------------
 .../linux/gitian-pluggable-transports.yml          |  2 --
 .../mac/gitian-pluggable-transports.yml            |  2 --
 .../windows/gitian-pluggable-transports.yml        |  2 +-
 5 files changed, 2 insertions(+), 39 deletions(-)

diff --git a/gitian/build-helpers/wine-wrappers/setup.py b/gitian/build-helpers/wine-wrappers/setup.py
index 77a9526..f80f2c0 100644
--- a/gitian/build-helpers/wine-wrappers/setup.py
+++ b/gitian/build-helpers/wine-wrappers/setup.py
@@ -1,7 +1,7 @@
 from distutils.core import setup
 import py2exe
 setup(
-    console=["gcc.py", "g++.py", "dllwrap.py", "swig.py"],
+    console=["gcc.py", "g++.py", "dllwrap.py"],
     zipfile=None,
     options={"py2exe": {"bundle_files": 1, "compressed": True}}
 )
diff --git a/gitian/build-helpers/wine-wrappers/swig.py b/gitian/build-helpers/wine-wrappers/swig.py
deleted file mode 100755
index 45941f4..0000000
--- a/gitian/build-helpers/wine-wrappers/swig.py
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/bin/env python
-
-# A wrapper for swig that converts Windows paths to Unix paths, so that swig can
-# be called by Python distutils.
-
-import os
-import subprocess
-import sys
-
-import common
-
-args = ["/usr/bin/swig"]
-sys.argv.pop(0)
-while sys.argv:
-    a = sys.argv.pop(0)
-    if not a.startswith("-"):
-        args.append(common.winepath(a))
-        continue
-    if a in ("-I",):
-        args.append(a)
-        args.append(common.winepath(sys.argv.pop(0)))
-        continue
-    o = common.search_startswith(a, ("-I",))
-    if o is not None:
-        path = a[len(o):]
-        args.append("%s%s" % (o, common.winepath(path)))
-        continue
-    args.append(a)
-p = common.popen_faketime(args, stderr=subprocess.PIPE)
-stderr = p.stderr.read()
-sys.stderr.write(stderr)
-if " Error: " in stderr:
-    sys.exit(1)
diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml b/gitian/descriptors/linux/gitian-pluggable-transports.yml
index cecc390..38ae561 100644
--- a/gitian/descriptors/linux/gitian-pluggable-transports.yml
+++ b/gitian/descriptors/linux/gitian-pluggable-transports.yml
@@ -11,8 +11,6 @@ packages:
 - "unzip"
 - "python-setuptools"
 - "python-dev"
-# Needed by M2Crypto
-- "swig"
 - "zip"
 - "hardening-wrapper"
 reference_datetime: "2000-01-01 00:00:00"
diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml b/gitian/descriptors/mac/gitian-pluggable-transports.yml
index 6b1a99e..fbf38c2 100644
--- a/gitian/descriptors/mac/gitian-pluggable-transports.yml
+++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml
@@ -10,8 +10,6 @@ packages:
 - "unzip"
 - "python-setuptools"
 - "python-dev"
-# Needed by M2Crypto
-- "swig"
 - "zip"
 reference_datetime: "2000-01-01 00:00:00"
 remotes:
diff --git a/gitian/descriptors/windows/gitian-pluggable-transports.yml b/gitian/descriptors/windows/gitian-pluggable-transports.yml
index 9c1642d..f073fd1 100644
--- a/gitian/descriptors/windows/gitian-pluggable-transports.yml
+++ b/gitian/descriptors/windows/gitian-pluggable-transports.yml
@@ -136,7 +136,7 @@ script: |
   mkdir -p build/bdist.win32/winexe/bundle-2.7/
   cp -a $INSTDIR/python/python27.dll build/bdist.win32/winexe/bundle-2.7/
   LD_PRELOAD= $INSTPYTHON setup.py py2exe
-  cp -a dist/gcc.exe dist/g++.exe dist/dllwrap.exe dist/swig.exe $WINEROOT/windows/
+  cp -a dist/gcc.exe dist/g++.exe dist/dllwrap.exe $WINEROOT/windows/
   cd ..
 
   # Building go