trafodion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From arvi...@apache.org
Subject [7/9] incubator-trafodion git commit: Took care of versions and rebuilds
Date Thu, 12 Nov 2015 01:09:24 GMT
Took care of versions and rebuilds


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

Branch: refs/heads/master
Commit: 549d597cbd47a287f0e6914cdb1b988eddeba98b
Parents: 861dc63
Author: Anuradha Hegde <hegdean@dev02.trafodion.org>
Authored: Wed Nov 11 14:01:32 2015 +0000
Committer: Anuradha Hegde <hegdean@dev02.trafodion.org>
Committed: Wed Nov 11 14:01:32 2015 +0000

----------------------------------------------------------------------
 core/Makefile                                            |  7 ++-----
 core/conn/jdbc_type2/build.xml                           |  4 ++--
 .../main/java/org/trafodion/jdbc/t2/DriverInfo.java-tmpl |  4 ++--
 core/conn/jdbc_type4/build.xml                           |  6 +++---
 .../src/org/trafodion/jdbc/t4/T4DatabaseMetaData.java    | 11 +++++------
 .../conn/jdbc_type4/src/org/trafodion/jdbc/t4/Vproc.java |  2 ++
 core/conn/trafci/build.xml                               |  8 ++++----
 7 files changed, 20 insertions(+), 22 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/549d597c/core/Makefile
----------------------------------------------------------------------
diff --git a/core/Makefile b/core/Makefile
index 98a1888..50af249 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -67,10 +67,7 @@ dbsecurity: $(MPI_TARGET)
 foundation: sqroot dbsecurity $(MPI_TARGET) $(SEAMONSTER_TARGET)
 	cd sqf && $(MAKE) all
 
-conn-mf: verhdr
-	$(MY_SQROOT)/export/include/SCMBuildJava.sh 1.0.0 > $(MY_SQROOT)/../conn/trafodion-conn.jar.mf

-
-jdbc_jar: verhdr conn-mf
+jdbc_jar: verhdr 
 	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"
\
@@ -87,7 +84,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 conn-mf
+jdbc_type2_jar: verhdr foundation 
 	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/549d597c/core/conn/jdbc_type2/build.xml
----------------------------------------------------------------------
diff --git a/core/conn/jdbc_type2/build.xml b/core/conn/jdbc_type2/build.xml
index 8a16ead..4827799 100644
--- a/core/conn/jdbc_type2/build.xml
+++ b/core/conn/jdbc_type2/build.xml
@@ -41,13 +41,13 @@
 
     <target name="dist" depends="native">
        <mkdir dir="dist"/>
-       <property file="${my_sqroot}/../conn/trafodion-conn.jar.mf"/>
+       <property file="${my_sqroot}/export/include/SCMBuildMan.mf"/>
        <jar destfile="dist/jdbcT2.jar" compress="true">
            <fileset dir="classes"/>
            <manifest id="mf">
               <attribute name="Main-Class" value="JdbcT2"/>
               <attribute name="VPROC" value="${vproc.str}"/>
-              <attribute name="Implementation-Version-1" value="${Implementation-Version-1}"/>
+	      <attribute name="Implementation-Version-1" value="Version 1.0.0"/>
               <attribute name="Implementation-Version-2" value="${Implementation-Version-2}"/>
               <attribute name="Implementation-Version-3" value="${Implementation-Version-3}"/>
               <attribute name="Implementation-Version-4" value="${Implementation-Version-4}"/>

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/549d597c/core/conn/jdbc_type2/src/main/java/org/trafodion/jdbc/t2/DriverInfo.java-tmpl
----------------------------------------------------------------------
diff --git a/core/conn/jdbc_type2/src/main/java/org/trafodion/jdbc/t2/DriverInfo.java-tmpl
b/core/conn/jdbc_type2/src/main/java/org/trafodion/jdbc/t2/DriverInfo.java-tmpl
index b144631..1ea153b 100644
--- a/core/conn/jdbc_type2/src/main/java/org/trafodion/jdbc/t2/DriverInfo.java-tmpl
+++ b/core/conn/jdbc_type2/src/main/java/org/trafodion/jdbc/t2/DriverInfo.java-tmpl
@@ -25,8 +25,8 @@ class DriverInfo {
 
 	static final String driverVproc = "@@@@";
 	static final String driverProductVersion = "###";
-	static final int JdbcMajorVersion = 3;
-	static final int JdbcMinorVersion = 2;
+	static final int JdbcMajorVersion = 1;
+	static final int JdbcMinorVersion = 0;
 
 	DriverInfo() {
 	}

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/549d597c/core/conn/jdbc_type4/build.xml
----------------------------------------------------------------------
diff --git a/core/conn/jdbc_type4/build.xml b/core/conn/jdbc_type4/build.xml
index 1c53dfd..7a0a570 100755
--- a/core/conn/jdbc_type4/build.xml
+++ b/core/conn/jdbc_type4/build.xml
@@ -78,7 +78,7 @@
 	</target>
 
 	<!-- COMPILE -->
-	<target name="compile" depends="clean,init">
+	<target name="compile" depends="init">
 		<copy todir="${temp.src}">
 			<fileset dir="${src.src}">
 				<include name="**/*.java" />
@@ -96,7 +96,7 @@
 
 	<!-- LIB -->
 	<target name="lib" depends="compile">
-		<property file="${my_sqroot}/../conn/trafodion-conn.jar.mf"/>
+		<property file="${my_sqroot}/export/include/SCMBuildMan.mf"/>
 		<jar destfile="${jdbcT4.jar}" basedir="${temp.classes}">
 			<include name="**/*.class" />
 			<include name="**/*.properties" />
@@ -104,7 +104,7 @@
 			<manifest>
 				<attribute name="Main-Class" value="${vproc.class}" />
 				<attribute name="Vproc" value="${vproc.str}" />
-				<attribute name="Implementation-Version-1" value="${Implementation-Version-1}"/>
+				<attribute name="Implementation-Version-1" value="Version 1.0.0"/>
 				<attribute name="Implementation-Version-2" value="${Implementation-Version-2}"/>
 				<attribute name="Implementation-Version-3" value="${Implementation-Version-3}"/>
 				<attribute name="Implementation-Version-4" value="${Implementation-Version-4}"/>

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/549d597c/core/conn/jdbc_type4/src/org/trafodion/jdbc/t4/T4DatabaseMetaData.java
----------------------------------------------------------------------
diff --git a/core/conn/jdbc_type4/src/org/trafodion/jdbc/t4/T4DatabaseMetaData.java b/core/conn/jdbc_type4/src/org/trafodion/jdbc/t4/T4DatabaseMetaData.java
index 9522e5d..f700c4b 100644
--- a/core/conn/jdbc_type4/src/org/trafodion/jdbc/t4/T4DatabaseMetaData.java
+++ b/core/conn/jdbc_type4/src/org/trafodion/jdbc/t4/T4DatabaseMetaData.java
@@ -404,8 +404,7 @@ public class T4DatabaseMetaData extends HPT4Handle implements java.sql.DatabaseM
 		} catch (SQLException se) {
 			// ignore
 		}
