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 <[email protected]> Authored: Wed Jun 22 23:00:41 2016 +0000 Committer: Roberta Marton <[email protected]> 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 > $@
