Added few more stubs so that control reaches to DestroyDevice().

[mesa.git] / src / SConscript

diff --git a/src/SConscript b/src/SConscript
index c31e4ec06fa5666cd118097620abd5ab0614cdfd..3e6baa094c11a9d0396697ed88eed3bf544ad182 100644 (file)
--- a/src/SConscript
+++ b/src/SConscript
@@ -1,6 +1,7 @@
 import filecmp
 import os
 import subprocess
 import filecmp
 import os
 import subprocess

+from sys import executable as python_cmd

 
 Import('*')
 
 
 Import('*')
 


@@ -22,22 +23,12 @@ def write_git_sha1_h_file(filename):
     to retrieve the git hashid and write the header file.  An empty file
     will be created if anything goes wrong."""
 
     to retrieve the git hashid and write the header file.  An empty file
     will be created if anything goes wrong."""
 

-    tempfile = "git_sha1.h.tmp"
-    with open(tempfile, "w") as f:
-        args = [ 'sh', Dir('#').abspath + '/git_sha1_gen.sh' ]
-        try:
-            subprocess.Popen(args, stdout=f).wait()
-        except:
-            print "Warning: exception in write_git_sha1_h_file()"
-            return
-
-    if not os.path.exists(filename) or not filecmp.cmp(tempfile, filename):
-        # The filename does not exist or it's different from the new file,
-        # so replace old file with new.
-        if os.path.exists(filename):
-            os.remove(filename)
-        os.rename(tempfile, filename)
-    return
+    args = [ python_cmd, Dir('#').abspath + '/bin/git_sha1_gen.py', '--output', filename ]
+    try:
+        subprocess.call(args)
+    except:
+        print("Warning: exception in write_git_sha1_h_file()")
+        return

 
 
 # Create the git_sha1.h header file
 
 
 # Create the git_sha1.h header file


@@ -50,27 +41,10 @@ env.Append(CPPPATH = ["#" + env['build_dir']])
 if env['platform'] != 'windows':
     SConscript('loader/SConscript')
 
 if env['platform'] != 'windows':
     SConscript('loader/SConscript')
 

-# When env['gles'] is set, the targets defined in mapi/glapi/SConscript are not
-# used.  libgl-xlib and libgl-gdi adapt themselves to use the targets defined
-# in mapi/glapi-shared/SConscript.  mesa/SConscript also adapts itself to
-# enable OpenGL ES support.

 SConscript('mapi/glapi/gen/SConscript')
 SConscript('mapi/glapi/SConscript')
 
 SConscript('mapi/glapi/gen/SConscript')
 SConscript('mapi/glapi/SConscript')
 

-# Haiku C++ libGL dispatch (renderers depend on libgl)
-if env['platform'] in ['haiku']:
-    SConscript('hgl/SConscript')
-

 SConscript('mesa/SConscript')
 
 SConscript('mesa/SConscript')
 

-if not env['embedded']:
-    if env['platform'] not in ('cygwin', 'darwin', 'freebsd', 'haiku', 'windows'):
-        SConscript('glx/SConscript')
-    if env['platform'] == 'haiku':
-        SConscript('egl/SConscript')
-
-    if env['gles']:
-        SConscript('mapi/shared-glapi/SConscript')
-

 SConscript('gallium/SConscript')
 
 SConscript('gallium/SConscript')