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/02/23 18:00:09 UTC
[1/3] incubator-trafodion git commit: [TRAFODION-1840] Disable
bundling of Qt libs into packaging
Repository: incubator-trafodion
Updated Branches:
refs/heads/master d9736f219 -> 8730b34c5
[TRAFODION-1840] Disable bundling of Qt libs into packaging
Also clean up symlink to obsolete directory.
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/6d8510b2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/6d8510b2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/6d8510b2
Branch: refs/heads/master
Commit: 6d8510b2ed031952958fd554ce46cb9353e22d44
Parents: 766c62e
Author: Steve Varnau <st...@esgyn.com>
Authored: Fri Feb 19 23:08:44 2016 +0000
Committer: Steve Varnau <st...@esgyn.com>
Committed: Fri Feb 19 23:08:44 2016 +0000
----------------------------------------------------------------------
.../unixodbc/odbc/odbcclient/unixcli/package/LICENSE | 1 -
core/sqf/LocalSettingsTemplate.sh | 2 ++
core/sqf/sqenvcom.sh | 3 +++
core/sql/SqlCompilerDebugger/mk.sh | 3 +++
core/sql/nskgmake/SqlCompilerDebugger/Makefile | 15 ++-------------
5 files changed, 10 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6d8510b2/core/conn/unixodbc/odbc/odbcclient/unixcli/package/LICENSE
----------------------------------------------------------------------
diff --git a/core/conn/unixodbc/odbc/odbcclient/unixcli/package/LICENSE b/core/conn/unixodbc/odbc/odbcclient/unixcli/package/LICENSE
deleted file mode 120000
index 62726f6..0000000
--- a/core/conn/unixodbc/odbc/odbcclient/unixcli/package/LICENSE
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../security_dll/LICENSE
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6d8510b2/core/sqf/LocalSettingsTemplate.sh
----------------------------------------------------------------------
diff --git a/core/sqf/LocalSettingsTemplate.sh b/core/sqf/LocalSettingsTemplate.sh
index df0ae96..1d19efa 100644
--- a/core/sqf/LocalSettingsTemplate.sh
+++ b/core/sqf/LocalSettingsTemplate.sh
@@ -67,6 +67,8 @@ LOG4CXX_INC_DIR="$TOOLSDIR/apache-log4cxx-0.10.0/include"
# Explicitly set QT_TOOLKIT here if Qt is installed and you want to build the SqlCompilerDebugger
# QT_TOOLKIT="$TOOLSDIR/Qt-4.8.5-64"
+# SqlCompilerDebugger ibrary will be dynamically linked with Qt libs.
+# Note that Qt uses LGPL license. It is not to be re-distributed under Apache license.
# HBASE*, HIVE*, HADOOP* locations may be overridden here
# uncomment the following lines to describe where your Hadoop locations exist.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6d8510b2/core/sqf/sqenvcom.sh
----------------------------------------------------------------------
diff --git a/core/sqf/sqenvcom.sh b/core/sqf/sqenvcom.sh
index b860077..f40ee6f 100644
--- a/core/sqf/sqenvcom.sh
+++ b/core/sqf/sqenvcom.sh
@@ -645,6 +645,9 @@ if [[ -z "$QT_TOOLKIT" && -d $TOOLSDIR/Qt-4.8.5-64 ]];
then
# QT_TOOLKIT is optional, if the directory doesn't exist
# then we won't build the compiler GUI
+ # QT_TOOLKIT components must not be bundled into Trafodion build
+ # LGPL license is not compatible with ASF license policy.
+ # Do not re-distribute shared libs or any componet of Qt. Do not link statically.
export QT_TOOLKIT="$TOOLSDIR/Qt-4.8.5-64"
fi
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6d8510b2/core/sql/SqlCompilerDebugger/mk.sh
----------------------------------------------------------------------
diff --git a/core/sql/SqlCompilerDebugger/mk.sh b/core/sql/SqlCompilerDebugger/mk.sh
index 19d167a..7056cc9 100644
--- a/core/sql/SqlCompilerDebugger/mk.sh
+++ b/core/sql/SqlCompilerDebugger/mk.sh
@@ -21,6 +21,9 @@
export PATH=$QT_TOOLKIT/bin:$PATH
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
+
qmake -o Makefile SqlCmpDbg.pro
make
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6d8510b2/core/sql/nskgmake/SqlCompilerDebugger/Makefile
----------------------------------------------------------------------
diff --git a/core/sql/nskgmake/SqlCompilerDebugger/Makefile b/core/sql/nskgmake/SqlCompilerDebugger/Makefile
index c767376..e34afa2 100644
--- a/core/sql/nskgmake/SqlCompilerDebugger/Makefile
+++ b/core/sql/nskgmake/SqlCompilerDebugger/Makefile
@@ -28,9 +28,6 @@
CMPGUI_FINAL:=$(RESULTDIR)/$(LIBPREFIX)$(notdir $(obj))
CMPGUI_OBJ:=$(obj)
-# QT_TOOLKIT defined in environment
-QT_ROOT:=$(QT_TOOLKIT)
-
#add to buildall prerequisite
FINAL_DLLS += $(CMPGUI_FINAL)
@@ -40,11 +37,7 @@ $(CMPGUI_FINAL) : cmpdbg_qt_build
cmpdbg_qt_build :
cd ../$(basename $(CMPGUI_OBJ)) && . ./mk.sh; \
- cp -f $$PWD/$(LIBPREFIX)$(notdir $(obj)) $(CMPGUI_FINAL); \
- cp -f $(QT_ROOT)/lib/libQtCoreCmpDbg.so.4 $(RESULTDIR)/libQtCoreCmpDbg.so.4; \
- cp -f $(QT_ROOT)/lib/libQtGuiCmpDbg.so.4 $(RESULTDIR)/libQtGuiCmpDbg.so.4; \
- ln -sf $$PWD/$(RESULTDIR)/libQtCoreCmpDbg.so.4 $(MY_SQROOT)/export/lib$(SQ_MBTYPE); \
- ln -sf $$PWD/$(RESULTDIR)/libQtGuiCmpDbg.so.4 $(MY_SQROOT)/export/lib$(SQ_MBTYPE);
+ cp -f $$PWD/$(LIBPREFIX)$(notdir $(obj)) $(CMPGUI_FINAL);
#when clean, this clean first
@@ -52,8 +45,4 @@ clean: cmpdbg_qt_clean
cmpdbg_qt_clean:
cd ../$(basename $(CMPGUI_OBJ)) && . ./cln.sh; \
- rm -f $(CMPGUI_FINAL); \
- rm -f $(RESULTDIR)/libQtGuiCmpDbg.so.4; \
- rm -f $(RESULTDIR)/libQtCoreCmpDbg.so.4; \
- rm -f $(MY_SQROOT)/export/lib$(SQ_MBTYPE)/libQtGuiCmpDbg.so.4; \
- rm -f $(MY_SQROOT)/export/lib$(SQ_MBTYPE)/libQtCoreCmpDbg.so.4;
+ rm -f $(CMPGUI_FINAL);
[2/3] incubator-trafodion git commit: [TRAFODION-1840] Fix typo in
comments
Posted by db...@apache.org.
[TRAFODION-1840] Fix typo in comments
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/dcdde142
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/dcdde142
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/dcdde142
Branch: refs/heads/master
Commit: dcdde1421bdfc6e14af988dd629c3972bdd6289d
Parents: 6d8510b
Author: Steve Varnau <st...@esgyn.com>
Authored: Fri Feb 19 23:56:29 2016 +0000
Committer: Steve Varnau <st...@esgyn.com>
Committed: Fri Feb 19 23:56:29 2016 +0000
----------------------------------------------------------------------
core/sqf/LocalSettingsTemplate.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/dcdde142/core/sqf/LocalSettingsTemplate.sh
----------------------------------------------------------------------
diff --git a/core/sqf/LocalSettingsTemplate.sh b/core/sqf/LocalSettingsTemplate.sh
index 1d19efa..c88ff43 100644
--- a/core/sqf/LocalSettingsTemplate.sh
+++ b/core/sqf/LocalSettingsTemplate.sh
@@ -67,7 +67,7 @@ LOG4CXX_INC_DIR="$TOOLSDIR/apache-log4cxx-0.10.0/include"
# Explicitly set QT_TOOLKIT here if Qt is installed and you want to build the SqlCompilerDebugger
# QT_TOOLKIT="$TOOLSDIR/Qt-4.8.5-64"
-# SqlCompilerDebugger ibrary will be dynamically linked with Qt libs.
+# SqlCompilerDebugger library will be dynamically linked with Qt libs.
# Note that Qt uses LGPL license. It is not to be re-distributed under Apache license.
# HBASE*, HIVE*, HADOOP* locations may be overridden here
[3/3] incubator-trafodion git commit: Merge [TRAFODION-1840] PR 332
Remove bundling of Qt libraries from packaging
Posted by db...@apache.org.
Merge [TRAFODION-1840] PR 332 Remove bundling of Qt libraries from packaging
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/8730b34c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/8730b34c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/8730b34c
Branch: refs/heads/master
Commit: 8730b34c5b7ae4a19ac15ebc6c426808bc25bc2e
Parents: d9736f2 dcdde14
Author: Dave Birdsall <db...@apache.org>
Authored: Tue Feb 23 16:58:35 2016 +0000
Committer: Dave Birdsall <db...@apache.org>
Committed: Tue Feb 23 16:58:35 2016 +0000
----------------------------------------------------------------------
.../unixodbc/odbc/odbcclient/unixcli/package/LICENSE | 1 -
core/sqf/LocalSettingsTemplate.sh | 2 ++
core/sqf/sqenvcom.sh | 3 +++
core/sql/SqlCompilerDebugger/mk.sh | 3 +++
core/sql/nskgmake/SqlCompilerDebugger/Makefile | 15 ++-------------
5 files changed, 10 insertions(+), 14 deletions(-)
----------------------------------------------------------------------