You are viewing a plain text version of this content. The canonical link for it is here.
Posted to codereview@trafodion.apache.org by hegdean <gi...@git.apache.org> on 2015/09/25 17:41:49 UTC
[GitHub] incubator-trafodion pull request: [TRAFODION-1498] install_local_h...
GitHub user hegdean opened a pull request:
https://github.com/apache/incubator-trafodion/pull/93
[TRAFODION-1498] install_local_hadoop fails on building DCS due to missing jdbcT4 jar file
Eliminated installing DCS, REST and tests from install_local_hadoop
Introduced 'env.sh' and 'makefile' at top level (incubator-trafodion)
Added a new script called install_traf_components to install DCS, REST and tests
Fixed issues that were seen with dcscheck script
Distribution directory created at top level for all tar files tar files
Fixed several minor issues
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/hegdean/incubator-trafodion wrk-brnch
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/incubator-trafodion/pull/93.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #93
----
commit 0b1fce255c4697db6400ea50b8ad36e7e99a843c
Author: Anuradha Hegde <he...@dev01.trafodion.org>
Date: 2015-09-17T06:18:17Z
-Eliminated installing trafodion components along with install_local_hadoop
-Added a new script to install trafodion components (install_traf_components)
-Modifed core 'makefile' so dcs gets built along with 'core'
-Introduced a new makefile at the top level
commit 67f8566f621bf9964745017d37663bb0132f6d3e
Author: Anuradha Hegde <an...@esgyn.com>
Date: 2015-09-17T16:22:53Z
Assigned ports to database manager
commit e2cfb6ef1c57cc9fcdc0799ba5384dc98eb98a4c
Author: Anuradha Hegde <an...@esgyn.com>
Date: 2015-09-18T17:09:17Z
fixed issues
commit e80eefc0e5a0ff9ed7a6332440bba08e6073355e
Author: Anuradha Hegde <an...@esgyn.com>
Date: 2015-09-21T03:09:28Z
Incorporated building eclipse project as part of the top level makefile
commit 29dc56e391d2e276c0e48ab423828f283b4cba9f
Author: Anuradha Hegde <an...@esgyn.com>
Date: 2015-09-23T05:04:56Z
additional fixes
commit 020e648139cef413ac954d80c63f01fa3a2f6384
Author: Anuradha Hegde <an...@esgyn.com>
Date: 2015-09-24T06:10:44Z
Incorporated review comments
commit c07c67116d0c1967a4b870d71c737ddd591decd3
Author: Anuradha Hegde <an...@esgyn.com>
Date: 2015-09-24T06:20:15Z
Included eclipse project for dcs
commit 8f5d14f45b6275dd3558e25bd252f0ac3b8ef158
Author: Anuradha Hegde <an...@esgyn.com>
Date: 2015-09-24T18:35:21Z
Additional cleanup
commit 1a4ca5dd6282ddc670950f2c4ad9825a1d31ad13
Author: Anuradha Hegde <an...@esgyn.com>
Date: 2015-09-25T03:32:01Z
Fixed the version for DCS and REST
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-trafodion pull request: [TRAFODION-1498] install_local_h...
Posted by arvind-narain <gi...@git.apache.org>.
Github user arvind-narain commented on a diff in the pull request:
https://github.com/apache/incubator-trafodion/pull/93#discussion_r40475794
--- Diff: dcs/genvers ---
@@ -0,0 +1,3 @@
+#!/bin/sh
--- End diff --
Will need copyright text
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-trafodion pull request: [TRAFODION-1498] install_local_h...
Posted by arvind-narain <gi...@git.apache.org>.
Github user arvind-narain commented on a diff in the pull request:
https://github.com/apache/incubator-trafodion/pull/93#discussion_r40475580
--- Diff: dcs/Makefile ---
@@ -0,0 +1,52 @@
+# @@@ START COPYRIGHT @@@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+# @@@ END COPYRIGHT @@@
+
+# This Makefile is just a thin shell to Maven, which is used to do the real build
+
+include ../core/macros.gmk #top level
+BLD_TRAFODION_DCS_TARNAME =dcs-$(TRAFODION_VER).tar.gz
+
+VFILE =trafodion-dcs.jar.versions
+GENVERS =./genvers
+
+.NOTPARALLEL: all
+
+all: build_all
+
+build_all:
+ $(MAKE) build_chk
+ echo "$(MAVEN) site package -DskipTests"
+ echo "### For full Maven output, see file build_dcs.log"
+ set -o pipefail && $(MAVEN) site package -DskipTests | tee build_dcs.log | grep --line-buffered -E -e '^\[[^WId]' -e '^\[INFO\] B[Uu][Ii][Ll][Dd]' -e 'to compile'
+ mkdir -p ../../${DISTRIBUTION_DIR}
--- End diff --
should be just one level up ../${DISTRIBUTION_DIR}
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-trafodion pull request: [TRAFODION-1498] install_local_h...
Posted by arvind-narain <gi...@git.apache.org>.
Github user arvind-narain commented on a diff in the pull request:
https://github.com/apache/incubator-trafodion/pull/93#discussion_r40475712
--- Diff: dcs/Makefile ---
@@ -0,0 +1,52 @@
+# @@@ START COPYRIGHT @@@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+# @@@ END COPYRIGHT @@@
+
+# This Makefile is just a thin shell to Maven, which is used to do the real build
+
+include ../core/macros.gmk #top level
+BLD_TRAFODION_DCS_TARNAME =dcs-$(TRAFODION_VER).tar.gz
+
+VFILE =trafodion-dcs.jar.versions
+GENVERS =./genvers
+
+.NOTPARALLEL: all
+
+all: build_all
+
+build_all:
+ $(MAKE) build_chk
+ echo "$(MAVEN) site package -DskipTests"
+ echo "### For full Maven output, see file build_dcs.log"
+ set -o pipefail && $(MAVEN) site package -DskipTests | tee build_dcs.log | grep --line-buffered -E -e '^\[[^WId]' -e '^\[INFO\] B[Uu][Ii][Ll][Dd]' -e 'to compile'
+ mkdir -p ../../${DISTRIBUTION_DIR}
+ cp -pf target/$(BLD_TRAFODION_DCS_TARNAME) ../${DISTRIBUTION_DIR}/
+ $(RM) $(VFILE)
+
+build_chk:
+ $(GENVERS) > $(VFILE)
+ @if [ $(GENVERS) -nt target/$(BLD_TRAFODION_DCS_TARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_TRAFODION_DCS_TARNAME); fi
+ @if [ $(MY_SQROOT)/export/include/SCMBuildStr.h -nt target/$(BLD_TRAFODION_DCS_TARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_TRAFODION_DCS_TARNAME); fi
+
+clean:
+ -$(MAVEN) clean | grep ERROR
+ $(RM) build_dcs.log
+ $(RM) $(VFILE)
+ $(RM) ../../${DISTRIBUTION_DIR}/$(BLD_TRAFODION_DCS_TARNAME)
--- End diff --
Same here .. $(RM) ../${DISTRIBUTION_DIR}/$..
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-trafodion pull request: [TRAFODION-1498] install_local_h...
Posted by svarnau <gi...@git.apache.org>.
Github user svarnau commented on a diff in the pull request:
https://github.com/apache/incubator-trafodion/pull/93#discussion_r40485147
--- Diff: dcs/Makefile ---
@@ -0,0 +1,52 @@
+# @@@ START COPYRIGHT @@@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+# @@@ END COPYRIGHT @@@
+
+# This Makefile is just a thin shell to Maven, which is used to do the real build
+
+include ../core/macros.gmk #top level
+BLD_TRAFODION_DCS_TARNAME =dcs-$(TRAFODION_VER).tar.gz
+
+VFILE =trafodion-dcs.jar.versions
+GENVERS =./genvers
+
+.NOTPARALLEL: all
+
+all: build_all
+
+build_all:
+ $(MAKE) build_chk
+ echo "$(MAVEN) site package -DskipTests"
+ echo "### For full Maven output, see file build_dcs.log"
+ set -o pipefail && $(MAVEN) site package -DskipTests | tee build_dcs.log | grep --line-buffered -E -e '^\[[^WId]' -e '^\[INFO\] B[Uu][Ii][Ll][Dd]' -e 'to compile'
+ mkdir -p ../${DISTRIBUTION_DIR}
+ cp -pf target/$(BLD_TRAFODION_DCS_TARNAME) ../${DISTRIBUTION_DIR}
--- End diff --
In other places, the tar file gets moved, instead of copied. Maybe we can save some space by moving?
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-trafodion pull request: [TRAFODION-1498] install_local_h...
Posted by svarnau <gi...@git.apache.org>.
Github user svarnau commented on a diff in the pull request:
https://github.com/apache/incubator-trafodion/pull/93#discussion_r40485542
--- Diff: core/rest/Makefile ---
@@ -35,6 +36,8 @@ build_all:
echo "$(MAVEN) site package -DskipTests"
echo "### For full Maven output, see file build_rest.log"
set -o pipefail && $(MAVEN) site package -DskipTests | tee build_rest.log | grep --line-buffered -E -e '^\[[^WId]' -e '^\[INFO\] B[Uu][Ii][Ll][Dd]' -e 'to compile'
+ mkdir -p ../../${DISTRIBUTION_DIR}
+ cp -pf target/$(BLD_TRAFODION_REST_TARNAME) ../../${DISTRIBUTION_DIR}/
--- End diff --
Same issue here. Copy leaves file in both old and new location. Would prefer one location or the other.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-trafodion pull request: [TRAFODION-1498] install_local_h...
Posted by arvind-narain <gi...@git.apache.org>.
Github user arvind-narain commented on a diff in the pull request:
https://github.com/apache/incubator-trafodion/pull/93#discussion_r40475868
--- Diff: env.sh ---
@@ -0,0 +1,3 @@
+cd core/sqf
--- End diff --
Copyright text needed in this new file
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-trafodion pull request: [TRAFODION-1498] install_local_h...
Posted by asfgit <gi...@git.apache.org>.
Github user asfgit closed the pull request at:
https://github.com/apache/incubator-trafodion/pull/93
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---