You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by db...@apache.org on 2016/03/07 19:01:29 UTC
[1/3] incubator-trafodion git commit: [TRAFODION-1866] Build should
not require qmake
Repository: incubator-trafodion
Updated Branches:
refs/heads/master 3b2e3fdce -> 9111d8cc4
[TRAFODION-1866] Build should not require qmake
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/f6d38928
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/f6d38928
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/f6d38928
Branch: refs/heads/master
Commit: f6d38928e72dacd7de05d0bd3cc0e86bc5550b01
Parents: 39d3a0c
Author: Steve Varnau <sv...@apache.org>
Authored: Wed Mar 2 21:53:45 2016 +0000
Committer: Steve Varnau <sv...@apache.org>
Committed: Wed Mar 2 21:53:45 2016 +0000
----------------------------------------------------------------------
core/sql/SqlCompilerDebugger/mk.sh | 5 +++++
core/sql/nskgmake/SqlCompilerDebugger/Makefile | 3 ++-
2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/f6d38928/core/sql/SqlCompilerDebugger/mk.sh
----------------------------------------------------------------------
diff --git a/core/sql/SqlCompilerDebugger/mk.sh b/core/sql/SqlCompilerDebugger/mk.sh
index 7056cc9..e752bbb 100644
--- a/core/sql/SqlCompilerDebugger/mk.sh
+++ b/core/sql/SqlCompilerDebugger/mk.sh
@@ -24,6 +24,11 @@ export LD_LIBRARY_PATH=$QT_TOOLKIT/lib:$LD_LIBRARY_PATH
# Important: QT_TOOLKIT must not be bundled in Trafodion build
# QT License is not compatible with ASF license policy
+if [[ ! -d "$QT_TOOLKIT" ]]
+then
+ echo "Skipping Build of SQL Compiler Debugger"
+ exit 0
+fi
qmake -o Makefile SqlCmpDbg.pro
make
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/f6d38928/core/sql/nskgmake/SqlCompilerDebugger/Makefile
----------------------------------------------------------------------
diff --git a/core/sql/nskgmake/SqlCompilerDebugger/Makefile b/core/sql/nskgmake/SqlCompilerDebugger/Makefile
index e34afa2..3b80e88 100644
--- a/core/sql/nskgmake/SqlCompilerDebugger/Makefile
+++ b/core/sql/nskgmake/SqlCompilerDebugger/Makefile
@@ -35,8 +35,9 @@ FINAL_DLLS += $(CMPGUI_FINAL)
$(CMPGUI_FINAL) : cmpdbg_qt_build
+# optional component, ignore cp return code
cmpdbg_qt_build :
- cd ../$(basename $(CMPGUI_OBJ)) && . ./mk.sh; \
+ -cd ../$(basename $(CMPGUI_OBJ)) && . ./mk.sh; \
cp -f $$PWD/$(LIBPREFIX)$(notdir $(obj)) $(CMPGUI_FINAL);
#when clean, this clean first
[3/3] incubator-trafodion git commit: Merge [TRAFODION-1866] PR 355
Build no longer requires qmake
Posted by db...@apache.org.
Merge [TRAFODION-1866] PR 355 Build no longer requires qmake
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/9111d8cc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/9111d8cc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/9111d8cc
Branch: refs/heads/master
Commit: 9111d8cc407cc702d3a70e934a9e9afffe118dd0
Parents: 3b2e3fd 820587f
Author: Dave Birdsall <db...@apache.org>
Authored: Mon Mar 7 18:00:43 2016 +0000
Committer: Dave Birdsall <db...@apache.org>
Committed: Mon Mar 7 18:00:43 2016 +0000
----------------------------------------------------------------------
core/sql/SqlCompilerDebugger/mk.sh | 5 +++++
core/sql/nskgmake/SqlCompilerDebugger/Makefile | 5 +++--
2 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[2/3] incubator-trafodion git commit: [TRAFODION-1866] Separate
makefile commands for build/copy of shlib
Posted by db...@apache.org.
[TRAFODION-1866] Separate makefile commands for build/copy of shlib
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/820587fa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/820587fa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/820587fa
Branch: refs/heads/master
Commit: 820587fa0192fc1fd7a482b73a8b5213e67d0348
Parents: f6d3892
Author: Steve Varnau <sv...@apache.org>
Authored: Thu Mar 3 00:42:59 2016 +0000
Committer: Steve Varnau <sv...@apache.org>
Committed: Thu Mar 3 00:42:59 2016 +0000
----------------------------------------------------------------------
core/sql/nskgmake/SqlCompilerDebugger/Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/820587fa/core/sql/nskgmake/SqlCompilerDebugger/Makefile
----------------------------------------------------------------------
diff --git a/core/sql/nskgmake/SqlCompilerDebugger/Makefile b/core/sql/nskgmake/SqlCompilerDebugger/Makefile
index 3b80e88..2d49b72 100644
--- a/core/sql/nskgmake/SqlCompilerDebugger/Makefile
+++ b/core/sql/nskgmake/SqlCompilerDebugger/Makefile
@@ -37,8 +37,8 @@ $(CMPGUI_FINAL) : cmpdbg_qt_build
# optional component, ignore cp return code
cmpdbg_qt_build :
- -cd ../$(basename $(CMPGUI_OBJ)) && . ./mk.sh; \
- cp -f $$PWD/$(LIBPREFIX)$(notdir $(obj)) $(CMPGUI_FINAL);
+ cd ../$(basename $(CMPGUI_OBJ)) && . ./mk.sh
+ -cp -f ../$(basename $(CMPGUI_OBJ))/$(LIBPREFIX)$(notdir $(obj)) $(CMPGUI_FINAL)
#when clean, this clean first