no more ubuntu hacks

2 files changed, 0 insertions, 57 deletions

diff --git a/buildscripts/__init__.py b/buildscripts/__init__.py
index 3fbef4d84e2..da6f3cf1f17 100644
--- a/buildscripts/__init__.py
+++ b/buildscripts/__init__.py
@@ -4,7 +4,4 @@ import hacks_ubuntu
 import os;
 
 def findHacks( un ):
-    if un[0] == 'Linux' and (os.path.exists("/etc/debian_version") or
-                             un[3].find("Ubuntu") >= 0):
-        return hacks_ubuntu
     return None
diff --git a/buildscripts/hacks_ubuntu.py b/buildscripts/hacks_ubuntu.py
deleted file mode 100644
index 3de1a6f0b7e..00000000000
--- a/buildscripts/hacks_ubuntu.py
+++ /dev/null
@@ -1,54 +0,0 @@
-
-import os
-
-def insert( env , options ):
-
-    # now that sm is in the source tree, don't need this
-    # if not foundxulrunner( env , options ):
-    #     if os.path.exists( "usr/include/mozjs/" ):
-    #         env.Append( CPPDEFINES=[ "MOZJS" ] )
-
-    return
-
-def foundxulrunner( env , options ):
-    best = None
-
-    for x in os.listdir( "/usr/include" ):
-        if x.find( "xulrunner" ) != 0:
-            continue
-        if x == "xulrunner":
-            best = x
-            break
-        best = x
-        
-
-    if best is None:
-        print( "warning: using ubuntu without xulrunner-dev.  we recommend installing it" )
-        return False
-
-    incroot = "/usr/include/" + best + "/"
-    libroot = "/usr/lib"
-    if options["linux64"] and os.path.exists("/usr/lib64"):
-        libroot += "64";
-    libroot += "/" + best
-
-    
-    if not os.path.exists( libroot ):
-        print( "warning: found xulrunner include but not lib for: " + best )
-        return False
-    
-    env.Prepend( LIBPATH=[ libroot ] )
-    env.Prepend( RPATH=[ libroot ] )
-
-    env.Prepend( CPPPATH=[ incroot + "stable/" , 
-                           incroot + "unstable/" ,
-                           incroot ] )
-    env.Prepend( CPPPATH=[ "/usr/include/nspr/" ] )
-    
-    env.Append( CPPDEFINES=[ "XULRUNNER" , "OLDJS" ] )
-    if best.find( "1.9.0" ) >= 0 or best.endswith("1.9"):
-        if best.endswith( "1.9.1.9" ):
-            pass
-        else:
-            env.Append( CPPDEFINES=[ "XULRUNNER190" ] )
-    return True