From bd86a22d1a17fc33a32e80e48eec3b4338081a69 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jos=C3=A9=20Fonseca?= <jose.r.fonseca@gmail.com>
Date: Tue, 27 Sep 2011 09:21:38 +0100
Subject: [PATCH] Move all API specs to a separate dir.
---
CMakeLists.txt | 20 +++++++++----------
cgltrace.py | 6 +++---
d3d10trace.py | 2 +-
d3d8trace.py | 2 +-
d3d9trace.py | 2 +-
ddrawtrace.py | 2 +-
dispatch.py | 2 +-
glproc.py | 10 +++++-----
glretrace.py | 4 ++--
glstate.py | 6 +++---
gltrace.py | 8 ++++----
glxtrace.py | 6 +++---
retrace.py | 4 ++--
specs/__init__.py | 0
cglapi.py => specs/cglapi.py | 0
d3d.py => specs/d3d.py | 0
d3d10.py => specs/d3d10.py | 0
d3d10_1.py => specs/d3d10_1.py | 0
d3d10misc.py => specs/d3d10misc.py | 0
d3d8.py => specs/d3d8.py | 0
d3d8caps.py => specs/d3d8caps.py | 0
d3d8types.py => specs/d3d8types.py | 0
d3d9.py => specs/d3d9.py | 0
d3d9caps.py => specs/d3d9caps.py | 0
d3d9types.py => specs/d3d9types.py | 0
d3dcaps.py => specs/d3dcaps.py | 0
d3dtypes.py => specs/d3dtypes.py | 0
ddraw.py => specs/ddraw.py | 0
debug.py => specs/debug.py | 0
dxgi.py => specs/dxgi.py | 0
dxgiformat.py => specs/dxgiformat.py | 0
dxgitype.py => specs/dxgitype.py | 0
glapi.py => specs/glapi.py | 0
glparams.py => specs/glparams.py | 0
gltypes.py => specs/gltypes.py | 0
glxapi.py => specs/glxapi.py | 0
{apigen => specs/scripts}/.gitignore | 0
{apigen => specs/scripts}/Makefile | 0
{apigen => specs/scripts}/README | 0
{apigen => specs/scripts}/cdecl.py | 0
{apigen => specs/scripts}/glparams.sed | 0
{apigen => specs/scripts}/glspec.py | 0
{apigen => specs/scripts}/gltxt.py | 0
.../scripts}/reference-opengl-arb.sh | 0
.../scripts}/reference-opengl-man.sh | 0
{apigen => specs/scripts}/sort.sh | 0
{apigen => specs/scripts}/wglenum.sh | 0
stdapi.py => specs/stdapi.py | 0
wglapi.py => specs/wglapi.py | 0
wglenum.py => specs/wglenum.py | 0
winapi.py => specs/winapi.py | 0
trace.py | 2 +-
wgltrace.py | 6 +++---
53 files changed, 41 insertions(+), 41 deletions(-)
create mode 100644 specs/__init__.py
rename cglapi.py => specs/cglapi.py (100%)
rename d3d.py => specs/d3d.py (100%)
rename d3d10.py => specs/d3d10.py (100%)
rename d3d10_1.py => specs/d3d10_1.py (100%)
rename d3d10misc.py => specs/d3d10misc.py (100%)
rename d3d8.py => specs/d3d8.py (100%)
rename d3d8caps.py => specs/d3d8caps.py (100%)
rename d3d8types.py => specs/d3d8types.py (100%)
rename d3d9.py => specs/d3d9.py (100%)
rename d3d9caps.py => specs/d3d9caps.py (100%)
rename d3d9types.py => specs/d3d9types.py (100%)
rename d3dcaps.py => specs/d3dcaps.py (100%)
rename d3dtypes.py => specs/d3dtypes.py (100%)
rename ddraw.py => specs/ddraw.py (100%)
rename debug.py => specs/debug.py (100%)
rename dxgi.py => specs/dxgi.py (100%)
rename dxgiformat.py => specs/dxgiformat.py (100%)
rename dxgitype.py => specs/dxgitype.py (100%)
rename glapi.py => specs/glapi.py (100%)
rename glparams.py => specs/glparams.py (100%)
rename gltypes.py => specs/gltypes.py (100%)
rename glxapi.py => specs/glxapi.py (100%)
rename {apigen => specs/scripts}/.gitignore (100%)
rename {apigen => specs/scripts}/Makefile (100%)
rename {apigen => specs/scripts}/README (100%)
rename {apigen => specs/scripts}/cdecl.py (100%)
rename {apigen => specs/scripts}/glparams.sed (100%)
rename {apigen => specs/scripts}/glspec.py (100%)
rename {apigen => specs/scripts}/gltxt.py (100%)
rename {apigen => specs/scripts}/reference-opengl-arb.sh (100%)
rename {apigen => specs/scripts}/reference-opengl-man.sh (100%)
rename {apigen => specs/scripts}/sort.sh (100%)
rename {apigen => specs/scripts}/wglenum.sh (100%)
rename stdapi.py => specs/stdapi.py (100%)
rename wglapi.py => specs/wglapi.py (100%)
rename wglenum.py => specs/wglenum.py (100%)
rename winapi.py => specs/winapi.py (100%)
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
diff --git a/cglapi.py b/specs/cglapi.py
similarity index 100%
rename from cglapi.py
rename to specs/cglapi.py
diff --git a/d3d.py b/specs/d3d.py
similarity index 100%
rename from d3d.py
rename to specs/d3d.py
diff --git a/d3d10.py b/specs/d3d10.py
similarity index 100%
rename from d3d10.py
rename to specs/d3d10.py
diff --git a/d3d10_1.py b/specs/d3d10_1.py
similarity index 100%
rename from d3d10_1.py
rename to specs/d3d10_1.py
diff --git a/d3d10misc.py b/specs/d3d10misc.py
similarity index 100%
rename from d3d10misc.py
rename to specs/d3d10misc.py
diff --git a/d3d8.py b/specs/d3d8.py
similarity index 100%
rename from d3d8.py
rename to specs/d3d8.py
diff --git a/d3d8caps.py b/specs/d3d8caps.py
similarity index 100%
rename from d3d8caps.py
rename to specs/d3d8caps.py
diff --git a/d3d8types.py b/specs/d3d8types.py
similarity index 100%
rename from d3d8types.py
rename to specs/d3d8types.py
diff --git a/d3d9.py b/specs/d3d9.py
similarity index 100%
rename from d3d9.py
rename to specs/d3d9.py
diff --git a/d3d9caps.py b/specs/d3d9caps.py
similarity index 100%
rename from d3d9caps.py
rename to specs/d3d9caps.py
diff --git a/d3d9types.py b/specs/d3d9types.py
similarity index 100%
rename from d3d9types.py
rename to specs/d3d9types.py
diff --git a/d3dcaps.py b/specs/d3dcaps.py
similarity index 100%
rename from d3dcaps.py
rename to specs/d3dcaps.py
diff --git a/d3dtypes.py b/specs/d3dtypes.py
similarity index 100%
rename from d3dtypes.py
rename to specs/d3dtypes.py
diff --git a/ddraw.py b/specs/ddraw.py
similarity index 100%
rename from ddraw.py
rename to specs/ddraw.py
diff --git a/debug.py b/specs/debug.py
similarity index 100%
rename from debug.py
rename to specs/debug.py
diff --git a/dxgi.py b/specs/dxgi.py
similarity index 100%
rename from dxgi.py
rename to specs/dxgi.py
diff --git a/dxgiformat.py b/specs/dxgiformat.py
similarity index 100%
rename from dxgiformat.py
rename to specs/dxgiformat.py
diff --git a/dxgitype.py b/specs/dxgitype.py
similarity index 100%
rename from dxgitype.py
rename to specs/dxgitype.py
diff --git a/glapi.py b/specs/glapi.py
similarity index 100%
rename from glapi.py
rename to specs/glapi.py
diff --git a/glparams.py b/specs/glparams.py
similarity index 100%
rename from glparams.py
rename to specs/glparams.py
diff --git a/gltypes.py b/specs/gltypes.py
similarity index 100%
rename from gltypes.py
rename to specs/gltypes.py
diff --git a/glxapi.py b/specs/glxapi.py
similarity index 100%
rename from glxapi.py
rename to specs/glxapi.py
diff --git a/apigen/.gitignore b/specs/scripts/.gitignore
similarity index 100%
rename from apigen/.gitignore
rename to specs/scripts/.gitignore
diff --git a/apigen/Makefile b/specs/scripts/Makefile
similarity index 100%
rename from apigen/Makefile
rename to specs/scripts/Makefile
diff --git a/apigen/README b/specs/scripts/README
similarity index 100%
rename from apigen/README
rename to specs/scripts/README
diff --git a/apigen/cdecl.py b/specs/scripts/cdecl.py
similarity index 100%
rename from apigen/cdecl.py
rename to specs/scripts/cdecl.py
diff --git a/apigen/glparams.sed b/specs/scripts/glparams.sed
similarity index 100%
rename from apigen/glparams.sed
rename to specs/scripts/glparams.sed
diff --git a/apigen/glspec.py b/specs/scripts/glspec.py
similarity index 100%
rename from apigen/glspec.py
rename to specs/scripts/glspec.py
diff --git a/apigen/gltxt.py b/specs/scripts/gltxt.py
similarity index 100%
rename from apigen/gltxt.py
rename to specs/scripts/gltxt.py
diff --git a/apigen/reference-opengl-arb.sh b/specs/scripts/reference-opengl-arb.sh
similarity index 100%
rename from apigen/reference-opengl-arb.sh
rename to specs/scripts/reference-opengl-arb.sh
diff --git a/apigen/reference-opengl-man.sh b/specs/scripts/reference-opengl-man.sh
similarity index 100%
rename from apigen/reference-opengl-man.sh
rename to specs/scripts/reference-opengl-man.sh
diff --git a/apigen/sort.sh b/specs/scripts/sort.sh
similarity index 100%
rename from apigen/sort.sh
rename to specs/scripts/sort.sh
diff --git a/apigen/wglenum.sh b/specs/scripts/wglenum.sh
similarity index 100%
rename from apigen/wglenum.sh
rename to specs/scripts/wglenum.sh
diff --git a/stdapi.py b/specs/stdapi.py
similarity index 100%
rename from stdapi.py
rename to specs/stdapi.py
diff --git a/wglapi.py b/specs/wglapi.py
similarity index 100%
rename from wglapi.py
rename to specs/wglapi.py
diff --git a/wglenum.py b/specs/wglenum.py
similarity index 100%
rename from wglenum.py
rename to specs/wglenum.py
diff --git a/winapi.py b/specs/winapi.py
similarity index 100%
rename from winapi.py
rename to 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 *
--
2.45.2