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/05/27 16:41:06 UTC
[11/15] incubator-trafodion git commit: Fixed the dependency for
installer package
Fixed the dependency for installer 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/30093ab4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/30093ab4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/30093ab4
Branch: refs/heads/master
Commit: 30093ab44c35df3cde2825162cde2c7c431b798a
Parents: 0365574
Author: Anuradha Hegde <he...@edev05.esgyn.local>
Authored: Tue May 24 23:43:27 2016 +0000
Committer: Anuradha Hegde <he...@edev05.esgyn.local>
Committed: Tue May 24 23:43:27 2016 +0000
----------------------------------------------------------------------
core/Makefile | 4 ++--
install/Makefile | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/30093ab4/core/Makefile
----------------------------------------------------------------------
diff --git a/core/Makefile b/core/Makefile
index 63ce053..6ef3e9a 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -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
@@ -132,7 +132,7 @@ cleanall: sqroot eclipseclean cleantests
cd ../install && $(MAKE) clean
$(RM) -r ../${DISTRIBUTION_DIR}
-package-all: package pkg-sql-regress pkg-phx-tests pkg-dcs-tests pkg-installer
+package-all: package pkg-sql-regress pkg-phx-tests pkg-dcs-tests
pkg-product: all
cd sqf && $(MAKE) package 2>&1 | sed -e "s/$$/ ##(Package)/";exit $${PIPESTATUS[0]}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/30093ab4/install/Makefile
----------------------------------------------------------------------
diff --git a/install/Makefile b/install/Makefile
index cf14d65..bea8413 100644
--- a/install/Makefile
+++ b/install/Makefile
@@ -15,8 +15,8 @@
#
# @@@ END COPYRIGHT @@@
RELEASE_VER ?= $(shell echo $(TRAFODION_VER))
-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]')
+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