specs/scripts: Cleanup.

9 files changed, 10 insertions, 23 deletions

diff --git a/specs/scripts/Makefile b/specs/scripts/Makefile
index 09539d4b..00342252 100644
--- a/specs/scripts/Makefile
+++ b/specs/scripts/Makefile
@@ -12,16 +12,13 @@ download: \
 	gl.xml \
 	wgl.xml \
 	egl.xml \
-	enumext.spec \
 	gl.spec \
 	gl.tm \
 	glxenum.spec \
-	glxenumext.spec \
 	glx.spec \
 	glxext.spec \
 	glx.tm \
 	wglenum.spec \
-	wglenumext.spec \
 	wgl.spec \
 	wglext.spec \
 	wgl.tm
@@ -36,14 +33,14 @@ download: \
 %.tm:
 	wget -N http://www.opengl.org/registry/oldspecs/$@
 
-glapi.py: glspec.py gl.tm gl.spec
-	python glspec.py gl gl.tm gl.spec > $@
+glapi.py: spec2api.py gl.tm gl.spec
+	python spec2api.py gl gl.tm gl.spec > $@
 
-glxapi.py: glspec.py glx.tm glx.spec glxext.spec
-	python glspec.py glX glx.tm glx.spec glxext.spec > $@
+glxapi.py: spec2api.py glx.tm glx.spec glxext.spec
+	python spec2api.py glX glx.tm glx.spec glxext.spec > $@
 
-wglapi.py: glspec.py wgl.tm wgl.spec wglext.spec
-	python glspec.py wgl wgl.tm wgl.spec wglext.spec > $@
+wglapi.py: spec2api.py wgl.tm wgl.spec wglext.spec
+	python spec2api.py wgl wgl.tm wgl.spec wglext.spec > $@
 
 glparams.py: xml2glparams.py gl.xml
 	python $^ > $@
diff --git a/specs/scripts/README.markdown b/specs/scripts/README.markdown
index 66f9faaf..9daedb1b 100644
--- a/specs/scripts/README.markdown
+++ b/specs/scripts/README.markdown
@@ -33,10 +33,10 @@ files in the parent dir via a side-by-side diff tool, such as gvimdiff.
 OpenGL ES
 =========
 
-Khronos doesn't provide `.spec` files for OpenGL ES.  But the `gltxt.py` script
+Khronos doesn't provide `.spec` files for OpenGL ES.  But the `txt2api.py` script
 can extract and convert prototypes for the `.txt` extension specifications:
 
-    $ ./gltxt.py http://www.khronos.org/registry/gles/extensions/OES/OES_mapbuffer.txt
+    $ ./txt2api.py http://www.khronos.org/registry/gles/extensions/OES/OES_mapbuffer.txt
         # GL_OES_mapbuffer
         GlFunction(Void, "glGetBufferPointervOES", [(GLenum, "target"), (GLenum, "pname"), (OpaquePointer(OpaquePointer(Void)), "params")], sideeffects=False),
         GlFunction(OpaquePointer(Void), "glMapBufferOES", [(GLenum, "target"), (GLenum, "access")]),
@@ -46,9 +46,9 @@ can extract and convert prototypes for the `.txt` extension specifications:
 Generic
 =======
 
-When the domain specific scripts don't work the fallback solution is `cdecl.py`, which can parse most C declarations:
+When the domain specific scripts don't work the fallback solution is `c2api.py`, which can parse most C declarations:
 
-    $ echo 'void *memcpy(void *dest, const void *src, size_t n);' | ./cdecl.py 
+    $ echo 'void *memcpy(void *dest, const void *src, size_t n);' | ./c2api.py 
         Function(OpaquePointer(Void), "memcpy", [(OpaquePointer(Void), "dest"), (OpaquePointer(Const(Void)), "src"), (size_t, "n")]),
 
 
diff --git a/specs/scripts/cdecl.py b/specs/scripts/c2api.py
index 7deb2955..7deb2955 100755
--- a/specs/scripts/cdecl.py
+++ b/specs/scripts/c2api.py
diff --git a/specs/scripts/eglenum.sh b/specs/scripts/eglenum.sh
deleted file mode 100755
index 9727412a..00000000
--- a/specs/scripts/eglenum.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-sed -n -e 's/^\s\+\(EGL_\)\?\(\S\+\)\s*=\s*\(0x3\w\w\w\)\s*\(#.*\)\?$/\3 \2/p' "$@" \
-| sort -u \
-| sed -e 's/\(\S\+\)\s\+\(\S\+\)/    "EGL_\2",\t\t# \1/'
diff --git a/specs/scripts/sort.sh b/specs/scripts/sort.sh
deleted file mode 100755
index 5cdc6a4f..00000000
--- a/specs/scripts/sort.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-sed -e 's/\(^.*#\) \(0x\w\+\)$/\2 \1/' "$@" | sort | sed -e 's/\(0x\w\+\) \(.*#\)$/\2 \1/'
diff --git a/specs/scripts/glspec.py b/specs/scripts/spec2api.py
index f21b08d5..f21b08d5 100755
--- a/specs/scripts/glspec.py
+++ b/specs/scripts/spec2api.py
diff --git a/specs/scripts/gltxt.py b/specs/scripts/txt2api.py
index 6cd99dd9..6cd99dd9 100755
--- a/specs/scripts/gltxt.py
+++ b/specs/scripts/txt2api.py
diff --git a/specs/scripts/wglenum.sh b/specs/scripts/wglenum.sh
deleted file mode 100755
index 97f969d4..00000000
--- a/specs/scripts/wglenum.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-sed -n -e 's/^\s\+\(WGL_\S\+\)\s*=\s*\(0x2\w\w\w\)\s*$/\2 \1/p' "$@" \
-| sort -u \
-| sed -e 's/\(\S\+\)\s\+\(\S\+\)/    "\2",\t\t# \1/'
diff --git a/specs/scripts/xml2enum.py b/specs/scripts/xml2enum.py
index 6d49e11c..6d49e11c 100644..100755
--- a/specs/scripts/xml2enum.py
+++ b/specs/scripts/xml2enum.py