-
-		return 1;
+                return Vproc.jdbcMajorVersion;
 	}
 
 	/*
@@ -432,7 +431,7 @@ public class T4DatabaseMetaData extends HPT4Handle implements java.sql.DatabaseM
 		} catch (SQLException se) {
 			// ignore
 		}
-		return 0;
+                return Vproc.jdbcMinorVersion;
 	}
 
 	/*
@@ -5440,7 +5439,7 @@ public class T4DatabaseMetaData extends HPT4Handle implements java.sql.DatabaseM
 			String temp = lf.format(lr);
 			connection_.props_.getLogWriter().println(temp);
 		}
-		return 3;
+                return Vproc.jdbcMajorVersion;
 	}
 
 	public int getJDBCMinorVersion() throws SQLException {
@@ -5457,8 +5456,8 @@ public class T4DatabaseMetaData extends HPT4Handle implements java.sql.DatabaseM
 			T4LogFormatter lf = new T4LogFormatter();
 			String temp = lf.format(lr);
 			connection_.props_.getLogWriter().println(temp);
-		}
-		return 1;
+		}               
+                return Vproc.jdbcMinorVersion;
 	}
 
 	public int getSQLStateType() throws SQLException {

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/549d597c/core/conn/jdbc_type4/src/org/trafodion/jdbc/t4/Vproc.java
----------------------------------------------------------------------
diff --git a/core/conn/jdbc_type4/src/org/trafodion/jdbc/t4/Vproc.java b/core/conn/jdbc_type4/src/org/trafodion/jdbc/t4/Vproc.java
index afa0779..9ab6727 100644
--- a/core/conn/jdbc_type4/src/org/trafodion/jdbc/t4/Vproc.java
+++ b/core/conn/jdbc_type4/src/org/trafodion/jdbc/t4/Vproc.java
@@ -23,6 +23,8 @@ package org.trafodion.jdbc.t4;
 
 public class Vproc {
 	private static final String vprocStr = "@@@@";
+	static final int jdbcMajorVersion = 1;
+	static final int jdbcMinorVersion = 0;
 
 	public static void main(String[] args) {
 		System.out.println(vprocStr);

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/549d597c/core/conn/trafci/build.xml
----------------------------------------------------------------------
diff --git a/core/conn/trafci/build.xml b/core/conn/trafci/build.xml
index 3556818..00ae9c4 100644
--- a/core/conn/trafci/build.xml
+++ b/core/conn/trafci/build.xml
@@ -79,7 +79,7 @@
        <delete file="${utils.dir}/trafci.cmd"/> 
     </target>
 
-    <target name="init" depends="clean">
+    <target name="init">
        <mkdir dir="${temp.dir}"/>
        <mkdir dir="${tempsrc.dir}"/>
        <mkdir dir="${tempinstall.dir}"/>
@@ -161,9 +161,9 @@
            <fileset dir="${samples.dir}" excludes="**/*.contrib*, *.db"/>
       </copy>
 
-      <jar destfile="${deploy.dir}/${installer.file}">
+      <jar destfile="${deploy.dir}/${installer.file}" update="true">
             <fileset dir="${installclasses.dir}" />
-            <fileset dir="${deploy.dir}" excludes="ciencr.sh, onplatform.sh" />
+            <fileset dir="${deploy.dir}" excludes="ciencr.sh, onplatform.sh ${installer.file}"
/>
             <manifest>
                <attribute name="Main-Class" value="Installer" />
             </manifest>
@@ -173,7 +173,7 @@
 
       <tar destfile="${deploy.dir}/${tar.file}" basedir="${deploy.dir}" includes="*.jar,README">
       </tar> 
-      <zip destfile="${client.dir}/${installer.zipfile}" basedir="${deploy.dir}" includes="*.jar,README"/>
+      <zip destfile="${client.dir}/${installer.zipfile}" basedir="${deploy.dir}" includes="*.jar,README"
update="yes"/>
     </target>
     <target name="dist" depends="deploy">
       <exec dir="${utils.dir}" executable="sh">


Mime
View raw message