You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by rm...@apache.org on 2015/10/06 18:37:22 UTC

[1/2] incubator-trafodion git commit: Added copyright to template file Fixed the package name for the src tar file

Repository: incubator-trafodion
Updated Branches:
  refs/heads/master 64e085694 -> 934c27011


Added copyright to template file
Fixed the package name for the src tar file


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/7c7245e8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/7c7245e8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/7c7245e8

Branch: refs/heads/master
Commit: 7c7245e821b09dd2c1ae45c3a02912123fadc13a
Parents: e40bea1
Author: Anuradha Hegde <an...@esgyn.com>
Authored: Tue Oct 6 04:51:56 2015 +0000
Committer: Anuradha Hegde <an...@esgyn.com>
Committed: Tue Oct 6 04:51:56 2015 +0000

----------------------------------------------------------------------
 Makefile                               |  2 +-
 core/conn/trafci/build.xml             | 21 ++++++++++++---------
 core/conn/trafci/utils/trafci.cmd-tmpl | 20 ++++++++++++++++++++
 3 files changed, 33 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7c7245e8/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index 94572dd..a2df63f 100644
--- a/Makefile
+++ b/Makefile
@@ -39,7 +39,7 @@ package-all: package
 package-src:
 	@echo "Packaging source for $(TRAFODION_VER_PROD) $(TRAFODION_VER)"
 	mkdir -p distribution
-	git archive --format tar --prefix $(SRCDIR)-${TRAFODION_VER}/ HEAD | gzip > distribution/$(SRCDIR)-${TRAFODION_VER}.tgz
+	git archive --format tar --prefix $(SRCDIR)-${TRAFODION_VER}-incubating/ HEAD | gzip > distribution/$(SRCDIR)-${TRAFODION_VER}-incubating-src.tar.gz
 
 eclipse: 
 	@echo "Making eclipse projects for Trafodion components"

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7c7245e8/core/conn/trafci/build.xml
----------------------------------------------------------------------
diff --git a/core/conn/trafci/build.xml b/core/conn/trafci/build.xml
index 90d8806..3556818 100644
--- a/core/conn/trafci/build.xml
+++ b/core/conn/trafci/build.xml
@@ -76,6 +76,7 @@
     <target name="clean" depends="ProductVersion">
        <delete dir="${temp.dir}"/>
        <delete dir="${platform-install.dir}"/>
+       <delete file="${utils.dir}/trafci.cmd"/> 
     </target>
 
     <target name="init" depends="clean">
@@ -139,9 +140,19 @@
     </target>
 
     <target name="deploy" depends="build">
-       <copy todir="${deploy.dir}/bin">
+
+       <copy file="${utils.dir}/trafci.cmd-tmpl"
+           tofile="${utils.dir}/trafci.cmd"
+           overwrite="true">
+       </copy>
+
+       <replace file="${utils.dir}/trafci.cmd" token="@prodver@" value="${my_env.TRAFODION_VER_PROD}"/>
+       <replace file="${utils.dir}/trafci.cmd" token="@copyrighthdr@" value="${my_env.PRODUCT_COPYRIGHT_HEADER}"/>
+
+      <copy todir="${deploy.dir}/bin">
            <fileset dir="${utils.dir}" excludes="**/*.contrib*, ciencr.sh, onplatform.sh, README, trafci_install.sh, trafci.cmd-tmpl"/>
       </copy>
+
       <copy todir="${deploy.dir}/lib">
            <fileset dir="${lib.dir}" excludes="**/*.contrib*, *.db, **/*.db"/>
       </copy>
@@ -158,14 +169,6 @@
             </manifest>
       </jar>
 
-     <copy file="${utils.dir}/trafci.cmd-tmpl"
-           tofile="${utils.dir}/trafci.cmd"
-           overwrite="true">
-     </copy>
-
-     <replace file="${utils.dir}/trafci.cmd" token="@prodver@" value="${my_env.TRAFODION_VER_PROD}"/>
-     <replace file="${utils.dir}/trafci.cmd" token="@copyrighthdr@" value="${my_env.PRODUCT_COPYRIGHT_HEADER}"/>
-
       <copy file="${utils.dir}/README" todir="${deploy.dir}" overwrite="true" />
 
       <tar destfile="${deploy.dir}/${tar.file}" basedir="${deploy.dir}" includes="*.jar,README">

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7c7245e8/core/conn/trafci/utils/trafci.cmd-tmpl
----------------------------------------------------------------------
diff --git a/core/conn/trafci/utils/trafci.cmd-tmpl b/core/conn/trafci/utils/trafci.cmd-tmpl
index 578135f..aa195a6 100644
--- a/core/conn/trafci/utils/trafci.cmd-tmpl
+++ b/core/conn/trafci/utils/trafci.cmd-tmpl
@@ -1,4 +1,24 @@
 @echo off&Title Trafodion Command Interface
+REM @@@ START COPYRIGHT @@@
+REM
+REM Licensed to the Apache Software Foundation (ASF) under one
+REM or more contributor license agreements.  See the NOTICE file
+REM distributed with this work for additional information
+REM regarding copyright ownership.  The ASF licenses this file
+REM to you under the Apache License, Version 2.0 (the
+REM "License"); you may not use this file except in compliance
+REM with the License.  You may obtain a copy of the License at
+REM
+REM   http://www.apache.org/licenses/LICENSE-2.0
+REM
+REM Unless required by applicable law or agreed to in writing,
+REM software distributed under the License is distributed on an
+REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+REM KIND, either express or implied.  See the License for the
+REM specific language governing permissions and limitations
+REM under the License.
+REM
+REM @@@ END COPYRIGHT @@@
 
 CLS
 set MY_SQROOT=


[2/2] incubator-trafodion git commit: Merge [TRAFODION-1506] PR-106 changed packaging tar file name

Posted by rm...@apache.org.
Merge [TRAFODION-1506] PR-106 changed packaging tar file name


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/934c2701
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/934c2701
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/934c2701

Branch: refs/heads/master
Commit: 934c270117f4dfe002fca5f0d318ccf2d31208f9
Parents: 64e0856 7c7245e
Author: Roberta Marton <ro...@esgyn.com>
Authored: Tue Oct 6 16:15:47 2015 +0000
Committer: Roberta Marton <ro...@esgyn.com>
Committed: Tue Oct 6 16:15:47 2015 +0000

----------------------------------------------------------------------
 Makefile                               |  2 +-
 core/conn/trafci/build.xml             | 21 ++++++++++++---------
 core/conn/trafci/utils/trafci.cmd-tmpl | 20 ++++++++++++++++++++
 3 files changed, 33 insertions(+), 10 deletions(-)
----------------------------------------------------------------------