From 11476aaa192739d78a99c0ad72521af88f4a2d00 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 7 Mar 2013 19:38:26 +0100 Subject: [PATCH] move and build qlalr Change-Id: I852e1a33fc056a52f6dbba8aaf7dd75274bbe815 Reviewed-by: Thiago Macieira --- src/src.pro | 11 ++++++++--- {util => src/tools}/qlalr/compress.cpp | 0 {util => src/tools}/qlalr/compress.h | 0 {util => src/tools}/qlalr/cppgenerator.cpp | 0 {util => src/tools}/qlalr/cppgenerator.h | 0 {util => src/tools}/qlalr/doc/qlalr.qdocconf | 0 {util => src/tools}/qlalr/doc/src/classic.css | 0 .../tools}/qlalr/doc/src/images/qt-logo.png | Bin {util => src/tools}/qlalr/doc/src/qlalr.qdoc | 0 {util => src/tools}/qlalr/dotgraph.cpp | 0 {util => src/tools}/qlalr/dotgraph.h | 0 .../tools}/qlalr/examples/dummy-xml/dummy-xml.pro | 0 .../qlalr/examples/dummy-xml/ll/dummy-xml-ll.cpp | 0 {util => src/tools}/qlalr/examples/dummy-xml/xml.g | 0 {util => src/tools}/qlalr/examples/glsl/build.sh | 0 {util => src/tools}/qlalr/examples/glsl/glsl | 0 {util => src/tools}/qlalr/examples/glsl/glsl-lex.l | 0 {util => src/tools}/qlalr/examples/glsl/glsl.g | 0 {util => src/tools}/qlalr/examples/glsl/glsl.pro | 0 {util => src/tools}/qlalr/examples/lambda/COMPILE | 0 {util => src/tools}/qlalr/examples/lambda/lambda.g | 0 .../tools}/qlalr/examples/lambda/lambda.pro | 0 {util => src/tools}/qlalr/examples/lambda/main.cpp | 0 {util => src/tools}/qlalr/examples/qparser/COMPILE | 0 {util => src/tools}/qlalr/examples/qparser/calc.g | 0 {util => src/tools}/qlalr/examples/qparser/calc.l | 0 .../tools}/qlalr/examples/qparser/qparser.cpp | 0 .../tools}/qlalr/examples/qparser/qparser.h | 0 .../tools}/qlalr/examples/qparser/qparser.pro | 0 {util => src/tools}/qlalr/grammar.cpp | 0 {util => src/tools}/qlalr/grammar_p.h | 0 {util => src/tools}/qlalr/lalr.cpp | 0 {util => src/tools}/qlalr/lalr.g | 0 {util => src/tools}/qlalr/lalr.h | 0 {util => src/tools}/qlalr/main.cpp | 0 {util => src/tools}/qlalr/parsetable.cpp | 0 {util => src/tools}/qlalr/parsetable.h | 0 {util => src/tools}/qlalr/qlalr.pro | 12 ++++++------ {util => src/tools}/qlalr/recognizer.cpp | 0 {util => src/tools}/qlalr/recognizer.h | 0 40 files changed, 14 insertions(+), 9 deletions(-) rename {util => src/tools}/qlalr/compress.cpp (100%) rename {util => src/tools}/qlalr/compress.h (100%) rename {util => src/tools}/qlalr/cppgenerator.cpp (100%) rename {util => src/tools}/qlalr/cppgenerator.h (100%) rename {util => src/tools}/qlalr/doc/qlalr.qdocconf (100%) rename {util => src/tools}/qlalr/doc/src/classic.css (100%) rename {util => src/tools}/qlalr/doc/src/images/qt-logo.png (100%) rename {util => src/tools}/qlalr/doc/src/qlalr.qdoc (100%) rename {util => src/tools}/qlalr/dotgraph.cpp (100%) rename {util => src/tools}/qlalr/dotgraph.h (100%) rename {util => src/tools}/qlalr/examples/dummy-xml/dummy-xml.pro (100%) rename {util => src/tools}/qlalr/examples/dummy-xml/ll/dummy-xml-ll.cpp (100%) rename {util => src/tools}/qlalr/examples/dummy-xml/xml.g (100%) rename {util => src/tools}/qlalr/examples/glsl/build.sh (100%) rename {util => src/tools}/qlalr/examples/glsl/glsl (100%) rename {util => src/tools}/qlalr/examples/glsl/glsl-lex.l (100%) rename {util => src/tools}/qlalr/examples/glsl/glsl.g (100%) rename {util => src/tools}/qlalr/examples/glsl/glsl.pro (100%) rename {util => src/tools}/qlalr/examples/lambda/COMPILE (100%) rename {util => src/tools}/qlalr/examples/lambda/lambda.g (100%) rename {util => src/tools}/qlalr/examples/lambda/lambda.pro (100%) rename {util => src/tools}/qlalr/examples/lambda/main.cpp (100%) rename {util => src/tools}/qlalr/examples/qparser/COMPILE (100%) rename {util => src/tools}/qlalr/examples/qparser/calc.g (100%) rename {util => src/tools}/qlalr/examples/qparser/calc.l (100%) rename {util => src/tools}/qlalr/examples/qparser/qparser.cpp (100%) rename {util => src/tools}/qlalr/examples/qparser/qparser.h (100%) rename {util => src/tools}/qlalr/examples/qparser/qparser.pro (100%) rename {util => src/tools}/qlalr/grammar.cpp (100%) rename {util => src/tools}/qlalr/grammar_p.h (100%) rename {util => src/tools}/qlalr/lalr.cpp (100%) rename {util => src/tools}/qlalr/lalr.g (100%) rename {util => src/tools}/qlalr/lalr.h (100%) rename {util => src/tools}/qlalr/main.cpp (100%) rename {util => src/tools}/qlalr/parsetable.cpp (100%) rename {util => src/tools}/qlalr/parsetable.h (100%) rename {util => src/tools}/qlalr/qlalr.pro (78%) rename {util => src/tools}/qlalr/recognizer.cpp (100%) rename {util => src/tools}/qlalr/recognizer.h (100%) diff --git a/src/src.pro b/src/src.pro index a782d585d5..121188bd5a 100644 --- a/src/src.pro +++ b/src/src.pro @@ -14,6 +14,11 @@ src_tools_rcc.target = sub-rcc src_tools_rcc.depends = src_tools_bootstrap src_tools_rcc.CONFIG = host_build +src_tools_qlalr.subdir = tools/qlalr +src_tools_qlalr.target = sub-qlalr +force_bootstrap: src_tools_qlalr.depends = src_tools_bootstrap +else: src_tools_qlalr.depends = src_corelib + src_tools_uic.subdir = tools/uic src_tools_uic.target = sub-uic src_tools_uic.CONFIG = host_build @@ -110,8 +115,8 @@ src_plugins.depends = src_sql src_xml src_network src_android.subdir = $$PWD/android # this order is important -SUBDIRS += src_tools_bootstrap src_tools_moc src_tools_rcc src_corelib -TOOLS = src_tools_moc src_tools_rcc +SUBDIRS += src_tools_bootstrap src_tools_moc src_tools_rcc src_corelib src_tools_qlalr +TOOLS = src_tools_moc src_tools_rcc src_tools_qlalr win32:SUBDIRS += src_winmain SUBDIRS += src_network src_sql src_xml src_testlib contains(QT_CONFIG, dbus) { @@ -153,7 +158,7 @@ nacl: SUBDIRS -= src_network src_testlib android:!android-no-sdk: SUBDIRS += src_android TR_EXCLUDE = \ - src_tools_bootstrap src_tools_moc src_tools_rcc src_tools_uic \ + src_tools_bootstrap src_tools_moc src_tools_rcc src_tools_uic src_tools_qlalr \ src_tools_bootstrap_dbus src_tools_qdbusxml2cpp src_tools_qdbuscpp2xml sub-tools.depends = $$TOOLS diff --git a/util/qlalr/compress.cpp b/src/tools/qlalr/compress.cpp similarity index 100% rename from util/qlalr/compress.cpp rename to src/tools/qlalr/compress.cpp diff --git a/util/qlalr/compress.h b/src/tools/qlalr/compress.h similarity index 100% rename from util/qlalr/compress.h rename to src/tools/qlalr/compress.h diff --git a/util/qlalr/cppgenerator.cpp b/src/tools/qlalr/cppgenerator.cpp similarity index 100% rename from util/qlalr/cppgenerator.cpp rename to src/tools/qlalr/cppgenerator.cpp diff --git a/util/qlalr/cppgenerator.h b/src/tools/qlalr/cppgenerator.h similarity index 100% rename from util/qlalr/cppgenerator.h rename to src/tools/qlalr/cppgenerator.h diff --git a/util/qlalr/doc/qlalr.qdocconf b/src/tools/qlalr/doc/qlalr.qdocconf similarity index 100% rename from util/qlalr/doc/qlalr.qdocconf rename to src/tools/qlalr/doc/qlalr.qdocconf diff --git a/util/qlalr/doc/src/classic.css b/src/tools/qlalr/doc/src/classic.css similarity index 100% rename from util/qlalr/doc/src/classic.css rename to src/tools/qlalr/doc/src/classic.css diff --git a/util/qlalr/doc/src/images/qt-logo.png b/src/tools/qlalr/doc/src/images/qt-logo.png similarity index 100% rename from util/qlalr/doc/src/images/qt-logo.png rename to src/tools/qlalr/doc/src/images/qt-logo.png diff --git a/util/qlalr/doc/src/qlalr.qdoc b/src/tools/qlalr/doc/src/qlalr.qdoc similarity index 100% rename from util/qlalr/doc/src/qlalr.qdoc rename to src/tools/qlalr/doc/src/qlalr.qdoc diff --git a/util/qlalr/dotgraph.cpp b/src/tools/qlalr/dotgraph.cpp similarity index 100% rename from util/qlalr/dotgraph.cpp rename to src/tools/qlalr/dotgraph.cpp diff --git a/util/qlalr/dotgraph.h b/src/tools/qlalr/dotgraph.h similarity index 100% rename from util/qlalr/dotgraph.h rename to src/tools/qlalr/dotgraph.h diff --git a/util/qlalr/examples/dummy-xml/dummy-xml.pro b/src/tools/qlalr/examples/dummy-xml/dummy-xml.pro similarity index 100% rename from util/qlalr/examples/dummy-xml/dummy-xml.pro rename to src/tools/qlalr/examples/dummy-xml/dummy-xml.pro diff --git a/util/qlalr/examples/dummy-xml/ll/dummy-xml-ll.cpp b/src/tools/qlalr/examples/dummy-xml/ll/dummy-xml-ll.cpp similarity index 100% rename from util/qlalr/examples/dummy-xml/ll/dummy-xml-ll.cpp rename to src/tools/qlalr/examples/dummy-xml/ll/dummy-xml-ll.cpp diff --git a/util/qlalr/examples/dummy-xml/xml.g b/src/tools/qlalr/examples/dummy-xml/xml.g similarity index 100% rename from util/qlalr/examples/dummy-xml/xml.g rename to src/tools/qlalr/examples/dummy-xml/xml.g diff --git a/util/qlalr/examples/glsl/build.sh b/src/tools/qlalr/examples/glsl/build.sh similarity index 100% rename from util/qlalr/examples/glsl/build.sh rename to src/tools/qlalr/examples/glsl/build.sh diff --git a/util/qlalr/examples/glsl/glsl b/src/tools/qlalr/examples/glsl/glsl similarity index 100% rename from util/qlalr/examples/glsl/glsl rename to src/tools/qlalr/examples/glsl/glsl diff --git a/util/qlalr/examples/glsl/glsl-lex.l b/src/tools/qlalr/examples/glsl/glsl-lex.l similarity index 100% rename from util/qlalr/examples/glsl/glsl-lex.l rename to src/tools/qlalr/examples/glsl/glsl-lex.l diff --git a/util/qlalr/examples/glsl/glsl.g b/src/tools/qlalr/examples/glsl/glsl.g similarity index 100% rename from util/qlalr/examples/glsl/glsl.g rename to src/tools/qlalr/examples/glsl/glsl.g diff --git a/util/qlalr/examples/glsl/glsl.pro b/src/tools/qlalr/examples/glsl/glsl.pro similarity index 100% rename from util/qlalr/examples/glsl/glsl.pro rename to src/tools/qlalr/examples/glsl/glsl.pro diff --git a/util/qlalr/examples/lambda/COMPILE b/src/tools/qlalr/examples/lambda/COMPILE similarity index 100% rename from util/qlalr/examples/lambda/COMPILE rename to src/tools/qlalr/examples/lambda/COMPILE diff --git a/util/qlalr/examples/lambda/lambda.g b/src/tools/qlalr/examples/lambda/lambda.g similarity index 100% rename from util/qlalr/examples/lambda/lambda.g rename to src/tools/qlalr/examples/lambda/lambda.g diff --git a/util/qlalr/examples/lambda/lambda.pro b/src/tools/qlalr/examples/lambda/lambda.pro similarity index 100% rename from util/qlalr/examples/lambda/lambda.pro rename to src/tools/qlalr/examples/lambda/lambda.pro diff --git a/util/qlalr/examples/lambda/main.cpp b/src/tools/qlalr/examples/lambda/main.cpp similarity index 100% rename from util/qlalr/examples/lambda/main.cpp rename to src/tools/qlalr/examples/lambda/main.cpp diff --git a/util/qlalr/examples/qparser/COMPILE b/src/tools/qlalr/examples/qparser/COMPILE similarity index 100% rename from util/qlalr/examples/qparser/COMPILE rename to src/tools/qlalr/examples/qparser/COMPILE diff --git a/util/qlalr/examples/qparser/calc.g b/src/tools/qlalr/examples/qparser/calc.g similarity index 100% rename from util/qlalr/examples/qparser/calc.g rename to src/tools/qlalr/examples/qparser/calc.g diff --git a/util/qlalr/examples/qparser/calc.l b/src/tools/qlalr/examples/qparser/calc.l similarity index 100% rename from util/qlalr/examples/qparser/calc.l rename to src/tools/qlalr/examples/qparser/calc.l diff --git a/util/qlalr/examples/qparser/qparser.cpp b/src/tools/qlalr/examples/qparser/qparser.cpp similarity index 100% rename from util/qlalr/examples/qparser/qparser.cpp rename to src/tools/qlalr/examples/qparser/qparser.cpp diff --git a/util/qlalr/examples/qparser/qparser.h b/src/tools/qlalr/examples/qparser/qparser.h similarity index 100% rename from util/qlalr/examples/qparser/qparser.h rename to src/tools/qlalr/examples/qparser/qparser.h diff --git a/util/qlalr/examples/qparser/qparser.pro b/src/tools/qlalr/examples/qparser/qparser.pro similarity index 100% rename from util/qlalr/examples/qparser/qparser.pro rename to src/tools/qlalr/examples/qparser/qparser.pro diff --git a/util/qlalr/grammar.cpp b/src/tools/qlalr/grammar.cpp similarity index 100% rename from util/qlalr/grammar.cpp rename to src/tools/qlalr/grammar.cpp diff --git a/util/qlalr/grammar_p.h b/src/tools/qlalr/grammar_p.h similarity index 100% rename from util/qlalr/grammar_p.h rename to src/tools/qlalr/grammar_p.h diff --git a/util/qlalr/lalr.cpp b/src/tools/qlalr/lalr.cpp similarity index 100% rename from util/qlalr/lalr.cpp rename to src/tools/qlalr/lalr.cpp diff --git a/util/qlalr/lalr.g b/src/tools/qlalr/lalr.g similarity index 100% rename from util/qlalr/lalr.g rename to src/tools/qlalr/lalr.g diff --git a/util/qlalr/lalr.h b/src/tools/qlalr/lalr.h similarity index 100% rename from util/qlalr/lalr.h rename to src/tools/qlalr/lalr.h diff --git a/util/qlalr/main.cpp b/src/tools/qlalr/main.cpp similarity index 100% rename from util/qlalr/main.cpp rename to src/tools/qlalr/main.cpp diff --git a/util/qlalr/parsetable.cpp b/src/tools/qlalr/parsetable.cpp similarity index 100% rename from util/qlalr/parsetable.cpp rename to src/tools/qlalr/parsetable.cpp diff --git a/util/qlalr/parsetable.h b/src/tools/qlalr/parsetable.h similarity index 100% rename from util/qlalr/parsetable.h rename to src/tools/qlalr/parsetable.h diff --git a/util/qlalr/qlalr.pro b/src/tools/qlalr/qlalr.pro similarity index 78% rename from util/qlalr/qlalr.pro rename to src/tools/qlalr/qlalr.pro index 4ebeb91e64..08cf6a1591 100644 --- a/util/qlalr/qlalr.pro +++ b/src/tools/qlalr/qlalr.pro @@ -1,9 +1,4 @@ - -TEMPLATE = app -QT = core -CONFIG += console -TARGET = qlalr -mac:CONFIG -= app_bundle +option(host_build) SOURCES += \ compress.cpp \ @@ -23,3 +18,8 @@ HEADERS += \ parsetable.h \ recognizer.h \ grammar_p.h + +OTHER_FILES += \ + lalr.g + +load(qt_tool) diff --git a/util/qlalr/recognizer.cpp b/src/tools/qlalr/recognizer.cpp similarity index 100% rename from util/qlalr/recognizer.cpp rename to src/tools/qlalr/recognizer.cpp diff --git a/util/qlalr/recognizer.h b/src/tools/qlalr/recognizer.h similarity index 100% rename from util/qlalr/recognizer.h rename to src/tools/qlalr/recognizer.h