From e72fe268e8d9b6bf8128839a25b08fe0555aaa69 Mon Sep 17 00:00:00 2001 From: nigels Date: Thu, 31 Dec 2009 17:05:56 +0000 Subject: [PATCH] Touch-ups for GLEW 1.5.2 release. Add dist-src target git-svn-id: https://glew.svn.sourceforge.net/svnroot/glew/trunk/glew@573 783a27ee-832a-0410-bc00-9f386506c6dd --- Makefile | 56 ++++++++++++++++++++++++++++++++++++++---- auto/bin/parse_spec.pl | 6 ++--- auto/bin/update_ext.sh | 28 +++++++++++++++++++++ config/version | 2 +- 4 files changed, 83 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 0eef96d..8731f64 100644 --- a/Makefile +++ b/Makefile @@ -46,10 +46,12 @@ LIBDIR ?= $(GLEW_DEST)/lib INCDIR ?= $(GLEW_DEST)/include/GL SHARED_OBJ_EXT ?= o TARDIR = ../glew-$(GLEW_VERSION) -TARBALL = ../glew_$(GLEW_VERSION).tar.gz +TARBALL = ../glew-$(GLEW_VERSION).tar.gz -DIST_DIR = glew-$(GLEW_VERSION) -DIST_WIN32 = glew-$(GLEW_VERSION)-win32.zip +DIST_DIR = glew-$(GLEW_VERSION) +DIST_WIN32 = glew-$(GLEW_VERSION)-win32.zip +DIST_SRC_ZIP = glew-$(GLEW_VERSION).zip +DIST_SRC_TGZ = glew-$(GLEW_VERSION).tgz AR = ar INSTALL = install @@ -168,6 +170,7 @@ tardist: mkdir $(TARDIR) cp -a . $(TARDIR) find $(TARDIR) -name CVS -o -name .cvsignore | xargs $(RM) -r + find $(TARDIR) -name .svn | xargs $(RM) -r $(MAKE) -C $(TARDIR) distclean $(MAKE) -C $(TARDIR) $(MAKE) -C $(TARDIR) distclean @@ -193,10 +196,53 @@ dist-win32: unix2dos $(TARDIR)/doc/*.txt unix2dos $(TARDIR)/doc/*.html unix2dos $(TARDIR)/*.txt - rm ../$(DIST_WIN32) + rm -f ../$(DIST_WIN32) cd .. && zip -rv9 $(DIST_WIN32) $(DIST_DIR) +dist-src: + $(RM) -r $(TARDIR) + mkdir -p $(TARDIR) + mkdir -p $(TARDIR)/bin + mkdir -p $(TARDIR)/lib + cp -a auto $(TARDIR) + $(RM) -Rf $(TARDIR)/auto/registry + cp -a build $(TARDIR) + cp -a config $(TARDIR) + cp -a src $(TARDIR) + cp -a doc $(TARDIR) + cp -a include $(TARDIR) + cp -a *.txt $(TARDIR) + cp -a Makefile $(TARDIR) + find $(TARDIR) -name '*.o' | xargs $(RM) -r + find $(TARDIR) -name '*.pic_o' | xargs $(RM) -r + find $(TARDIR) -name '*~' | xargs $(RM) -r + find $(TARDIR) -name CVS -o -name .cvsignore | xargs $(RM) -r + find $(TARDIR) -name .svn | xargs $(RM) -r + unix2dos $(TARDIR)/config/* + unix2dos $(TARDIR)/auto/core/* + unix2dos $(TARDIR)/auto/extensions/* + find $(TARDIR) -name '*.h' | xargs unix2dos + find $(TARDIR) -name '*.c' | xargs unix2dos + find $(TARDIR) -name '*.txt' | xargs unix2dos + find $(TARDIR) -name '*.html' | xargs unix2dos + find $(TARDIR) -name '*.sh' | xargs unix2dos + find $(TARDIR) -name '*.pl' | xargs unix2dos + find $(TARDIR) -name 'Makefile' | xargs unix2dos + rm -f ../$(DIST_SRC_ZIP) + cd .. && zip -rv9 $(DIST_SRC_ZIP) $(DIST_DIR) + dos2unix $(TARDIR)/config/* + dos2unix $(TARDIR)/auto/core/* + dos2unix $(TARDIR)/auto/extensions/* + find $(TARDIR) -name '*.h' | xargs dos2unix + find $(TARDIR) -name '*.c' | xargs dos2unix + find $(TARDIR) -name '*.txt' | xargs dos2unix + find $(TARDIR) -name '*.html' | xargs dos2unix + find $(TARDIR) -name '*.sh' | xargs dos2unix + find $(TARDIR) -name '*.pl' | xargs dos2unix + find $(TARDIR) -name 'Makefile' | xargs dos2unix + cd .. && env GZIP=-9 tar cvzf $(DIST_SRC_TGZ) $(DIST_DIR) + extensions: $(MAKE) -C auto -.PHONY: clean distclean tardist dist-win32 +.PHONY: clean distclean tardist dist-win32 dist-src diff --git a/auto/bin/parse_spec.pl b/auto/bin/parse_spec.pl index 3cd3819..9c71b63 100755 --- a/auto/bin/parse_spec.pl +++ b/auto/bin/parse_spec.pl @@ -118,8 +118,8 @@ my %fnc_ignore_list = ( "ProgramLocalParameter4fARB" => "ARB_vertex_program", "ProgramLocalParameter4fvARB" => "ARB_vertex_program", "ProgramStringARB" => "ARB_vertex_program", - "glXCreateContextAttribsARB" => "GLX_ARB_create_context", - "wglCreateContextAttribsARB" => "WGL_ARB_create_context", + "glXCreateContextAttribsARB" => "ARB_create_context_profile", + "wglCreateContextAttribsARB" => "WGL_ARB_create_context_profile", ); my %regex = ( @@ -142,7 +142,7 @@ sub normalize_prototype s/\<.*\>//g; # remove from direct state access extension s/\<.*$//g; # remove incomplete from direct state access extension s/\s*\(\s*/ \(/; # exactly one space before ( and none after - s/\s*\)\s*/\)/; # no after before or after ) + s/\s*\)\s*/\)/; # no space before or after ) s/\s*\*([a-zA-Z])/\* $1/; # "* identifier" s/\*wgl/\* wgl/; # "* wgl" s/\*glX/\* glX/; # "* glX" diff --git a/auto/bin/update_ext.sh b/auto/bin/update_ext.sh index 3e17c82..7f2d07a 100755 --- a/auto/bin/update_ext.sh +++ b/auto/bin/update_ext.sh @@ -237,6 +237,34 @@ EOT # fix const correctness in GL_ARB_shader_objects # perl -e 's/(.+glUniform.*(fv|iv).+)(GLfloat\*.+|GLint\*.+)/\1const \3/;' -pi $1/GL_ARB_shader_objects +# Filter out profile enumerations from GLX_ARB_create_context + grep -v "_PROFILE_" $1/GLX_ARB_create_context > tmp + mv tmp $1/GLX_ARB_create_context + +# Filter only profile related enumerations for GLX_ARB_create_context_profile + head -n2 $1/GLX_ARB_create_context_profile > tmp + grep "_PROFILE_" $1/GLX_ARB_create_context_profile >> tmp + mv tmp $1/GLX_ARB_create_context_profile + +# Filter out profile enumerations from WGL_ARB_create_context + grep -v "_PROFILE_" $1/WGL_ARB_create_context > tmp + mv tmp $1/WGL_ARB_create_context + +# Filter only profile related enumerations for WGL_ARB_create_context_profile + head -n2 $1/WGL_ARB_create_context_profile > tmp + grep "_PROFILE_" $1/WGL_ARB_create_context_profile >> tmp + mv tmp $1/WGL_ARB_create_context_profile + +# add missing function to GLX_NV_copy_image + cat >> $1/GLX_NV_copy_image <> $1/WGL_NV_copy_image <