Re: [Mesa-dev] [PATCH] Fix build to use glsl_parser.hh instead of glsl_parser.h.
On 07/15/2012 06:30 AM, Matt Turner wrote: On Sun, Jul 15, 2012 at 1:21 AM, Ian Romanick i...@freedesktop.org wrote: On 07/13/2012 03:03 PM, Jon TURNEY wrote: On 13/07/2012 22:23, Marcin Baczyński wrote: Commit 68e04cc6014bf7a2c9bd0b3b783b4ec12aa2e824 changed .cpp - .cc, but forgot to update references .h - .hh. Header files are named .h. NAK changes to .hh or .hpp. Seriously, That's our preference too, but automake-1.12 makes this stupid change, not us. Then work around it, and report a bug to automake. ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH] Fix build to use glsl_parser.hh instead of glsl_parser.h.
On 16/07/2012 17:10, Ian Romanick wrote: On 07/15/2012 06:30 AM, Matt Turner wrote: On Sun, Jul 15, 2012 at 1:21 AM, Ian Romanick i...@freedesktop.org wrote: On 07/13/2012 03:03 PM, Jon TURNEY wrote: On 13/07/2012 22:23, Marcin Baczyński wrote: Commit 68e04cc6014bf7a2c9bd0b3b783b4ec12aa2e824 changed .cpp - .cc, but forgot to update references .h - .hh. Header files are named .h. NAK changes to .hh or .hpp. Seriously, That's our preference too, but automake-1.12 makes this stupid change, not us. Then work around it, and report a bug to automake. Sigh. Work around is already done, see commit 81de043 ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH] Fix build to use glsl_parser.hh instead of glsl_parser.h.
On 07/16/2012 09:28 AM, Jon TURNEY wrote: On 16/07/2012 17:10, Ian Romanick wrote: On 07/15/2012 06:30 AM, Matt Turner wrote: On Sun, Jul 15, 2012 at 1:21 AM, Ian Romanick i...@freedesktop.org wrote: On 07/13/2012 03:03 PM, Jon TURNEY wrote: On 13/07/2012 22:23, Marcin Baczyński wrote: Commit 68e04cc6014bf7a2c9bd0b3b783b4ec12aa2e824 changed .cpp - .cc, but forgot to update references .h - .hh. Header files are named .h. NAK changes to .hh or .hpp. Seriously, That's our preference too, but automake-1.12 makes this stupid change, not us. Then work around it, and report a bug to automake. Sigh. Work around is already done, see commit 81de043 Nice. That works for me. Has a bug been reported to automake? Also, could we do something similar to avoid more .cc files? The assembly parser and lexer (in src/mesa/program/) are going to get converted to C++ soon, and I'd prefer to keep .cpp as our C++ extension. ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH] Fix build to use glsl_parser.hh instead of glsl_parser.h.
On Mon, Jul 16, 2012 at 10:14 AM, Ian Romanick i...@freedesktop.org wrote: Nice. That works for me. Has a bug been reported to automake? I emailed the automake mailing list and asked how to handle this and the response received made it seem to me that this change was intentional. :( Also, could we do something similar to avoid more .cc files? The assembly parser and lexer (in src/mesa/program/) are going to get converted to C++ soon, and I'd prefer to keep .cpp as our C++ extension. We can, but do we really want to do some extra work to select the file extension of some generated code? ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH] Fix build to use glsl_parser.hh instead of glsl_parser.h.
On 07/16/2012 10:21 AM, Matt Turner wrote: On Mon, Jul 16, 2012 at 10:14 AM, Ian Romanick i...@freedesktop.org wrote: Nice. That works for me. Has a bug been reported to automake? I emailed the automake mailing list and asked how to handle this and the response received made it seem to me that this change was intentional. :( Also, could we do something similar to avoid more .cc files? The assembly parser and lexer (in src/mesa/program/) are going to get converted to C++ soon, and I'd prefer to keep .cpp as our C++ extension. We can, but do we really want to do some extra work to select the file extension of some generated code? I really don't care about .cc, .hh, or whatever as long as it's generated code that we don't edit. I'd advocate for doing whatever's the easiest solution. If it were code that's actually checked in, I would probably actually care. It's unfortunate that these tools have hardcoded conventions...yy/cc/hh or cpp/cpp/hpp for C++, and y/c/h for C only. Irritating, but that's how it goes I guess... ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH] Fix build to use glsl_parser.hh instead of glsl_parser.h.
On Sun, Jul 15, 2012 at 1:21 AM, Ian Romanick i...@freedesktop.org wrote: On 07/13/2012 03:03 PM, Jon TURNEY wrote: On 13/07/2012 22:23, Marcin Baczyński wrote: Commit 68e04cc6014bf7a2c9bd0b3b783b4ec12aa2e824 changed .cpp - .cc, but forgot to update references .h - .hh. Header files are named .h. NAK changes to .hh or .hpp. Seriously, That's our preference too, but automake-1.12 makes this stupid change, not us. ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH] Fix build to use glsl_parser.hh instead of glsl_parser.h.
On 07/13/2012 03:03 PM, Jon TURNEY wrote: On 13/07/2012 22:23, Marcin Baczyński wrote: Commit 68e04cc6014bf7a2c9bd0b3b783b4ec12aa2e824 changed .cpp - .cc, but forgot to update references .h - .hh. Header files are named .h. NAK changes to .hh or .hpp. Seriously, Also update Doxygen and .gitignore. Signed-off-by: Marcin Baczyński marb...@gmail.com Thanks, and sorry for the breakage. But this patch isn't right, as the name of the header file depends on the automake version. While automake 1.12 names the output .hh, earlier versions named the output .h, which is very inconvenient and why this wasn't spotted in testing :-( doxygen/glsl.doxy exclude definitely needs updating though, thanks for spotting that. ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH] Fix build to use glsl_parser.hh instead of glsl_parser.h.
Commit 68e04cc6014bf7a2c9bd0b3b783b4ec12aa2e824 changed .cpp - .cc,
but forgot to update references .h - .hh.
Also update Doxygen and .gitignore.
Signed-off-by: Marcin Baczyński marb...@gmail.com
---
Fixes a build failure for me when after configuring with
$ ./autogen.sh --prefix=/usr \
--with-dri-drivers=\
--with-gallium-drivers=r600,swrast\
--enable-texture-float\
--enable-glx-tls\
--enable-vdpau
make stops with
(...)
Making all in glsl
gmake[2]: Entering directory `/data/mesa/src/glsl'
gmake[2]: *** No rule to make target `glsl_parser.h', needed by `all'. Stop.
gmake[2]: *** Waiting for unfinished jobs
Makefile.am |4 ++--
doxygen/glsl.doxy |8
src/glsl/.gitignore |1 +
src/glsl/Makefile.am|2 +-
src/glsl/glsl_lexer.ll |2 +-
src/glsl/glsl_parser_extras.cpp |2 +-
6 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index b2c810a..4d91ebb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -59,7 +59,7 @@ EXTRA_FILES = \
aclocal.m4 \
configure \
src/glsl/glsl_parser.cc \
- src/glsl/glsl_parser.h \
+ src/glsl/glsl_parser.hh \
src/glsl/glsl_lexer.cc \
src/glsl/glcpp/glcpp-lex.c \
src/glsl/glcpp/glcpp-parse.c\
@@ -80,7 +80,7 @@ IGNORE_FILES = \
parsers: configure
-@touch $(top_builddir)/configs/current
- $(MAKE) -C src/glsl glsl_parser.cc glsl_parser.h glsl_lexer.cc
+ $(MAKE) -C src/glsl glsl_parser.cc glsl_parser.hh glsl_lexer.cc
$(MAKE) -C src/glsl/glcpp glcpp-lex.c glcpp-parse.c glcpp-parse.h
$(MAKE) -C src/mesa program/lex.yy.c program/program_parse.tab.c
program/program_parse.tab.h
diff --git a/doxygen/glsl.doxy b/doxygen/glsl.doxy
index 5411ec4..d110202 100644
--- a/doxygen/glsl.doxy
+++ b/doxygen/glsl.doxy
@@ -11,10 +11,10 @@ PROJECT_NAME = Mesa GLSL module
#---
INPUT = ../src/glsl/
RECURSIVE = NO
-EXCLUDE= ../src/glsl/glsl_lexer.cpp \
- ../src/glsl/glsl_lexer.h \
- ../src/glsl/glsl_parser.cpp \
- ../src/glsl/glsl_parser.h
+EXCLUDE= ../src/glsl/glsl_lexer.cc \
+ ../src/glsl/glsl_lexer.hh \
+ ../src/glsl/glsl_parser.cc \
+ ../src/glsl/glsl_parser.hh
EXCLUDE_PATTERNS =
#---
# configuration options related to the HTML output
diff --git a/src/glsl/.gitignore b/src/glsl/.gitignore
index c9a9f30..f79c2a9 100644
--- a/src/glsl/.gitignore
+++ b/src/glsl/.gitignore
@@ -4,6 +4,7 @@ glsl_lexer.cpp
glsl_parser.cc
glsl_parser.cpp
glsl_parser.h
+glsl_parser.hh
glsl_parser.output
builtin_function.cpp
builtin_compiler
diff --git a/src/glsl/Makefile.am b/src/glsl/Makefile.am
index 2b9ca2c..8db2802 100644
--- a/src/glsl/Makefile.am
+++ b/src/glsl/Makefile.am
@@ -87,7 +87,7 @@ builtin_compiler_SOURCES = \
builtin_compiler_LDADD = libglslcommon.la
-BUILT_SOURCES = glsl_lexer.cc glsl_parser.cc glsl_parser.h builtin_function.cpp
+BUILT_SOURCES = glsl_lexer.cc glsl_parser.cc glsl_parser.hh
builtin_function.cpp
CLEANFILES = $(BUILT_SOURCES)
builtin_function.cpp: builtins/profiles/* builtins/ir/* builtins/glsl/*
builtins/tools/generate_builtins.py builtins/tools/texture_builtins.py
builtin_compiler$(EXEEXT)
diff --git a/src/glsl/glsl_lexer.ll b/src/glsl/glsl_lexer.ll
index 24cda0c..64ce415 100644
--- a/src/glsl/glsl_lexer.ll
+++ b/src/glsl/glsl_lexer.ll
@@ -26,7 +26,7 @@
#include strtod.h
#include ast.h
#include glsl_parser_extras.h
-#include glsl_parser.h
+#include glsl_parser.hh
static int classify_identifier(struct _mesa_glsl_parse_state *, const char *);
diff --git a/src/glsl/glsl_parser_extras.cpp b/src/glsl/glsl_parser_extras.cpp
index d9ee406..9456825 100644
--- a/src/glsl/glsl_parser_extras.cpp
+++ b/src/glsl/glsl_parser_extras.cpp
@@ -32,7 +32,7 @@ extern C {
#include ralloc.h
#include ast.h
#include glsl_parser_extras.h
-#include glsl_parser.h
+#include glsl_parser.hh
#include ir_optimization.h
#include loop_analysis.h
--
1.7.8.6
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH] Fix build to use glsl_parser.hh instead of glsl_parser.h.
On 13/07/2012 22:23, Marcin Baczyński wrote: Commit 68e04cc6014bf7a2c9bd0b3b783b4ec12aa2e824 changed .cpp - .cc, but forgot to update references .h - .hh. Also update Doxygen and .gitignore. Signed-off-by: Marcin Baczyński marb...@gmail.com Thanks, and sorry for the breakage. But this patch isn't right, as the name of the header file depends on the automake version. While automake 1.12 names the output .hh, earlier versions named the output .h, which is very inconvenient and why this wasn't spotted in testing :-( doxygen/glsl.doxy exclude definitely needs updating though, thanks for spotting that. ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
