You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by ar...@apache.org on 2015/11/12 02:09:21 UTC
[4/9] incubator-trafodion git commit: [TRAFODION-1607] - Missing
version for jdbcT2 and jdbcT4 jar files
[TRAFODION-1607] - Missing version for jdbcT2 and jdbcT4 jar files
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/9b85014c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/9b85014c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/9b85014c
Branch: refs/heads/master
Commit: 9b85014c27abaca1de1ae3ae50a775d5a446e1b4
Parents: dafab4b
Author: Anuradha Hegde <he...@dev02.trafodion.org>
Authored: Sat Nov 7 00:31:16 2015 +0000
Committer: Anuradha Hegde <he...@dev02.trafodion.org>
Committed: Sat Nov 7 00:31:16 2015 +0000
----------------------------------------------------------------------
core/Makefile | 9 ++++++---
core/conn/.gitignore | 1 +
core/conn/Makefile | 1 +
core/conn/jdbc_type2/build.xml | 24 +-----------------------
core/conn/jdbc_type2/native/type2version.h | 2 +-
core/conn/jdbc_type4/build.xml | 3 +--
6 files changed, 11 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/9b85014c/core/Makefile
----------------------------------------------------------------------
diff --git a/core/Makefile b/core/Makefile
index ab62c49..98a1888 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -58,7 +58,7 @@ smstub: mpistub
echo "Building SM stub"
cd smstub/src; $(MAKE) all 2>&1 | sed -e "s/$$/ ##(SMSTUB)/" ; exit $${PIPESTATUS[0]}
-verhdr:
+verhdr:
cd sqf && $(MAKE) genverhdr
dbsecurity: $(MPI_TARGET)
@@ -67,7 +67,10 @@ dbsecurity: $(MPI_TARGET)
foundation: sqroot dbsecurity $(MPI_TARGET) $(SEAMONSTER_TARGET)
cd sqf && $(MAKE) all
-jdbc_jar: verhdr
+conn-mf: verhdr
+ $(MY_SQROOT)/export/include/SCMBuildJava.sh 1.0.0 > $(MY_SQROOT)/../conn/trafodion-conn.jar.mf
+
+jdbc_jar: verhdr conn-mf
cd conn/jdbc_type4 && $(ANT) deploy 2>&1 | sed -e "s/$$/ ##(JDBCT4)/";exit $${PIPESTATUS[0]}
$(MAVEN) install:install-file -Dfile=conn/jdbc_type4/lib/jdbcT4.jar \
-DgroupId=org.trafodion.jdbc.t4.T4Driver -DartifactId=t4driver -Dversion="$$TRAFODION_VER" \
@@ -84,7 +87,7 @@ ci: trafci
trafci: jdbc_jar
cd conn/trafci && $(ANT) dist 2>&1 | sed -e "s/$$/ ##(TRAFCI)/" ; exit $${PIPESTATUS[0]}
-jdbc_type2_jar: verhdr foundation
+jdbc_type2_jar: verhdr foundation conn-mf
cd conn/jdbc_type2 && $(ANT) 2>&1 | sed -e "s/$$/ ##(JDBC_TYPE2)/" ; exit $${PIPESTATUS[0]}
cd conn/jdbc_type2 && $(MAKE) 2>&1 | sed -e "s/$$/ ##(JDBC_TYPE2)/" ; exit $${PIPESTATUS[0]}
$(MAVEN) install:install-file -Dfile=conn/jdbc_type2/dist/jdbcT2.jar \
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/9b85014c/core/conn/.gitignore
----------------------------------------------------------------------
diff --git a/core/conn/.gitignore b/core/conn/.gitignore
index b4bbe8b..305c61f 100644
--- a/core/conn/.gitignore
+++ b/core/conn/.gitignore
@@ -1,2 +1,3 @@
clients/
odb/bin/
+trafodion-conn.jar.mf
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/9b85014c/core/conn/Makefile
----------------------------------------------------------------------
diff --git a/core/conn/Makefile b/core/conn/Makefile
index 468f0b7..fea299f 100644
--- a/core/conn/Makefile
+++ b/core/conn/Makefile
@@ -38,4 +38,5 @@ pkg-clients:
tar -zcvf $(CLIENT_TAR) clients
clean:
$(RM) -rf $(MY_SQROOT)/../conn/clients
+ $(RM) -f $(MY_SQROOT)/../conn/*.mf
$(RM) -f $(CLIENT_TAR)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/9b85014c/core/conn/jdbc_type2/build.xml
----------------------------------------------------------------------
diff --git a/core/conn/jdbc_type2/build.xml b/core/conn/jdbc_type2/build.xml
index 47da51f..8a16ead 100644
--- a/core/conn/jdbc_type2/build.xml
+++ b/core/conn/jdbc_type2/build.xml
@@ -41,8 +41,7 @@
<target name="dist" depends="native">
<mkdir dir="dist"/>
- <property file="${my_sqroot}/export/include/SCMBuildMan.mf"/>
- <property file="jdbct2.jar.version"/>
+ <property file="${my_sqroot}/../conn/trafodion-conn.jar.mf"/>
<jar destfile="dist/jdbcT2.jar" compress="true">
<fileset dir="classes"/>
<manifest id="mf">
@@ -78,13 +77,7 @@
</target>
<target name="compile" depends="init">
-<!--
- <copy file="${package.src}/DriverInfo.java-tmpl" tofile="${package.src}/DriverInfo.java" overwrite="yes"/>
--->
<copy todir="${dest.classes}" overwrite="yes" file="${dest.src}/SQLMXT2Messages_en.properties"/>
-<!--
- <replace file="${package.src}/DriverInfo.java" token="@@@" value="${vproc.str}" />
--->
<exec executable="/bin/sh">
<arg line="../doDrvInfo ${package.src}/DriverInfo.java ${package.src}/DriverInfo.java-tmpl ${vproc.str}"/>
</exec>
@@ -105,21 +98,6 @@
</target>
<target name="native" depends="jni" >
-<!--
- <copy file="${native.src}/Vproc.cpp-tmpl" tofile="${native.src}/Vproc.cpp" overwrite="yes"/>
- <copy file="${native.src}/Vproc.h-tmpl" tofile="${native.src}/Vproc.h" overwrite="yes"/>
-
- <replace file="${native.src}/Vproc.cpp" token="@@@" value="${vproc.str}" />
- <replace file="${native.src}/Vproc.h" token="@@@" value="${vproc.str}" />
--->
-<!--
- <exec dir="." executable="/usr/bin/make">
- <arg line="clean"/>
- </exec>
- <exec dir="." executable="/usr/bin/make">
- <arg line=""/>
- </exec>
--->
</target>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/9b85014c/core/conn/jdbc_type2/native/type2version.h
----------------------------------------------------------------------
diff --git a/core/conn/jdbc_type2/native/type2version.h b/core/conn/jdbc_type2/native/type2version.h
index 6bcddd6..afc1f1f 100644
--- a/core/conn/jdbc_type2/native/type2version.h
+++ b/core/conn/jdbc_type2/native/type2version.h
@@ -32,7 +32,7 @@
// component version for binaries
#define VERS_CV_MAJ 1
-#define VERS_CV_MIN 4
+#define VERS_CV_MIN 0
#define VERS_CV_UPD 0
DEFINE_EXTERN_COMP_DOVERS(type2)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/9b85014c/core/conn/jdbc_type4/build.xml
----------------------------------------------------------------------
diff --git a/core/conn/jdbc_type4/build.xml b/core/conn/jdbc_type4/build.xml
index 32b2c75..1c53dfd 100755
--- a/core/conn/jdbc_type4/build.xml
+++ b/core/conn/jdbc_type4/build.xml
@@ -96,8 +96,7 @@
<!-- LIB -->
<target name="lib" depends="compile">
- <property file="${my_sqroot}/export/include/SCMBuildMan.mf"/>
- <property file="jdbct4.jar.version"/>
+ <property file="${my_sqroot}/../conn/trafodion-conn.jar.mf"/>
<jar destfile="${jdbcT4.jar}" basedir="${temp.classes}">
<include name="**/*.class" />
<include name="**/*.properties" />