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/07/20 00:29:35 UTC
[01/12] incubator-trafodion git commit: Fixes for TRAFODION-2068 and
TRAFODION-2082
Repository: incubator-trafodion
Updated Branches:
refs/heads/master 5b9c2b493 -> 17e0e2192
Fixes for TRAFODION-2068 and TRAFODION-2082
TRAFODION-2068: Missing DISCLAIMER files for release package
TRAFODION-2082: BSD-4 license for swsprintf and swscanf unclear
Added DISCLAIMER file to clients and installer packages
Updated BSD license text in swsprintf.cpp and swscanf.cpp
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/3b9be918
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/3b9be918
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/3b9be918
Branch: refs/heads/master
Commit: 3b9be91867c645ab070eeb59b301f8fd7983c05e
Parents: 355bb68
Author: Roberta Marton <rm...@edev07.esgyn.local>
Authored: Tue Jun 21 17:34:36 2016 +0000
Committer: Roberta Marton <rm...@edev07.esgyn.local>
Committed: Tue Jun 21 17:34:36 2016 +0000
----------------------------------------------------------------------
core/conn/Makefile | 5 ++++-
core/sql/common/swscanf.cpp | 15 +++++----------
core/sql/common/swsprintf.cpp | 16 +++++-----------
install/Makefile | 5 ++++-
licenses/lic-server-src | 19 +++++++------------
5 files changed, 25 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/3b9be918/core/conn/Makefile
----------------------------------------------------------------------
diff --git a/core/conn/Makefile b/core/conn/Makefile
index b2fa00b..94855a2 100644
--- a/core/conn/Makefile
+++ b/core/conn/Makefile
@@ -34,7 +34,7 @@ endif
.PHONY: all
all: pkg-clients
-pkg-clients: clients/LICENSE clients/NOTICE
+pkg-clients: clients/LICENSE clients/NOTICE clients/DISCLAIMER
mkdir -p $$(dirname $(CLIENT_TAR))
tar -zcvf $(CLIENT_TAR) clients
@@ -47,6 +47,9 @@ clients/LICENSE: ../../licenses/LICENSE-clients
clients/NOTICE: ../../NOTICE
cp -f $? $@
+clients/DISCLAIMER: ../../DISCLAIMER
+ cp -f $? $@
+
clean:
$(RM) -rf $(MY_SQROOT)/../conn/clients
$(RM) -f $(MY_SQROOT)/../conn/*.mf
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/3b9be918/core/sql/common/swscanf.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/swscanf.cpp b/core/sql/common/swscanf.cpp
index ccf82cb..33ffb37 100644
--- a/core/sql/common/swscanf.cpp
+++ b/core/sql/common/swscanf.cpp
@@ -1,4 +1,6 @@
-/* -*-C++-*-
+/* -*-C++-*-
+ * $OpenBSD: vfscanf.c,v 1.21 2006/01/13 21:33:28 millert Exp $
+ *-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
@@ -13,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -39,7 +37,7 @@
* File: swscanf.h
* Description: SQL/MX wide-char swscanf() function, modified based on
* NetBSD __svfscanf.c found at
- * http://www.ajk.tele.fi/libc/stdio/vfscanf.c.html#__svfscanf
+ * http://ftp.stu.edu.tw/BSD/OpenBSD/src/lib/libc/stdio/vfscanf.c
* Created: 2/13/2002
* Language: C++
* Limitation:
@@ -50,8 +48,6 @@
*****************************************************************************
*/
-//LCOV_EXCL_START // Used only by .../sqlutils/metamigr/MIGRATE.cpp which is not used in SQ
-
/* commented out the useless static data structure.*/
//#if defined(LIBC_SCCS) && !defined(lint)
//#if 0
@@ -864,5 +860,4 @@ Int32 na_swscanf(const NAWchar *str, NAWchar const *fmt, ...)
va_end(ap);
return (ret);
}
-//LCOV_EXCL_STOP // Used only by .../sqlutils/metamigr/MIGRATE.cpp which is not used in SQ
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/3b9be918/core/sql/common/swsprintf.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/swsprintf.cpp b/core/sql/common/swsprintf.cpp
index 22b6102..84fc586 100644
--- a/core/sql/common/swsprintf.cpp
+++ b/core/sql/common/swsprintf.cpp
@@ -1,7 +1,8 @@
/* -*-C++-*-
+ * $OpenBSD: sprintf.c,v 1.13 2005/10/10 12:00:52 espie Exp $
*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1990, 1993
+ * The Regents of the University of California. All rights reserved.
*
* This code is derived from software contributed to Berkeley by
* Chris Torek.
@@ -14,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -34,14 +31,11 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
-
-/* $NetBSD: vfprintf.c,v 1.18 1997/04/02 12:50:25 kleink Exp $ */
-
/*****************************************************************************
*
* File: swsprintf.h
* Description: SQL/MX wide-char swsprintf() function, adapted from NetBSD vfprintf.c
- * found at http://www.ajk.tele.fi/libc/stdio/vfprintf.c.html#vfprintf.
+ * found at http://ftp.stu.edu.tw/BSD/OpenBSD/src/lib/libc/stdio/sprintf.c
* Created: 2/13/2002
* Language: C++
* Limitation: Floating point numbers are not supported.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/3b9be918/install/Makefile
----------------------------------------------------------------------
diff --git a/install/Makefile b/install/Makefile
index 014c01c..9293d83 100644
--- a/install/Makefile
+++ b/install/Makefile
@@ -26,7 +26,7 @@ RELEASE_VER ?= 1.0.0_v002
all: pkg-installer
-pkg-installer: installer/LICENSE installer/NOTICE
+pkg-installer: installer/LICENSE installer/NOTICE installer/DISCLAIMER
tar czf installer-$(RELEASE_VER).tar.gz installer --exclude=tools
installer/LICENSE: ../licenses/LICENSE-install
@@ -38,6 +38,9 @@ installer/LICENSE: ../licenses/LICENSE-install
installer/NOTICE: ../NOTICE
cp -f $? $@
+installer/DISCLAIMER: ../DISCLAIMER
+ cp -f $? $@
+
version:
@echo "$(RELEASE_VER)"
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/3b9be918/licenses/lic-server-src
----------------------------------------------------------------------
diff --git a/licenses/lic-server-src b/licenses/lic-server-src
index b709485..6dc0313 100644
--- a/licenses/lic-server-src
+++ b/licenses/lic-server-src
@@ -3,30 +3,25 @@ The core component of Apache Trafodion uses several BSD-like and MIT-like licens
+++++++++++++++++++++++++++++
-BSD-4 clause for files:
+BSD-3 clause for files:
incubator-trafodion/core/sql/common/swsprintf.cpp
incubator-trafodion/core/sql/common/swscanf.cpp
-The third clause of this license has since been rescinded. See the
-Historical Background section at https://opensource.org/licenses/BSD-3-Clause.
+Copyright (c) 1990, 1993
+ The Regents of the University of California. All rights reserved.
- Copyright (c) 1990 The Regents of the University of California.
- Copyright (c) 1990, 1993 The Regents of the University of California.
- This code is derived from software contributed to Berkeley by Chris Torek.
+ This code is derived from software contributed to Berkeley by
+ Chris Torek.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
+. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
- 3. All advertising materials mentioning features or use of this software
- must display the following acknowledgement:
- This product includes software developed by the University of
- California, Berkeley and its contributors.
- 4. Neither the name of the University nor the names of its contributors
+ 3. Neither the name of the University nor the names of its contributors
may be used to endorse or promote products derived from this software
without specific prior written permission.
[02/12] incubator-trafodion git commit: Merge [TRAFODION-2068]
[TRAFODION-2082] PR 554 License and disclaimer files
Posted by db...@apache.org.
Merge [TRAFODION-2068] [TRAFODION-2082] PR 554 License and disclaimer files
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/0e160222
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/0e160222
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/0e160222
Branch: refs/heads/master
Commit: 0e160222c3119399bd8019d39bea2c5b67c791a3
Parents: 355bb68 3b9be91
Author: Dave Birdsall <db...@apache.org>
Authored: Tue Jun 21 22:46:24 2016 +0000
Committer: Dave Birdsall <db...@apache.org>
Committed: Tue Jun 21 22:46:24 2016 +0000
----------------------------------------------------------------------
core/conn/Makefile | 5 ++++-
core/sql/common/swscanf.cpp | 15 +++++----------
core/sql/common/swsprintf.cpp | 16 +++++-----------
install/Makefile | 5 ++++-
licenses/lic-server-src | 19 +++++++------------
5 files changed, 25 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
[07/12] incubator-trafodion git commit: Added sqf/DISCLAIMER to the
.gitignore file also.
Posted by db...@apache.org.
Added sqf/DISCLAIMER to the .gitignore file also.
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/2935d41c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/2935d41c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/2935d41c
Branch: refs/heads/master
Commit: 2935d41cbdb1e9708440fe6e64f200de2edfbc1b
Parents: b7dc641
Author: Roberta Marton <rm...@edev07.esgyn.local>
Authored: Thu Jun 23 18:08:28 2016 +0000
Committer: Roberta Marton <rm...@edev07.esgyn.local>
Committed: Thu Jun 23 18:08:28 2016 +0000
----------------------------------------------------------------------
core/sqf/.gitignore | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/2935d41c/core/sqf/.gitignore
----------------------------------------------------------------------
diff --git a/core/sqf/.gitignore b/core/sqf/.gitignore
index 471026d..9ae9b26 100644
--- a/core/sqf/.gitignore
+++ b/core/sqf/.gitignore
@@ -68,6 +68,7 @@ Linux-x86_64/
/LICENSE
/NOTICE
/DISCLAIMER
+sqf/DISCLAIMER
# bundled component links
/dcs-*
[09/12] incubator-trafodion git commit: [TRAFODION-2092] (Backport to
release2.0) Fix installer package name
Posted by db...@apache.org.
[TRAFODION-2092] (Backport to release2.0) Fix installer package name
This is a backport of Anu's changes and mine from master to generate
installer package from the main makefile and name the package correctly.
Also includes the license typo mentioned in TRAFODION-2093.
These changes are backported in case any more patch releases are needed
for 2.0.x.
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/026aefe6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/026aefe6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/026aefe6
Branch: refs/heads/master
Commit: 026aefe61823aedad94c183bb306b0f5879dcd3b
Parents: 6357cb8
Author: Steve Varnau <st...@esgyn.com>
Authored: Fri Jul 8 17:23:24 2016 +0000
Committer: Steve Varnau <st...@esgyn.com>
Committed: Fri Jul 8 17:23:24 2016 +0000
----------------------------------------------------------------------
Makefile | 1 +
core/Makefile | 10 ++++++++--
install/Makefile | 18 +++++++-----------
licenses/lic-server-src | 2 +-
4 files changed, 17 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/026aefe6/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index 7258f30..c69e51e 100644
--- a/Makefile
+++ b/Makefile
@@ -42,6 +42,7 @@ package-src: $(SRCDIR)-${TRAFODION_VER}-incubating/LICENSE
git archive --format tar --prefix $(SRCDIR)-${TRAFODION_VER}-incubating/ HEAD > distribution/$(SRCDIR)-${TRAFODION_VER}-incubating-src.tar
tar rf distribution/$(SRCDIR)-${TRAFODION_VER}-incubating-src.tar $^
gzip distribution/$(SRCDIR)-${TRAFODION_VER}-incubating-src.tar
+ rm -rf $(SRCDIR)-${TRAFODION_VER}-incubating LICENSE
$(SRCDIR)-${TRAFODION_VER}-incubating/LICENSE:
cd licenses && $(MAKE) LICENSE-src
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/026aefe6/core/Makefile
----------------------------------------------------------------------
diff --git a/core/Makefile b/core/Makefile
index a0fde08..2b6315d 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -28,7 +28,7 @@ include macros.gmk
# Make Targets
.PHONY: all dbsecurity foundation $(MPI_TARGET) ndcs ci jdbc_jar jdbc_type2_jar sqroot $(SEAMONSTER_TARGET) verhdr dcs rest odb
-.PHONY: package package-all pkg-product pkg-sql-regress pkg-phx-tests pkg-dcs-tests check-copyrights
+.PHONY: package package-all pkg-product pkg-sql-regress pkg-phx-tests pkg-dcs-tests check-copyrights pkg-installer
################
### Main targets
@@ -37,7 +37,7 @@ include macros.gmk
# Default target (all components)
all: $(MPI_TARGET) dbsecurity foundation jdbc_jar $(SEAMONSTER_TARGET) ndcs ci jdbc_type2_jar dcs rest odb lib_mgmt
-package: pkg-product pkg-client
+package: pkg-product pkg-client pkg-installer
#############
# Components
@@ -115,6 +115,7 @@ clean: sqroot
cd rest && $(MAKE) clean
cd conn/odb && $(MAKE) clean
cd ../dcs && $(MAKE) clean
+ cd ../install && $(MAKE) clean
$(RM) -r ../${DISTRIBUTION_DIR}
cleanall: sqroot eclipseclean cleantests
@@ -129,6 +130,7 @@ cleanall: sqroot eclipseclean cleantests
cd rest && $(MAKE) clean
cd conn/odb && $(MAKE) clean
cd ../dcs && $(MAKE) clean
+ cd ../install && $(MAKE) clean
$(RM) -r ../${DISTRIBUTION_DIR}
package-all: package pkg-sql-regress pkg-phx-tests pkg-dcs-tests
@@ -151,6 +153,10 @@ pkg-phx-tests: all
pkg-dcs-tests: all
cd sqf && $(MAKE) package-dcs 2>&1 | sed -e "s/$$/ ##(Package dcs tests)/";exit $${PIPESTATUS[0]}
+# Package installer
+pkg-installer:
+ cd ../install && $(MAKE) 2>&1 | sed -e "s/$$/ ##(Package installer)/";exit $${PIPESTATUS[0]}
+
version:
@cd sqf; unset SQ_VERBOSE; source sqenv.sh ; echo "$${TRAFODION_VER}"
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/026aefe6/install/Makefile
----------------------------------------------------------------------
diff --git a/install/Makefile b/install/Makefile
index 9293d83..249f27f 100644
--- a/install/Makefile
+++ b/install/Makefile
@@ -14,20 +14,16 @@
# limitations under the License.
#
# @@@ END COPYRIGHT @@@
-
-# Default version number
-# daily, pre-release, & release builds are named based on build ID (tag or date)
-# Version identifier is two parts:
-# * Trafodion version supported
-# * Installer version number (starting from 1 for each Trafodion version)
-#
-# "v000" indicates an internal/development version of installer
-RELEASE_VER ?= 1.0.0_v002
+RELEASE_VER ?= ${TRAFODION_VER}-incubating
+RELEASE_TYPE ?= $(shell echo $(TRAFODION_VER_PROD)| sed -e 's/ /-/g')
+INSTALLER_TARNAME = $(shell echo ${RELEASE_TYPE}_installer-${RELEASE_VER}.tar.gz |tr '[A-Z]' '[a-z]')
all: pkg-installer
pkg-installer: installer/LICENSE installer/NOTICE installer/DISCLAIMER
- tar czf installer-$(RELEASE_VER).tar.gz installer --exclude=tools
+ tar czf ${INSTALLER_TARNAME} installer --exclude=tools
+ mkdir -p ../distribution
+ mv ${INSTALLER_TARNAME} ../distribution
installer/LICENSE: ../licenses/LICENSE-install
cp -f $? $@
@@ -45,4 +41,4 @@ version:
@echo "$(RELEASE_VER)"
clean:
- rm installer-$(RELEASE_VER).tar.gz
+ rm -f ${INSTALLER_TARNAME}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/026aefe6/licenses/lic-server-src
----------------------------------------------------------------------
diff --git a/licenses/lic-server-src b/licenses/lic-server-src
index 6dc0313..5ebc75b 100644
--- a/licenses/lic-server-src
+++ b/licenses/lic-server-src
@@ -18,7 +18,7 @@ Copyright (c) 1990, 1993
are met:
1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
-. Redistributions in binary form must reproduce the above copyright
+ 2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
3. Neither the name of the University nor the names of its contributors
[06/12] incubator-trafodion git commit: Added DISCLAIMER file to
sqf/.gitignore file since this file is not tracked by git. Also reverted last
changed,
.rat-excludes does not need to be changed to support DISCLAIMER file. The rat
tool has support to ha
Posted by db...@apache.org.
Added DISCLAIMER file to sqf/.gitignore file since this file is not
tracked by git. Also reverted last changed, .rat-excludes does not need
to be changed to support DISCLAIMER file. The rat tool has support to
handle these types of mandatory files.
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/b7dc6414
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/b7dc6414
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/b7dc6414
Branch: refs/heads/master
Commit: b7dc6414b9e23cbd8ab7d5e97106900615b5de87
Parents: 07b7844
Author: Roberta Marton <rm...@edev07.esgyn.local>
Authored: Thu Jun 23 17:01:51 2016 +0000
Committer: Roberta Marton <rm...@edev07.esgyn.local>
Committed: Thu Jun 23 17:01:51 2016 +0000
----------------------------------------------------------------------
.gitignore | 1 +
.rat-excludes | 1 -
core/sqf/.gitignore | 1 +
3 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b7dc6414/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index bbe9199..0b52906 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
/distribution/
/licenses/LICENSE*
/licenses/NOTICE*
+/licenses/DISCLAIMER*
LICENSE
/apache-*incubating/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b7dc6414/.rat-excludes
----------------------------------------------------------------------
diff --git a/.rat-excludes b/.rat-excludes
index 0259c9a..4ef2fce 100644
--- a/.rat-excludes
+++ b/.rat-excludes
@@ -60,7 +60,6 @@ LICENSE.rtf*
lic-.*-src
lic-.*-bin
note-.*-bin
-DISCLAIMER
# win generated
SetCertificateDirReg_os.vcxproj*
SetCertificateDirReg_os.vcxproj.*
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b7dc6414/core/sqf/.gitignore
----------------------------------------------------------------------
diff --git a/core/sqf/.gitignore b/core/sqf/.gitignore
index ebc26a9..471026d 100644
--- a/core/sqf/.gitignore
+++ b/core/sqf/.gitignore
@@ -67,6 +67,7 @@ Linux-x86_64/
# derived license
/LICENSE
/NOTICE
+/DISCLAIMER
# bundled component links
/dcs-*
[04/12] incubator-trafodion git commit: Fixes for TRAFODION-2068
Posted by db...@apache.org.
Fixes for TRAFODION-2068
TRAFODION-2068: Missing DISCLAIMER files for release package
Added DISCLAIMER file to servers package.
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/00243203
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/00243203
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/00243203
Branch: refs/heads/master
Commit: 0024320349d3b1387e27ba6b54c1871348dc6ec2
Parents: 6495619
Author: Roberta Marton <rm...@edev07.esgyn.local>
Authored: Thu Jun 23 00:55:18 2016 +0000
Committer: Roberta Marton <rm...@edev07.esgyn.local>
Committed: Thu Jun 23 00:55:18 2016 +0000
----------------------------------------------------------------------
core/sqf/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/00243203/core/sqf/Makefile
----------------------------------------------------------------------
diff --git a/core/sqf/Makefile b/core/sqf/Makefile
index e1ee30b..ae19533 100644
--- a/core/sqf/Makefile
+++ b/core/sqf/Makefile
@@ -346,7 +346,7 @@ pkglist-files: pkglist-symlinks
find -L $(PKG_BIN_OBJS) -type d -o -type f | grep -v -xf pkglist-symlinks > $@
# simple symlinks that point to filename (does not start with . or /)
-pkglist-symlinks: LICENSE NOTICE rest-${TRAFODION_VER} dcs-${TRAFODION_VER}
+pkglist-symlinks: LICENSE NOTICE DISCLAIMER rest-${TRAFODION_VER} dcs-${TRAFODION_VER}
find $(PKG_BIN_OBJS) -lname '[^./]*' > $@
# Targets to tar/gzip the self installer
[12/12] incubator-trafodion git commit: Merge [TRAFODION-1977] PR 603
Merge forward release2.0 changes to master
Posted by db...@apache.org.
Merge [TRAFODION-1977] PR 603 Merge forward release2.0 changes to master
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/17e0e219
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/17e0e219
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/17e0e219
Branch: refs/heads/master
Commit: 17e0e219242990620785d6d59034f6a28ad332d2
Parents: 5b9c2b4 a7b4a70
Author: Dave Birdsall <db...@apache.org>
Authored: Wed Jul 20 00:28:21 2016 +0000
Committer: Dave Birdsall <db...@apache.org>
Committed: Wed Jul 20 00:28:21 2016 +0000
----------------------------------------------------------------------
.gitignore | 1 +
core/conn/Makefile | 5 ++++-
core/sqf/.gitignore | 2 ++
core/sqf/Makefile | 10 ++++++++--
core/sql/common/swscanf.cpp | 15 +++++----------
core/sql/common/swsprintf.cpp | 16 +++++-----------
install/Makefile | 5 ++++-
licenses/Makefile | 5 ++++-
licenses/lic-server-src | 17 ++++++-----------
9 files changed, 39 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
[03/12] incubator-trafodion git commit: Fixes for TRAFODION-2068
Posted by db...@apache.org.
Fixes for TRAFODION-2068
TRAFODION-2068: Missing DISCLAIMER files for release package
Added DISCLAIMER file to servers package.
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/64956196
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/64956196
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/64956196
Branch: refs/heads/master
Commit: 649561964565e1d6896d2e584754b1c757a0fd01
Parents: 0e16022
Author: Roberta Marton <rm...@edev07.esgyn.local>
Authored: Wed Jun 22 23:00:41 2016 +0000
Committer: Roberta Marton <rm...@edev07.esgyn.local>
Committed: Wed Jun 22 23:00:41 2016 +0000
----------------------------------------------------------------------
core/sqf/Makefile | 8 +++++++-
licenses/Makefile | 5 ++++-
2 files changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/64956196/core/sqf/Makefile
----------------------------------------------------------------------
diff --git a/core/sqf/Makefile b/core/sqf/Makefile
index f67ad46..e1ee30b 100644
--- a/core/sqf/Makefile
+++ b/core/sqf/Makefile
@@ -282,7 +282,7 @@ PKG_BIN_OBJS ?= export/bin$(SQ_MBTYPE) export/include export/lib export/lib$(SQ_
PKG_BIN_OBJS += trafci
PKG_BIN_OBJS += export/limited-support-tools
-PKG_BIN_OBJS += LICENSE NOTICE
+PKG_BIN_OBJS += LICENSE NOTICE DISCLAIMER
PKG_BIN_OBJS += rest-${TRAFODION_VER} dcs-${TRAFODION_VER}
PKG_BIN_DIRS ?= sql export
@@ -322,6 +322,12 @@ NOTICE: ../../licenses/NOTICE-server
../../licenses/NOTICE-server:
cd $(@D) && $(MAKE) $(@F)
+DISCLAIMER: ../../licenses/DISCLAIMER-server
+ cp -f $? $@
+
+../../licenses/DISCLAIMER-server:
+ cd $(@D) && $(MAKE) $(@F)
+
rest-${TRAFODION_VER}:
ln -s ../rest/target/$@/$@ $@
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/64956196/licenses/Makefile
----------------------------------------------------------------------
diff --git a/licenses/Makefile b/licenses/Makefile
index 92b449f..ec3198c 100644
--- a/licenses/Makefile
+++ b/licenses/Makefile
@@ -19,7 +19,7 @@
#
# @@@ END COPYRIGHT @@@
-all: LICENSE-src LICENSE-server LICENSE-install LICENSE-clients NOTICE-server
+all: LICENSE-src LICENSE-server LICENSE-install LICENSE-clients NOTICE-server DISCLAIMER-server
# All source code included in Trafodion source
LICENSE-src:
@@ -33,6 +33,9 @@ LICENSE-server:
NOTICE-server:
cat ../NOTICE note-server-bin > $@
+DISCLAIMER-server:
+ cat ../DISCLAIMER > $@
+
LICENSE-install:
cat Apache > $@
[10/12] incubator-trafodion git commit: Merge
[TRAFODION-2092][TRAFODION-2093] PR 587 Fix installer package name
Posted by db...@apache.org.
Merge [TRAFODION-2092][TRAFODION-2093] PR 587 Fix installer package name
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/30f41890
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/30f41890
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/30f41890
Branch: refs/heads/master
Commit: 30f41890844bf444817b6a5d4b9f35e2ae64342f
Parents: 6357cb8 026aefe
Author: Dave Birdsall <db...@apache.org>
Authored: Tue Jul 12 18:23:23 2016 +0000
Committer: Dave Birdsall <db...@apache.org>
Committed: Tue Jul 12 18:23:23 2016 +0000
----------------------------------------------------------------------
Makefile | 1 +
core/Makefile | 10 ++++++++--
install/Makefile | 18 +++++++-----------
licenses/lic-server-src | 2 +-
4 files changed, 17 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
[11/12] incubator-trafodion git commit: [TRAFODION-1977] Merge
forward 2.0.1 RC3 changes.
Posted by db...@apache.org.
[TRAFODION-1977] Merge forward 2.0.1 RC3 changes.
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/a7b4a701
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/a7b4a701
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/a7b4a701
Branch: refs/heads/master
Commit: a7b4a70171f12f1bacca8731ebc9a38dfff73923
Parents: 08be5c1 30f4189
Author: Steve Varnau <st...@esgyn.com>
Authored: Mon Jul 18 22:05:01 2016 +0000
Committer: Steve Varnau <st...@esgyn.com>
Committed: Mon Jul 18 22:05:01 2016 +0000
----------------------------------------------------------------------
.gitignore | 1 +
core/conn/Makefile | 5 ++++-
core/sqf/.gitignore | 2 ++
core/sqf/Makefile | 10 ++++++++--
core/sql/common/swscanf.cpp | 15 +++++----------
core/sql/common/swsprintf.cpp | 16 +++++-----------
install/Makefile | 5 ++++-
licenses/Makefile | 5 ++++-
licenses/lic-server-src | 17 ++++++-----------
9 files changed, 39 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a7b4a701/core/sqf/Makefile
----------------------------------------------------------------------
diff --cc core/sqf/Makefile
index acba403,ae19533..8f3197f
--- a/core/sqf/Makefile
+++ b/core/sqf/Makefile
@@@ -281,9 -281,8 +281,9 @@@ PKG_DCS_TEST_TAR ?= "../../${DISTRIBUTI
PKG_BIN_OBJS ?= export/bin$(SQ_MBTYPE) export/include export/lib export/lib$(SQ_MBTYPE) export/share gdb sql/scripts sqenvcom.sh opt tools conf hbase_utilities/backup_and_restore
PKG_BIN_OBJS += trafci
+PKG_BIN_OBJS += samples
PKG_BIN_OBJS += export/limited-support-tools
- PKG_BIN_OBJS += LICENSE NOTICE
+ PKG_BIN_OBJS += LICENSE NOTICE DISCLAIMER
PKG_BIN_OBJS += rest-${TRAFODION_VER} dcs-${TRAFODION_VER}
PKG_BIN_DIRS ?= sql export
[05/12] incubator-trafodion git commit: Added DISCLAIMER filel to
rat-excludes, does not have an Apache header
Posted by db...@apache.org.
Added DISCLAIMER filel to rat-excludes, does not have an Apache header
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/07b78449
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/07b78449
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/07b78449
Branch: refs/heads/master
Commit: 07b78449d3dbe76f2dd4ac273b0fe740bc8b5f90
Parents: 0024320
Author: Roberta Marton <rm...@edev07.esgyn.local>
Authored: Thu Jun 23 03:03:50 2016 +0000
Committer: Roberta Marton <rm...@edev07.esgyn.local>
Committed: Thu Jun 23 03:03:50 2016 +0000
----------------------------------------------------------------------
.rat-excludes | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/07b78449/.rat-excludes
----------------------------------------------------------------------
diff --git a/.rat-excludes b/.rat-excludes
index 4ef2fce..0259c9a 100644
--- a/.rat-excludes
+++ b/.rat-excludes
@@ -60,6 +60,7 @@ LICENSE.rtf*
lic-.*-src
lic-.*-bin
note-.*-bin
+DISCLAIMER
# win generated
SetCertificateDirReg_os.vcxproj*
SetCertificateDirReg_os.vcxproj.*
[08/12] incubator-trafodion git commit: Merge [TRAFODION-2068] pr
#557 Missing DISCLAIMER files for release package
Posted by db...@apache.org.
Merge [TRAFODION-2068] pr #557 Missing DISCLAIMER files for release package
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/6357cb8f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/6357cb8f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/6357cb8f
Branch: refs/heads/master
Commit: 6357cb8f76ab399b451896c75273fd6f2e02d9c4
Parents: 0e16022 2935d41
Author: Roberta Marton <ro...@apache.org>
Authored: Thu Jun 23 22:49:34 2016 +0000
Committer: Roberta Marton <ro...@apache.org>
Committed: Thu Jun 23 22:49:34 2016 +0000
----------------------------------------------------------------------
.gitignore | 1 +
core/sqf/.gitignore | 2 ++
core/sqf/Makefile | 10 ++++++++--
licenses/Makefile | 5 ++++-
4 files changed, 15 insertions(+), 3 deletions(-)
----------------------------------------------------------------------