Move all API specs to a separate dir.

53 files changed, 41 insertions, 41 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9370f47..8c76790 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -188,7 +188,7 @@ include_directories (
 add_custom_command (
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp
     COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/glproc.py > ${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp
-    DEPENDS glproc.py dispatch.py wglapi.py glxapi.py cglapi.py glapi.py gltypes.py stdapi.py
+    DEPENDS glproc.py dispatch.py specs/wglapi.py specs/glxapi.py specs/cglapi.py specs/glapi.py specs/gltypes.py specs/stdapi.py
 )
 
 if (WIN32)
@@ -236,7 +236,7 @@ if (WIN32)
         add_custom_command (
             OUTPUT ddrawtrace.cpp
             COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/ddrawtrace.py > ${CMAKE_CURRENT_BINARY_DIR}/ddrawtrace.cpp
-            DEPENDS ddrawtrace.py d3d.py d3dtypes.py d3dcaps.py ddraw.py trace.py winapi.py stdapi.py
+            DEPENDS ddrawtrace.py trace.py specs/d3d.py specs/d3dtypes.py specs/d3dcaps.py specs/ddraw.py specs/winapi.py specs/stdapi.py
         )
         add_library (ddraw MODULE ddraw.def ddrawtrace.cpp)
         set_target_properties (ddraw
@@ -253,7 +253,7 @@ if (WIN32)
         add_custom_command (
             OUTPUT d3d8trace.cpp
             COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/d3d8trace.py > ${CMAKE_CURRENT_BINARY_DIR}/d3d8trace.cpp
-            DEPENDS d3d8trace.py d3d8.py trace.py d3d8types.py d3d8caps.py winapi.py stdapi.py
+            DEPENDS d3d8trace.py trace.py specs/d3d8.py specs/d3d8types.py specs/d3d8caps.py specs/winapi.py specs/stdapi.py
         )
         add_library (d3d8 MODULE d3d8.def d3d8trace.cpp d3dshader.cpp)
         set_target_properties (d3d8
@@ -270,7 +270,7 @@ if (WIN32)
         add_custom_command (
             OUTPUT d3d9trace.cpp
             COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/d3d9trace.py > ${CMAKE_CURRENT_BINARY_DIR}/d3d9trace.cpp
-            DEPENDS d3d9trace.py d3d9.py trace.py d3d9types.py d3d9caps.py winapi.py stdapi.py
+            DEPENDS d3d9trace.py trace.py specs/d3d9.py specs/d3d9types.py specs/d3d9caps.py specs/winapi.py specs/stdapi.py
         )
         add_library (d3d9 MODULE d3d9.def d3d9trace.cpp d3dshader.cpp)
         set_target_properties (d3d9
@@ -287,7 +287,7 @@ if (WIN32)
         add_custom_command (
             OUTPUT d3d10trace.cpp
             COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/d3d10trace.py > ${CMAKE_CURRENT_BINARY_DIR}/d3d10trace.cpp
-            DEPENDS d3d10trace.py d3d10misc.py d3d10.py dxgi.py winapi.py stdapi.py
+            DEPENDS d3d10trace.py trace.py d3d10misc.py specs/d3d10.py specs/dxgi.py specs/winapi.py specs/stdapi.py
         )
         add_library (d3d10 MODULE d3d10.def d3d10trace.cpp)
         set_target_properties (d3d10 PROPERTIES PREFIX "")
@@ -298,7 +298,7 @@ if (WIN32)
     add_custom_command (
         OUTPUT wgltrace.cpp
         COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/wgltrace.py > ${CMAKE_CURRENT_BINARY_DIR}/wgltrace.cpp
-        DEPENDS wgltrace.py gltrace.py trace.py wglapi.py wglenum.py glapi.py glparams.py gltypes.py winapi.py stdapi.py
+        DEPENDS wgltrace.py gltrace.py trace.py specs/wglapi.py specs/wglenum.py specs/glapi.py specs/glparams.py specs/gltypes.py specs/winapi.py specs/stdapi.py
     )
     add_library (wgltrace MODULE opengl32.def
         wgltrace.cpp
@@ -321,7 +321,7 @@ elseif (APPLE)
     add_custom_command (
         OUTPUT cgltrace.cpp
         COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/cgltrace.py > ${CMAKE_CURRENT_BINARY_DIR}/cgltrace.cpp
-        DEPENDS cgltrace.py gltrace.py trace.py cglapi.py glapi.py glparams.py gltypes.py stdapi.py
+        DEPENDS cgltrace.py gltrace.py trace.py specs/cglapi.py specs/glapi.py specs/glparams.py specs/gltypes.py specs/stdapi.py
     )
 
     add_library (cgltrace SHARED
@@ -347,7 +347,7 @@ else ()
     add_custom_command (
         OUTPUT glxtrace.cpp
         COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/glxtrace.py > ${CMAKE_CURRENT_BINARY_DIR}/glxtrace.cpp
-        DEPENDS glxtrace.py gltrace.py trace.py glxapi.py glapi.py glparams.py gltypes.py stdapi.py
+        DEPENDS glxtrace.py gltrace.py trace.py specs/glxapi.py specs/glapi.py specs/glparams.py specs/gltypes.py specs/stdapi.py
     )
 
     add_library (glxtrace SHARED
@@ -380,13 +380,13 @@ endif ()
 add_custom_command (
     OUTPUT glretrace_gl.cpp
     COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/glretrace.py > ${CMAKE_CURRENT_BINARY_DIR}/glretrace_gl.cpp
-    DEPENDS glretrace.py retrace.py codegen.py glapi.py gltypes.py stdapi.py
+    DEPENDS glretrace.py retrace.py codegen.py specs/glapi.py specs/gltypes.py specs/stdapi.py
 )
 
 add_custom_command (
     OUTPUT glstate_params.cpp
     COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/glstate.py > ${CMAKE_CURRENT_BINARY_DIR}/glstate_params.cpp
-    DEPENDS glstate.py glparams.py gltypes.py stdapi.py
+    DEPENDS glstate.py specs/glparams.py specs/gltypes.py specs/stdapi.py
 )
 
 include_directories (
diff --git a/cgltrace.py b/cgltrace.py
index 92626f3..d2b52ef 100644
--- a/cgltrace.py
+++ b/cgltrace.py
@@ -27,9 +27,9 @@
 """Cgl tracing generator."""
 
 
-from stdapi import API
-from glapi import glapi
-from cglapi import cglapi
+from specs.stdapi import API
+from specs.glapi import glapi
+from specs.cglapi import cglapi
 from gltrace import GlTracer
 
 
diff --git a/d3d10trace.py b/d3d10trace.py
index 4cb7904..edcf38a 100644
--- a/d3d10trace.py
+++ b/d3d10trace.py
@@ -24,7 +24,7 @@
 ##########################################################################/
 
 
-from d3d10misc import d3d10
+from specs.d3d10misc import d3d10
 from trace import DllTracer
 
 
diff --git a/d3d8trace.py b/d3d8trace.py
index 236f56c..2b574fb 100644
--- a/d3d8trace.py
+++ b/d3d8trace.py
@@ -24,7 +24,7 @@
 ##########################################################################/
 
 
-from d3d8 import d3d8
+from specs.d3d8 import d3d8
 from trace import DllTracer
 
 
diff --git a/d3d9trace.py b/d3d9trace.py
index b83ebf6..c489be6 100644
--- a/d3d9trace.py
+++ b/d3d9trace.py
@@ -25,7 +25,7 @@
 
 
 from trace import DllTracer
-from d3d9 import d3d9
+from specs.d3d9 import d3d9
 
 
 class D3D9Tracer(DllTracer):
diff --git a/ddrawtrace.py b/ddrawtrace.py
index 0b53f0d..fb8f2a5 100644
--- a/ddrawtrace.py
+++ b/ddrawtrace.py
@@ -24,7 +24,7 @@
 ##########################################################################/
 
 
-from d3d import ddraw, interfaces
+from specs.d3d import ddraw, interfaces
 from trace import DllTracer
 
 
diff --git a/dispatch.py b/dispatch.py
index 701e820..2d9d6ec 100644
--- a/dispatch.py
+++ b/dispatch.py
@@ -28,7 +28,7 @@
 """ 
 
 
-import stdapi
+import specs.stdapi as stdapi
 
 
 def function_pointer_type(function):
diff --git a/glproc.py b/glproc.py
index 7c7beb9..05a3201 100644
--- a/glproc.py
+++ b/glproc.py
@@ -29,12 +29,12 @@ covers all the functions we support.
 """ 
 
 
-import stdapi
+import specs.stdapi as stdapi
 from dispatch import Dispatcher
-from glapi import glapi
-from glxapi import glxapi
-from wglapi import wglapi
-from cglapi import cglapi
+from specs.glapi import glapi
+from specs.glxapi import glxapi
+from specs.wglapi import wglapi
+from specs.cglapi import cglapi
 
 
 # See http://www.opengl.org/registry/ABI/
diff --git a/glretrace.py b/glretrace.py
index 356659a..4edd93a 100644
--- a/glretrace.py
+++ b/glretrace.py
@@ -27,8 +27,8 @@
 """GL retracer generator."""
 
 
-import stdapi
-import glapi
+import specs.stdapi as stdapi
+import specs.glapi as glapi
 from retrace import Retracer
 
 
diff --git a/glstate.py b/glstate.py
index c348d2b..acd43d0 100644
--- a/glstate.py
+++ b/glstate.py
@@ -27,10 +27,10 @@
 '''Generate code to dump most GL state into JSON.'''
 
 
-from stdapi import *
+from specs.stdapi import *
 
-from gltypes import *
-from glparams import *
+from specs.gltypes import *
+from specs.glparams import *
 
 
 texture_targets = [
diff --git a/gltrace.py b/gltrace.py
index f935e29..bb9d9e0 100644
--- a/gltrace.py
+++ b/gltrace.py
@@ -27,10 +27,10 @@
 """GL tracing generator."""
 
 
-import stdapi
-import glapi
-import glparams
-from glxapi import glxapi
+import specs.stdapi as stdapi
+import specs.glapi as glapi
+import specs.glparams as glparams
+from specs.glxapi import glxapi
 from trace import Tracer, dump_instance
 
 
diff --git a/glxtrace.py b/glxtrace.py
index 6b5d786..70d9c1b 100644
--- a/glxtrace.py
+++ b/glxtrace.py
@@ -28,9 +28,9 @@
 """GLX tracing generator."""
 
 
-from stdapi import API
-from glapi import glapi
-from glxapi import glxapi
+from specs.stdapi import API
+from specs.glapi import glapi
+from specs.glxapi import glxapi
 from gltrace import GlTracer
 from dispatch import function_pointer_type, function_pointer_value
 
diff --git a/retrace.py b/retrace.py
index 392519b..724f522 100644
--- a/retrace.py
+++ b/retrace.py
@@ -26,8 +26,8 @@
 
 """Generic retracing code generator."""
 
-import stdapi
-import glapi
+import specs.stdapi as stdapi
+import specs.glapi as glapi
 from codegen import *
 
 
diff --git a/specs/__init__.py b/specs/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/specs/__init__.py
diff --git a/cglapi.py b/specs/cglapi.py
index 1aac1b2..1aac1b2 100644
--- a/cglapi.py
+++ b/specs/cglapi.py
diff --git a/d3d.py b/specs/d3d.py
index 857e5b3..857e5b3 100644
--- a/d3d.py
+++ b/specs/d3d.py
diff --git a/d3d10.py b/specs/d3d10.py
index 8af7ee5..8af7ee5 100644
--- a/d3d10.py
+++ b/specs/d3d10.py
diff --git a/d3d10_1.py b/specs/d3d10_1.py
index ebf2896..ebf2896 100644
--- a/d3d10_1.py
+++ b/specs/d3d10_1.py
diff --git a/d3d10misc.py b/specs/d3d10misc.py
index 1e1580f..1e1580f 100644
--- a/d3d10misc.py
+++ b/specs/d3d10misc.py
diff --git a/d3d8.py b/specs/d3d8.py
index 0713696..0713696 100644
--- a/d3d8.py
+++ b/specs/d3d8.py
diff --git a/d3d8caps.py b/specs/d3d8caps.py
index 87e7625..87e7625 100644
--- a/d3d8caps.py
+++ b/specs/d3d8caps.py
diff --git a/d3d8types.py b/specs/d3d8types.py
index 6136d98..6136d98 100644
--- a/d3d8types.py
+++ b/specs/d3d8types.py
diff --git a/d3d9.py b/specs/d3d9.py
index ffb643e..ffb643e 100644
--- a/d3d9.py
+++ b/specs/d3d9.py
diff --git a/d3d9caps.py b/specs/d3d9caps.py
index 1c0188f..1c0188f 100644
--- a/d3d9caps.py
+++ b/specs/d3d9caps.py
diff --git a/d3d9types.py b/specs/d3d9types.py
index 73011ee..73011ee 100644
--- a/d3d9types.py
+++ b/specs/d3d9types.py
diff --git a/d3dcaps.py b/specs/d3dcaps.py
index 0fa9f1c..0fa9f1c 100644
--- a/d3dcaps.py
+++ b/specs/d3dcaps.py
diff --git a/d3dtypes.py b/specs/d3dtypes.py
index c80da76..c80da76 100644
--- a/d3dtypes.py
+++ b/specs/d3dtypes.py
diff --git a/ddraw.py b/specs/ddraw.py
index eb5a072..eb5a072 100644
--- a/ddraw.py
+++ b/specs/ddraw.py
diff --git a/debug.py b/specs/debug.py
index 0a00474..0a00474 100644
--- a/debug.py
+++ b/specs/debug.py
diff --git a/dxgi.py b/specs/dxgi.py
index e77c0b5..e77c0b5 100644
--- a/dxgi.py
+++ b/specs/dxgi.py
diff --git a/dxgiformat.py b/specs/dxgiformat.py
index 1d00f64..1d00f64 100644
--- a/dxgiformat.py
+++ b/specs/dxgiformat.py
diff --git a/dxgitype.py b/specs/dxgitype.py
index 31cadde..31cadde 100644
--- a/dxgitype.py
+++ b/specs/dxgitype.py
diff --git a/glapi.py b/specs/glapi.py
index e5edd99..e5edd99 100644
--- a/glapi.py
+++ b/specs/glapi.py
diff --git a/glparams.py b/specs/glparams.py
index 8636877..8636877 100644
--- a/glparams.py
+++ b/specs/glparams.py
diff --git a/gltypes.py b/specs/gltypes.py
index e25cd7e..e25cd7e 100644
--- a/gltypes.py
+++ b/specs/gltypes.py
diff --git a/glxapi.py b/specs/glxapi.py
index 361e89a..361e89a 100644
--- a/glxapi.py
+++ b/specs/glxapi.py
diff --git a/apigen/.gitignore b/specs/scripts/.gitignore
index 1dbc0cf..1dbc0cf 100644
--- a/apigen/.gitignore
+++ b/specs/scripts/.gitignore
diff --git a/apigen/Makefile b/specs/scripts/Makefile
index 2ea2066..2ea2066 100644
--- a/apigen/Makefile
+++ b/specs/scripts/Makefile
diff --git a/apigen/README b/specs/scripts/README
index 6df2a3d..6df2a3d 100644
--- a/apigen/README
+++ b/specs/scripts/README
diff --git a/apigen/cdecl.py b/specs/scripts/cdecl.py
index 4f36b3c..4f36b3c 100755
--- a/apigen/cdecl.py
+++ b/specs/scripts/cdecl.py
diff --git a/apigen/glparams.sed b/specs/scripts/glparams.sed
index 8afde64..8afde64 100644
--- a/apigen/glparams.sed
+++ b/specs/scripts/glparams.sed
diff --git a/apigen/glspec.py b/specs/scripts/glspec.py
index dbd20ce..dbd20ce 100755
--- a/apigen/glspec.py
+++ b/specs/scripts/glspec.py
diff --git a/apigen/gltxt.py b/specs/scripts/gltxt.py
index c6be7c1..c6be7c1 100755
--- a/apigen/gltxt.py
+++ b/specs/scripts/gltxt.py
diff --git a/apigen/reference-opengl-arb.sh b/specs/scripts/reference-opengl-arb.sh
index 670ba17..670ba17 100755
--- a/apigen/reference-opengl-arb.sh
+++ b/specs/scripts/reference-opengl-arb.sh
diff --git a/apigen/reference-opengl-man.sh b/specs/scripts/reference-opengl-man.sh
index 20bdaa6..20bdaa6 100755
--- a/apigen/reference-opengl-man.sh
+++ b/specs/scripts/reference-opengl-man.sh
diff --git a/apigen/sort.sh b/specs/scripts/sort.sh
index 5cdc6a4..5cdc6a4 100755
--- a/apigen/sort.sh
+++ b/specs/scripts/sort.sh
diff --git a/apigen/wglenum.sh b/specs/scripts/wglenum.sh
index 97f969d..97f969d 100755
--- a/apigen/wglenum.sh
+++ b/specs/scripts/wglenum.sh
diff --git a/stdapi.py b/specs/stdapi.py
index d6973c1..d6973c1 100644
--- a/stdapi.py
+++ b/specs/stdapi.py
diff --git a/wglapi.py b/specs/wglapi.py
index 7296aeb..7296aeb 100644
--- a/wglapi.py
+++ b/specs/wglapi.py
diff --git a/wglenum.py b/specs/wglenum.py
index 1056092..1056092 100644
--- a/wglenum.py
+++ b/specs/wglenum.py
diff --git a/winapi.py b/specs/winapi.py
index 17256aa..17256aa 100644
--- a/winapi.py
+++ b/specs/winapi.py
diff --git a/trace.py b/trace.py
index 626f2dd..59e1a83 100644
--- a/trace.py
+++ b/trace.py
@@ -26,7 +26,7 @@
 """Common trace code generation."""
 
 
-import stdapi
+import specs.stdapi as stdapi
 from dispatch import Dispatcher
 
 
diff --git a/wgltrace.py b/wgltrace.py
index 17d1acc..3a49c87 100644
--- a/wgltrace.py
+++ b/wgltrace.py
@@ -27,9 +27,9 @@
 """WGL tracing code generator."""
 
 
-from stdapi import API
-from glapi import glapi
-from wglapi import wglapi
+from specs.stdapi import API
+from specs.glapi import glapi
+from specs.wglapi import wglapi
 from dispatch import function_pointer_type, function_pointer_value
 from gltrace import GlTracer
 from codegen import *