You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by li...@apache.org on 2018/01/16 16:02:50 UTC
[3/4] trafodion git commit: [TRAFODION-2861][TRAFODION-2869] Remove
incubating from release packaging
[TRAFODION-2861][TRAFODION-2869] Remove incubating from release packaging
Remove disclaimer file and incubating string from packaging file names.
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/6429a0c2
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/6429a0c2
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/6429a0c2
Branch: refs/heads/release2.2
Commit: 6429a0c2839dd22eefbd6ed368236492e8f730fc
Parents: 6047c51
Author: Steve Varnau <st...@esgyn.com>
Authored: Thu Jan 4 20:07:47 2018 +0000
Committer: Steve Varnau <st...@esgyn.com>
Committed: Thu Jan 11 18:22:17 2018 +0000
----------------------------------------------------------------------
DISCLAIMER | 1 -
Makefile | 14 +++++++-------
core/Makefile | 2 +-
core/conn/Makefile | 7 ++-----
core/conn/jdbcT4/pom.xml | 6 +++---
core/sqf/.gitignore | 2 --
core/sqf/Makefile | 12 +++---------
core/trafodion.spec | 2 +-
.../src/asciidoc/_chapters/preparation.adoc | 4 ++--
.../src/asciidoc/_chapters/quickstart.adoc | 2 +-
install/.gitignore | 1 -
install/Makefile | 7 ++-----
install/ambari-installer/Makefile | 6 +-----
licenses/Makefile | 5 +----
14 files changed, 24 insertions(+), 47 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafodion/blob/6429a0c2/DISCLAIMER
----------------------------------------------------------------------
diff --git a/DISCLAIMER b/DISCLAIMER
deleted file mode 100644
index 9fd36df..0000000
--- a/DISCLAIMER
+++ /dev/null
@@ -1 +0,0 @@
-*** File To Be Removed - still referenced in packaging ***
http://git-wip-us.apache.org/repos/asf/trafodion/blob/6429a0c2/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index c69e51e..3a67ccb 100644
--- a/Makefile
+++ b/Makefile
@@ -36,15 +36,15 @@ package-all:
@echo "Packaging all Trafodion components"
cd core && $(MAKE) package-all
-package-src: $(SRCDIR)-${TRAFODION_VER}-incubating/LICENSE
+package-src: $(SRCDIR)-${TRAFODION_VER}/LICENSE
@echo "Packaging source for $(TRAFODION_VER_PROD) $(TRAFODION_VER)"
mkdir -p distribution
- 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
+ git archive --format tar --prefix $(SRCDIR)-${TRAFODION_VER}/ HEAD > distribution/$(SRCDIR)-${TRAFODION_VER}-src.tar
+ tar rf distribution/$(SRCDIR)-${TRAFODION_VER}-src.tar $^
+ gzip distribution/$(SRCDIR)-${TRAFODION_VER}-src.tar
+ rm -rf $(SRCDIR)-${TRAFODION_VER} LICENSE
-$(SRCDIR)-${TRAFODION_VER}-incubating/LICENSE:
+$(SRCDIR)-${TRAFODION_VER}/LICENSE:
cd licenses && $(MAKE) LICENSE-src
mkdir -p $(@D)
cp licenses/LICENSE-src $@
@@ -57,7 +57,7 @@ clean:
@echo "Removing Trafodion objects"
cd core && $(MAKE) clean
cd licenses && $(MAKE) clean
- rm -rf $(SRCDIR)-${TRAFODION_VER}-incubating LICENSE
+ rm -rf $(SRCDIR)-${TRAFODION_VER} LICENSE
cleanall:
@echo "Removing all Trafodion objects"
http://git-wip-us.apache.org/repos/asf/trafodion/blob/6429a0c2/core/Makefile
----------------------------------------------------------------------
diff --git a/core/Makefile b/core/Makefile
index 19236dd..bbd0878 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -178,7 +178,7 @@ P_TYPE = $(shell uname -p)
ifeq ($(SQ_BUILD_TYPE),release)
RELEASE ?= 1
- SERVERTAR="$(PKG_PROD)_server-$(TRAFODION_VER)-${OS_TYPE}${OS_MAJOR}-${P_TYPE}-incubating.tar.gz"
+ SERVERTAR="$(PKG_PROD)_server-$(TRAFODION_VER)-${OS_TYPE}${OS_MAJOR}-${P_TYPE}.tar.gz"
else
RELEASE ?= devel
SERVERTAR="$(PKG_PROD)_server-$(TRAFODION_VER)-${OS_TYPE}${OS_MAJOR}-${P_TYPE}-debug.tar.gz"
http://git-wip-us.apache.org/repos/asf/trafodion/blob/6429a0c2/core/conn/Makefile
----------------------------------------------------------------------
diff --git a/core/conn/Makefile b/core/conn/Makefile
index 5197837..f853896 100644
--- a/core/conn/Makefile
+++ b/core/conn/Makefile
@@ -30,7 +30,7 @@ OS_MAJOR ?= $(shell lsb_release -rs | cut -f1 -d.)
P_TYPE = $(shell uname -p)
ifeq ($(SQ_BUILD_TYPE),release)
- CLIENT_TAR ?= ../../${DISTRIBUTION_DIR}/apache-trafodion_clients-$(TRAFODION_VER)-${OS_TYPE}${OS_MAJOR}-${P_TYPE}-incubating.tar.gz
+ CLIENT_TAR ?= ../../${DISTRIBUTION_DIR}/apache-trafodion_clients-$(TRAFODION_VER)-${OS_TYPE}${OS_MAJOR}-${P_TYPE}.tar.gz
else
CLIENT_TAR ?= ../../${DISTRIBUTION_DIR}/apache-trafodion_clients-$(TRAFODION_VER)-${OS_TYPE}${OS_MAJOR}-${P_TYPE}-debug.tar.gz
endif
@@ -39,7 +39,7 @@ endif
.PHONY: all
all: pkg-clients
-pkg-clients: clients/LICENSE clients/NOTICE clients/DISCLAIMER
+pkg-clients: clients/LICENSE clients/NOTICE
mkdir -p $$(dirname $(CLIENT_TAR))
tar -zcvf $(CLIENT_TAR) clients
@@ -52,9 +52,6 @@ clients/LICENSE: ../../licenses/LICENSE-clients
clients/NOTICE: ../../NOTICE
cp -f $? $@
-clients/DISCLAIMER: ../../DISCLAIMER
- cp -f $? $@
-
clean:
$(RM) -rf $(TRAF_HOME)/../conn/clients
$(RM) -f $(TRAF_HOME)/../conn/*.mf
http://git-wip-us.apache.org/repos/asf/trafodion/blob/6429a0c2/core/conn/jdbcT4/pom.xml
----------------------------------------------------------------------
diff --git a/core/conn/jdbcT4/pom.xml b/core/conn/jdbcT4/pom.xml
index 8f83ecf..1750c42 100644
--- a/core/conn/jdbcT4/pom.xml
+++ b/core/conn/jdbcT4/pom.xml
@@ -51,9 +51,9 @@
</distributionManagement>
<scm>
- <connection>scm:git:https://github.com/apache/incubator-trafodion.git</connection>
- <developerConnection>scm:git:https://github.com/apache/incubator-trafodion.git</developerConnection>
- <url>https://github.com/apache/incubator-trafodion.git</url>
+ <connection>scm:git:https://github.com/apache/trafodion.git</connection>
+ <developerConnection>scm:git:https://github.com/apache/trafodion.git</developerConnection>
+ <url>https://github.com/apache/trafodion.git</url>
<tag>HEAD</tag>
</scm>
http://git-wip-us.apache.org/repos/asf/trafodion/blob/6429a0c2/core/sqf/.gitignore
----------------------------------------------------------------------
diff --git a/core/sqf/.gitignore b/core/sqf/.gitignore
index 380ea87..a8425d5 100644
--- a/core/sqf/.gitignore
+++ b/core/sqf/.gitignore
@@ -68,8 +68,6 @@ Linux-x86_64/
# derived license
/LICENSE
/NOTICE
-/DISCLAIMER
-sqf/DISCLAIMER
# bundled component links
/dcs-*
http://git-wip-us.apache.org/repos/asf/trafodion/blob/6429a0c2/core/sqf/Makefile
----------------------------------------------------------------------
diff --git a/core/sqf/Makefile b/core/sqf/Makefile
index 6f4844b..2c1d952 100644
--- a/core/sqf/Makefile
+++ b/core/sqf/Makefile
@@ -268,7 +268,7 @@ OS_MAJOR ?= $(shell lsb_release -rs | cut -f1 -d.)
P_TYPE = $(shell uname -p)
ifeq ($(SQ_BUILD_TYPE),release)
- PKG_TYPE="server-$(TRAFODION_VER)-${OS_TYPE}${OS_MAJOR}-${P_TYPE}-incubating"
+ PKG_TYPE="server-$(TRAFODION_VER)-${OS_TYPE}${OS_MAJOR}-${P_TYPE}"
else
PKG_TYPE="server-$(TRAFODION_VER)-${OS_TYPE}${OS_MAJOR}-${P_TYPE}-debug"
endif
@@ -287,7 +287,7 @@ PKG_BIN_OBJS += sysinstall
PKG_BIN_OBJS += trafci
PKG_BIN_OBJS += samples
PKG_BIN_OBJS += export/limited-support-tools
-PKG_BIN_OBJS += LICENSE NOTICE DISCLAIMER
+PKG_BIN_OBJS += LICENSE NOTICE
PKG_BIN_OBJS += rest-${TRAFODION_VER} dcs-${TRAFODION_VER}
PKG_BIN_DIRS ?= sql export
@@ -328,12 +328,6 @@ 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/$@/$@ $@
@@ -352,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 DISCLAIMER rest-${TRAFODION_VER} dcs-${TRAFODION_VER}
+pkglist-symlinks: LICENSE NOTICE rest-${TRAFODION_VER} dcs-${TRAFODION_VER}
find $(PKG_BIN_OBJS) -lname '[^./]*' > $@
# Targets to tar/gzip the self installer
http://git-wip-us.apache.org/repos/asf/trafodion/blob/6429a0c2/core/trafodion.spec
----------------------------------------------------------------------
diff --git a/core/trafodion.spec b/core/trafodion.spec
index 34ceed2..a8db7fa 100644
--- a/core/trafodion.spec
+++ b/core/trafodion.spec
@@ -29,7 +29,7 @@ Group: Applications/Databases
Source0: %{name}-%{version}.tar.gz
BuildArch: %{_arch}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}
-URL: http://trafodion.incubator.apache.org
+URL: http://trafodion.apache.org
%define _binary_filedigest_algorithm 1
http://git-wip-us.apache.org/repos/asf/trafodion/blob/6429a0c2/docs/client_install/src/asciidoc/_chapters/preparation.adoc
----------------------------------------------------------------------
diff --git a/docs/client_install/src/asciidoc/_chapters/preparation.adoc b/docs/client_install/src/asciidoc/_chapters/preparation.adoc
index d042017..9b635b3 100644
--- a/docs/client_install/src/asciidoc/_chapters/preparation.adoc
+++ b/docs/client_install/src/asciidoc/_chapters/preparation.adoc
@@ -136,7 +136,7 @@ an `apache-trafodion-clients-*.tar` file.
. Verify content of the `clients` directory:
+
```
-DISCLAIMER JDBCT4.zip LICENSE NOTICE odb64_linux.tar.gz trafci.zip TRAF_ODBC_Linux_Driver_64.tar.gz
+JDBCT4.zip LICENSE NOTICE odb64_linux.tar.gz trafci.zip TRAF_ODBC_Linux_Driver_64.tar.gz
```
+
You use these files to install the different {project-name} clients.
@@ -168,7 +168,7 @@ $ wget <link to package>
$ tar -xzvf apache-trafodion_clients-*.tar.gz
$ cd clients
$ ls
-DISCLAIMER LICENSE odb64_linux.tar.gz TRAF_ODBC_Linux_Driver_64.tar.gz
+LICENSE odb64_linux.tar.gz TRAF_ODBC_Linux_Driver_64.tar.gz
JDBCT4.zip NOTICE trafci.zip
$
```
http://git-wip-us.apache.org/repos/asf/trafodion/blob/6429a0c2/docs/provisioning_guide/src/asciidoc/_chapters/quickstart.adoc
----------------------------------------------------------------------
diff --git a/docs/provisioning_guide/src/asciidoc/_chapters/quickstart.adoc b/docs/provisioning_guide/src/asciidoc/_chapters/quickstart.adoc
index c346ee3..e457d72 100644
--- a/docs/provisioning_guide/src/asciidoc/_chapters/quickstart.adoc
+++ b/docs/provisioning_guide/src/asciidoc/_chapters/quickstart.adoc
@@ -95,7 +95,7 @@ $ cd $HOME/trafodion-downloads
$ tar -zxf apache-trafodion-pyinstaller-2.2.0.tar.gz -C $HOME/trafodion-installer
$ cp -f apache-trafodion_server-2.2.0-RH-x86_64.tar.gz $HOME/trafodion-installer
$ ls $HOME/trafodion-installer/python-installer
-apache-trafodion_server-2.2.0-RH-x86_64.tar.gz db_install.py DISCLAIMER LICENSE prettytable.py scripts
+apache-trafodion_server-2.2.0-RH-x86_64.tar.gz db_install.py LICENSE prettytable.py scripts
configs db_uninstall.py discovery.py NOTICE README.md
$
```
http://git-wip-us.apache.org/repos/asf/trafodion/blob/6429a0c2/install/.gitignore
----------------------------------------------------------------------
diff --git a/install/.gitignore b/install/.gitignore
index 2aa6b05..aafac2b 100644
--- a/install/.gitignore
+++ b/install/.gitignore
@@ -1,7 +1,6 @@
installer-*.tar.gz
LICENSE
NOTICE
-DISCLAIMER
ambari-installer/RPMROOT
ambari-installer/traf-mpack.tar.gz
ambari-installer/mpack-install/repo
http://git-wip-us.apache.org/repos/asf/trafodion/blob/6429a0c2/install/Makefile
----------------------------------------------------------------------
diff --git a/install/Makefile b/install/Makefile
index c131f58..13bc734 100644
--- a/install/Makefile
+++ b/install/Makefile
@@ -14,7 +14,7 @@
# limitations under the License.
#
# @@@ END COPYRIGHT @@@
-RELEASE_VER ?= ${TRAFODION_VER}-incubating
+RELEASE_VER ?= ${TRAFODION_VER}
RELEASE_TYPE ?= $(shell echo $(TRAFODION_VER_PROD)| sed -e 's/ /-/g')
PYINSTALLER_TARNAME = $(shell echo ${RELEASE_TYPE}_pyinstaller-${RELEASE_VER}.tar.gz |tr '[A-Z]' '[a-z]')
@@ -26,7 +26,7 @@ pkg-ambari:
create-dir:
mkdir -p ../distribution
-pkg-pyinstaller: create-dir python-installer/LICENSE python-installer/NOTICE python-installer/DISCLAIMER
+pkg-pyinstaller: create-dir python-installer/LICENSE python-installer/NOTICE
tar czf ${PYINSTALLER_TARNAME} python-installer
mv ${PYINSTALLER_TARNAME} ../distribution
@@ -39,9 +39,6 @@ python-installer/LICENSE: ../licenses/LICENSE-pyinstall
python-installer/NOTICE: ../NOTICE
cp -f $? $@
-python-installer/DISCLAIMER: ../DISCLAIMER
- cp -f $? $@
-
version:
@echo "$(RELEASE_VER)"
http://git-wip-us.apache.org/repos/asf/trafodion/blob/6429a0c2/install/ambari-installer/Makefile
----------------------------------------------------------------------
diff --git a/install/ambari-installer/Makefile b/install/ambari-installer/Makefile
index 0c6e7c6..02819af 100644
--- a/install/ambari-installer/Makefile
+++ b/install/ambari-installer/Makefile
@@ -36,7 +36,7 @@ all: rpmbuild
# select trafodion version for given HDP stack
REPO_LIST= 2.1.0 $(TRAFODION_VER)
-$(SOURCEDIR)/ambari_rpm.tar.gz: mpack-install/LICENSE mpack-install/NOTICE mpack-install/DISCLAIMER repofiles traf-mpack/mpack.json
+$(SOURCEDIR)/ambari_rpm.tar.gz: mpack-install/LICENSE mpack-install/NOTICE repofiles traf-mpack/mpack.json
rm -rf $(RPMROOT)
mkdir -p $(SOURCEDIR)
tar czf $@ traf-mpack mpack-install
@@ -65,9 +65,6 @@ mpack-install/LICENSE: ../../licenses/LICENSE-install
mpack-install/NOTICE: ../../NOTICE
cp -f $? $@
-mpack-install/DISCLAIMER: ../../DISCLAIMER
- cp -f $? $@
-
rpmbuild: $(SOURCEDIR)/ambari_rpm.tar.gz
mkdir -p $(RPMDIR)
mkdir -p $(BUILDDIR)
@@ -89,7 +86,6 @@ clean:
rm -rf $(RPMROOT)
rm -rf mpack-install/LICENSE
rm -rf mpack-install/NOTICE
- rm -rf mpack-install/DISCLAIMER
rm -rf traf-mpack/custom-services/TRAFODION/*/repos
rm -f traf-mpack/custom-services/TRAFODION/*/metainfo.xml
rm -rf traf-mpack/mpack.json
http://git-wip-us.apache.org/repos/asf/trafodion/blob/6429a0c2/licenses/Makefile
----------------------------------------------------------------------
diff --git a/licenses/Makefile b/licenses/Makefile
index cc194b7..9004179 100644
--- a/licenses/Makefile
+++ b/licenses/Makefile
@@ -19,7 +19,7 @@
#
# @@@ END COPYRIGHT @@@
-all: LICENSE-src LICENSE-server LICENSE-pyinstall LICENSE-install LICENSE-clients NOTICE-server DISCLAIMER-server
+all: LICENSE-src LICENSE-server LICENSE-pyinstall LICENSE-install LICENSE-clients NOTICE-server
# All source code included in Trafodion source
LICENSE-src:
@@ -33,9 +33,6 @@ LICENSE-server:
NOTICE-server:
cat ../NOTICE note-server-bin > $@
-DISCLAIMER-server:
- cat ../DISCLAIMER > $@
-
LICENSE-install:
cat Apache > $@