Merge [TRAFODION-2068] pr #557 Missing DISCLAIMER files for release package
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/
diff --git a/core/sqf/.gitignore b/core/sqf/.gitignore
index ebc26a9..9ae9b26 100644
--- a/core/sqf/.gitignore
+++ b/core/sqf/.gitignore
@@ -67,6 +67,8 @@
# derived license
/LICENSE
/NOTICE
+/DISCLAIMER
+sqf/DISCLAIMER
# bundled component links
/dcs-*
diff --git a/core/sqf/Makefile b/core/sqf/Makefile
index f67ad46..ae19533 100644
--- a/core/sqf/Makefile
+++ b/core/sqf/Makefile
@@ -282,7 +282,7 @@
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 @@
../../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/$@/$@ $@
@@ -340,7 +346,7 @@
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
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 @@
NOTICE-server:
cat ../NOTICE note-server-bin > $@
+DISCLAIMER-server:
+ cat ../DISCLAIMER > $@
+
LICENSE-install:
cat Apache > $@
