Attachment 646274 Details for Bug 873749 – update to v1.1.4

[patch] update to v1.1.4

0001-updating-tosqljet-1.1.4.patch (text/plain), 25.80 KB, created by Ismael Olea on 2012-11-16 10:13:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ismael Olea

Created: 2012-11-16 10:13:13 UTC

Size: 25.80 KB

patch

obsolete

>From 0f20de02b114cce362e2aad4c204a4d494f6b752 Mon Sep 17 00:00:00 2001
>From: Ismael Olea <ismael@olea.org>
>Date: Fri, 16 Nov 2012 11:10:17 +0100
>Subject: [PATCH] updating to sqljet-1.1.4
>
>---
> .gitignore                       |    1 +
> fetch-sqljet.sh                  |   10 -
> sources                          |    2 +-
> sqljet-1.0.4-suppressdupes.patch |   20 --
> sqljet-build.xml                 |  418 ++++++++++++++++++++++++++++++++++++++
> sqljet-javadoc.patch             |   27 ---
> sqljet-pom.xml                   |   27 +++
> sqljet.spec                      |   61 ++++--
> 8 files changed, 490 insertions(+), 76 deletions(-)
> delete mode 100644 fetch-sqljet.sh
> delete mode 100644 sqljet-1.0.4-suppressdupes.patch
> create mode 100644 sqljet-build.xml
> delete mode 100644 sqljet-javadoc.patch
> create mode 100644 sqljet-pom.xml
>
>diff --git a/.gitignore b/.gitignore
>index 4f31021..25f99af 100644
>--- a/.gitignore
>+++ b/.gitignore
>@@ -2,3 +2,4 @@ sqljet-1.0.1.tar.bz2
> sqljet-1.0.2.tar.bz2
> sqljet-1.0.3.tar.xz
> sqljet-1.0.4.tar.xz
>+/sqljet-1.1.4-src.zip
>diff --git a/fetch-sqljet.sh b/fetch-sqljet.sh
>deleted file mode 100644
>index 58ab6bf..0000000
>--- a/fetch-sqljet.sh
>+++ /dev/null
>@@ -1,10 +0,0 @@
>-#! /bin/sh
>-
>-version=1.0.4
>-mkdir fetch
>-cd fetch
>-svn export http://svn.sqljet.com/repos/sqljet/tags/$version sqljet-$version
>-
>-tar cfa sqljet-$version.tar.xz sqljet-$version
>-
>-cd ..
>diff --git a/sources b/sources
>index 26eb118..b272511 100644
>--- a/sources
>+++ b/sources
>@@ -1 +1 @@
>-47a624f097d7bd8fbea147ee0b6fa353  sqljet-1.0.4.tar.xz
>+db7d958481a02444b7baa97c585c81f2  sqljet-1.1.4-src.zip
>diff --git a/sqljet-1.0.4-suppressdupes.patch b/sqljet-1.0.4-suppressdupes.patch
>deleted file mode 100644
>index 316367c..0000000
>--- a/sqljet-1.0.4-suppressdupes.patch
>+++ /dev/null
>@@ -1,20 +0,0 @@
>-diff -up sqljet-1.0.4/build.xml~ sqljet-1.0.4/build.xml
>---- sqljet-1.0.4/build.xml~	2012-07-12 00:06:14.540711212 +0300
>-+++ sqljet-1.0.4/build.xml	2012-07-12 00:25:28.950609099 +0300
>-@@ -55,6 +55,7 @@
>-             </classpath>
>-         </java>
>-     	
>-+        
>-     </target>
>- 
>-     <target name="compile" depends="antlr">
>diff --git a/sqljet-build.xml b/sqljet-build.xml
>new file mode 100644
>index 0000000..548b8ca
>--- /dev/null
>+++ b/sqljet-build.xml
>@@ -0,0 +1,418 @@
>+<?xml version="1.0"?>
>+
>+<project name="sqljet" default="deploy" xmlns:artifact="antlib:org.apache.maven.artifact.ant">
>+  <property file="sqljet.build.properties"/>
>+  <property name="build.vcs.number.1" value="local"/>
>+  <property name="build.number" value="${sqljet.version.major}.${sqljet.version.minor}.${sqljet.version.micro}.b${build.vcs.number.1}"/>
>+  <property name="version.number" value="${sqljet.version.major}.${sqljet.version.minor}.${sqljet.version.micro}"/>
>+  <target name="init-build.number" if="build.vcs.number.1">
>+    <mkdir dir="build"/>
>+    <copy file="sqljet.build.properties" tofile="build/sqljet.build.properties"/>
>+    <replace file="build/sqljet.build.properties" token="local" value="${build.vcs.number.1}"/>
>+  </target>
>+  <target name="clean">
>+    
>+    <mkdir dir="build"/>
>+    <mkdir dir="sqljet/bin"/>
>+    <mkdir dir="sqljet-test/bin"/>
>+    <mkdir dir="sqljet-examples/browser/bin"/>
>+    <delete verbose="false" includeemptydirs="true" failonerror="true">
>+      <fileset dir="build">
>+        <include name="**/**"/>
>+      </fileset>
>+    </delete>
>+    <delete verbose="false" includeemptydirs="true" failonerror="false">
>+      <fileset dir="sqljet/bin">
>+        <include name="**/**"/>
>+      </fileset>
>+      <fileset dir="sqljet-test/bin">
>+        <include name="**/**"/>
>+      </fileset>
>+      <fileset dir="sqljet-examples/browser/bin">
>+        <include name="**/**"/>
>+      </fileset>
>+      <fileset dir="sqljet-examples/simple/bin">
>+        <include name="**/**"/>
>+      </fileset>
>+    </delete>
>+  </target>
>+  <target name="antlr">
>+    <java classname="org.antlr.Tool" fork="true" failonerror="true">
>+      <arg value="-report"/>
>+      <arg value="-fo"/>
>+      <arg value="sqljet/src/main/antlr/org/tmatesoft/sqljet/core/internal/lang"/>
>+      <arg value="sqljet/src/main/antlr/org/tmatesoft/sqljet/core/internal/lang/Sql.g"/>
>+      <classpath>
>+        <pathelement location="/usr/share/java/antlr3.jar"/>
>+        <pathelement location="/usr/share/java/antlr3-runtime.jar"/>
>+        <pathelement location="/usr/share/java/stringtemplate4.jar"/>
>+        <pathelement path="${java.class.path}"/>
>+      </classpath>
>+    </java>
>+    
>+    
>+  </target>
>+  <target name="compile" depends="antlr, manifest">
>+    <mkdir dir="sqljet/bin"/>
>+    <mkdir dir="sqljet-test/bin"/>
>+    <javac destdir="sqljet/bin" srcdir="sqljet/src/main/java" debug="true" verbose="no">
>+      <compilerarg value="-O"/>
>+      <classpath>
>+        <pathelement location="/usr/share/java/antlr3-runtime.jar"/>
>+      </classpath>
>+    </javac>
>+    <javac destdir="sqljet-test/bin" srcdir="sqljet/src/test/" debug="true" verbose="no">
>+      <compilerarg value="-O"/>
>+      <classpath path="sqljet/bin"/>
>+      <classpath>
>+        <fileset dir="sqljet-test/bin" includes="*.jar"/>
>+        <pathelement location="/usr/share/java/junit.jar"/>
>+        <pathelement location="/usr/share/java/easymock2.jar"/>
>+        <pathelement location="/usr/share/java/antlr3-runtime.jar"/>
>+      </classpath>
>+    </javac>
>+  </target>
>+  <target name="sqljet-browser" depends="compile, manifest" description="compiles sqljet browser">
>+    <mkdir dir="sqljet-browser/bin"/>
>+    <javac destdir="sqljet-browser/bin" srcdir="sqljet-browser/src"  verbose="no" debug="true">
>+      <compilerarg value="-O"/>
>+      <classpath>
>+        <pathelement location="/usr/share/java/netbeans/swing-outline.jar"/>
>+      </classpath>
>+      <classpath path="sqljet/bin"/>
>+    </javac>
>+  </target>
>+  <target name="generate-key">
>+    <mkdir dir="build"/>
>+    <genkey alias="tmate" storepass="secret" keystore="build/keystore">
>+      <dname>
>+        <param name="CN" value="TMate Software"/>
>+        <param name="C" value="CZ"/>
>+      </dname>
>+    </genkey>
>+  </target>
>+  <target name="javadoc" description="Build the javadocs for the source code.">
>+    <mkdir dir="build"/>
>+    <mkdir dir="build/javadoc"/>
>+    <path id="doc.classpath">
>+      <pathelement location="/usr/share/java/antlr3-runtime.jar"/>
>+    </path>
>+    <javadoc destdir="build/javadoc" packagenames="org.tmatesoft.sqljet" 
>+	sourcepath="sqljet/src"  verbose="no" classpathref="doc.classpath" 
>+	overview="sqljet/src/overview.html" failonerror="false">
>+      <packageset dir="sqljet/src/main/java" defaultexcludes="yes">
>+        <exclude name="**/test/**"/>
>+      </packageset>
>+      <header><![CDATA[<a target="_top" href="http://sqljet.com/">SQLJet&nbsp;Home<a/>]]></header>
>+      <bottom><![CDATA[Copyright &#169; 2009-2010 TMate Software Ltd. All Rights Reserved.]]></bottom>
>+    </javadoc>
>+    <zip destfile="build/sqljet.${build.number}.doc.zip">
>+      <zipfileset dir="build/javadoc" prefix="javadoc">
>+        <exclude name="**/.*"/>
>+        <exclude name=".*"/>
>+      </zipfileset>
>+    </zip>
>+  </target>
>+  <target name="manifest">
>+    <manifest file="manifest.mf">
>+      <attribute name="Built-By" value="TMate Software"/>
>+      <attribute name="Main-Class" value="org.tmatesoft.sqljet.browser.DBBrowser"/>
>+      <attribute name="Implementation-Title" value="SQLJet Database Browser"/>
>+      <attribute name="Implementation-Version" value="${build.number}"/>
>+      <attribute name="Implementation-Vendor" value="TMate Software"/>
>+    </manifest>
>+  </target>
>+  <target name="pom">
>+    <replace file="pom.xml" token="%VSQLJET%" value="${build.number}"/>
>+    <replace file="pom.xml" token="%VANTLR%" value="${antlr.version}"/>
>+  </target>
>+  <target name="osgi" depends="manifest">
>+    <mkdir dir="sqljet-osgi/bin"/>
>+    <copy file="manifest.mf" tofile="build/osgi-manifest"/>
>+    <replace file="build/osgi-manifest" token="%sqljet.version%" value="${build.number}"/>
>+    <replace file="build/osgi-manifest" token="%antlr.version%" value="${antlr.version}"/>
>+    <javac destdir="sqljet-osgi/bin" srcdir="sqljet/src/test/" debug="true">
>+      <compilerarg value="-O"/>
>+      <classpath path="sqljet/bin"/>
>+      <classpath>
>+        <fileset dir="sqljet-test/bin" includes="*.jar"/>
>+        <pathelement location="/usr/share/java/junit.jar"/>
>+        <pathelement location="/usr/share/java/easymock2.jar"/>
>+        <pathelement location="/usr/share/java/antlr3-runtime.jar"/>
>+      </classpath>
>+    </javac>
>+    <jar destfile="build/org.tmatesoft.sqljet_${build.number}.jar" manifest="build/osgi-manifest">
>+      <fileset dir="sqljet-osgi/bin">
>+        <include name="**/**"/>
>+      </fileset>
>+      <fileset dir="build">
>+        <include name="sqljet.build.properties"/>
>+      </fileset>
>+      <fileset dir="/usr/share/java/">
>+        <include name="antlr3-runtime.jar"/>
>+        <include name="ANTLR-LICENSE"/>
>+      </fileset>
>+      <zipfileset dir="" prefix="META-INF">
>+        <include name="CHANGES.txt"/>
>+        <include name="README.txt"/>
>+        <include name="LICENSE.txt"/>
>+      </zipfileset>
>+    </jar>
>+    <delete file="build/osgi-manifest"/>
>+  </target>
>+  <target name="tarball">
>+    <tar destfile="build/sqljet.${build.number}.tar.gz" compression="gzip">
>+      <fileset dir="">
>+        <include name="**/**"/>
>+        <exclude name="**/.svn"/>
>+        <exclude name="build/**"/>
>+        <exclude name="sqljet/bin/**"/>
>+        <exclude name="sqljet-test/bin/**"/>
>+        <exclude name="sqljet-examples/simple/bin/**"/>
>+        <exclude name="sqljet-examples/browser/bin/**"/>
>+      </fileset>
>+    </tar>
>+  </target>
>+  <target name="deploy" depends="clean, init-build.number, compile, sqljet-browser, generate-key, osgi, tarball, javadoc">
>+    <mkdir dir="build"/>
>+    <jar destfile="build/sqljet.${build.number}.jar">
>+      <fileset dir="sqljet/bin">
>+        <include name="**/**"/>
>+      </fileset>
>+      <fileset dir="build">
>+        <include name="sqljet.build.properties"/>
>+      </fileset>
>+    </jar>
>+    <zip destfile="build/sqljet.${build.number}.src.zip">
>+      <zipfileset dir="sqljet/src" prefix="src">
>+        <exclude name="**/.*"/>
>+        <exclude name=".*"/>
>+      </zipfileset>
>+      <zipfileset dir="">
>+        <include name="COPYING"/>
>+        <include name="README.txt"/>
>+        <include name="CHANGES"/>
>+      </zipfileset>
>+    </zip>
>+    
>+    <jar destfile="build/sqljet-browser.${build.number}.jar" manifest="manifest.mf">
>+      <fileset dir="sqljet-examples/browser/bin">
>+        <include name="**/**"/>
>+      </fileset>
>+      <zipfileset src="sqljet-examples/browser/lib/org-netbeans-swing-outline.jar">
>+        <include name="**/**"/>
>+      </zipfileset>
>+    </jar>
>+    <delete file="build/MANIFEST.MF"/>
>+    <mkdir dir="build/lib"/>
>+    <copy file="lib/antlr-runtime-${antlr.version}.jar" tofile="build/lib/antlr-runtime-${antlr.version}-${build.number}.jar"/>
>+    <copy file="lib/ANTLR-LICENSE" tofile="build/lib/ANTLR-LICENSE"/>
>+    <copy todir="build">
>+      <fileset dir="sqljet-examples/browser">
>+        <include name="browser.jnlp"/>
>+      </fileset>
>+    </copy>
>+    <replace token="%version%" file="build/browser.jnlp" value="${build.number}">
>+		</replace>
>+    <signjar alias="tmate" keystore="build/keystore" storepass="secret" lazy="true">
>+      <path>
>+        <fileset dir="build">
>+          <exclude name="org.tmatesoft.sqljet_${build.number}.jar"/>
>+          <include name="**/*.jar"/>
>+        </fileset>
>+      </path>
>+    </signjar>
>+    <zip destfile="build/sqljet-browser.${build.number}.src.zip">
>+      <zipfileset dir="sqljet-examples/browser/src" prefix="src">
>+        <exclude name="**/.*"/>
>+        <exclude name=".*"/>
>+      </zipfileset>
>+      <zipfileset dir="">
>+        <include name="COPYING"/>
>+      </zipfileset>
>+    </zip>
>+    <zip destfile="build/sqljet-browser.${build.number}.jnlp.zip">
>+      <zipfileset dir="build" prefix="browser">
>+        <include name="sqljet.${build.number}.jar"/>
>+        <include name="sqljet-browser.${build.number}.jar"/>
>+      </zipfileset>
>+      <zipfileset dir="build/lib" prefix="browser">
>+        <include name="**/**"/>
>+      </zipfileset>
>+      <zipfileset dir="build" prefix="">
>+        <include name="browser.jnlp"/>
>+      </zipfileset>
>+    </zip>
>+    <zip destfile="build/sqljet.${build.number}.zip">
>+      <zipfileset dir="build" prefix="sqljet.${build.number}">
>+        <include name="sqljet.${build.number}.jar"/>
>+        <include name="sqljet.${build.number}.src.zip"/>
>+        <include name="sqljet.${build.number}.doc.zip"/>
>+        <include name="sqljet-browser.${build.number}.jar"/>
>+        <include name="sqljet-browser.${build.number}.src.zip"/>
>+      </zipfileset>
>+      <zipfileset dir="lib" prefix="sqljet.${build.number}">
>+        <include name="**/**"/>
>+      </zipfileset>
>+      <zipfileset dir="" prefix="sqljet.${build.number}">
>+        <include name="COPYING"/>
>+        <include name="README.txt"/>
>+        <include name="CHANGES"/>
>+      </zipfileset>
>+    </zip>
>+    <delete file="build/sqljet.${build.number}.src.zip"/>
>+    <delete file="build/sqljet.${build.number}.jar"/>
>+    <delete file="build/sqljet-browser.${build.number}.src.zip"/>
>+    <delete file="build/sqljet-browser.${build.number}.jar"/>
>+    <delete file="build/sqljet.build.properties"/>
>+    <delete file="build/keystore"/>
>+    <delete file="build/browser.jnlp"/>
>+    <delete dir="build/lib" includeemptydirs="true">
>+      <include name="**/**"/>
>+    </delete>
>+    <delete file="build/sqljet.${build.number}.doc.zip">
>+		</delete>
>+    <delete dir="build/javadoc" includeemptydirs="true">
>+      <include name="**/**"/>
>+    </delete>
>+  </target>
>+  <target name="deploy-maven" depends="clean,compile">
>+    <condition property="repo.path" value="${maven.repo.path}" else="/home/rsync/m2repo">
>+      <isset property="maven.repo.path"/>
>+    </condition>
>+    <path id="maven-ant-tasks.classpath" path="tools/maven-ant-tasks-2.0.10.jar"/>
>+    <typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="antlib:org.apache.maven.artifact.ant" classpathref="maven-ant-tasks.classpath"/>
>+    <mkdir dir="build/maven-deploy"/>
>+    <mkdir dir="build/maven-deploy/org.tmatesoft.sqljet-${version.number}"/>
>+    <jar destfile="build/maven-deploy/org.tmatesoft.sqljet-${version.number}/sqljet-${version.number}.jar">
>+      <fileset dir="sqljet/bin">
>+        <include name="**/**"/>
>+      </fileset>
>+      <fileset dir="build">
>+        <include name="sqljet.build.properties"/>
>+      </fileset>
>+      <fileset dir="">
>+        <include name="COPYING"/>
>+      </fileset>
>+    </jar>
>+    <jar destfile="build/maven-deploy/org.tmatesoft.sqljet-${version.number}/sqljet-${version.number}-sources.jar">
>+      <fileset dir="">
>+        <include name="README.txt"/>
>+        <include name="CHANGES"/>
>+        <include name="COPYING"/>
>+      </fileset>
>+      <fileset dir="sqljet/src">
>+        <exclude name=".svn"/>
>+        <exclude name=".svn/**"/>
>+      </fileset>
>+      <fileset dir="build">
>+        <include name="sqljet.build.properties"/>
>+      </fileset>
>+    </jar>
>+    <copy file="pom.xml" tofile="build/maven-deploy/org.tmatesoft.sqljet-${version.number}/pom.xml"/>
>+    <replace token="%sqljet.version%" value="${version.number}" file="build/maven-deploy/org.tmatesoft.sqljet-${version.number}/pom.xml"/>
>+    <replace token="%antlr.version%" value="${antlr.version}" file="build/maven-deploy/org.tmatesoft.sqljet-${version.number}/pom.xml"/>
>+    <artifact:pom id="sqljet.pom" file="build/maven-deploy/org.tmatesoft.sqljet-${version.number}/pom.xml"/>
>+    <mkdir dir="build/maven-deploy/m2repo"/>
>+    <artifact:deploy file="build/maven-deploy/org.tmatesoft.sqljet-${version.number}/sqljet-${version.number}.jar">
>+      <attach file="build/maven-deploy/org.tmatesoft.sqljet-${version.number}/sqljet-${version.number}-sources.jar" classifier="sources"/>
>+      <remoteRepository url="file://${repo.path}"/>
>+      <pom refid="sqljet.pom"/>
>+    </artifact:deploy>
>+    <delete dir="build/maven-deploy">
>+      <include name="org.tmatesoft.sqljet-${version.number}/**"/>
>+    </delete>
>+    <delete dir="build/maven-deploy/org.tmatesoft.sqljet-${version.number}"/>
>+  </target>
>+  <target name="test" depends="compile">
>+    <echoproperties prefix="os."/>
>+    <echoproperties prefix="java.vm."/>
>+
>+    <junit>
>+      <jvmarg value="-ea"/>
>+      <jvmarg value="-server"/>
>+      <formatter type="plain" usefile="false"/>
>+      <classpath path="sqljet/bin"/>
>+      <classpath path="sqljet-test/bin"/>
>+      <classpath>
>+        <pathelement location="/usr/share/java/junit.jar"/>
>+        <pathelement location="/usr/share/java/easymock2.jar"/>
>+        <pathelement location="/usr/share/java/antlr3-runtime.jar"/>
>+      </classpath>
>+
>+      <batchtest fork="yes" todir="sqljet-test/bin">
>+        <fileset dir="sqljet/src">
>+          <include name="**/*Test*.java"/>
>+          <exclude name="**/*Abstract*.java"/>
>+          <exclude name="**/*Mock*.java"/>
>+        </fileset>
>+      </batchtest>
>+      <sysproperty key="SQLJET_FILE_LOG" value="false"/>
>+      <sysproperty key="SQLJET_FILE_PERFORMANCE_LOG" value="false"/>
>+      <sysproperty key="SQLJET_PAGER_LOG" value="false"/>
>+      <sysproperty key="SQLJET_TESTS_LOGGING" value="false"/>
>+      <sysproperty key="SqlJetBtreeTableTest.DELETE_COPY" value="true"/>
>+      <sysproperty key="SqlJetBtreeTableTest.REPEATS_COUNT" value="100"/>
>+    </junit>
>+  </target>
>+  <target name="test-stress" depends="deploy">
>+    <echoproperties prefix="os."/>
>+    <echoproperties prefix="java.vm."/>
>+    <junit>
>+      <jvmarg value="-ea"/>
>+      <jvmarg value="-server"/>
>+      <formatter type="plain" usefile="false"/>
>+      <classpath path="sqljet/bin"/>
>+      <classpath path="sqljet-test/bin"/>
>+      <classpath>
>+        <fileset dir="sqljet-test/lib" includes="*.jar"/>
>+        <fileset dir="lib" includes="*.jar"/>
>+      </classpath>
>+      <batchtest fork="yes" todir="sqljet-test/bin">
>+        <fileset dir="sqljet-test/src">
>+          <include name="**/*Stress*.java"/>
>+          <exclude name="**/*Abstract*.java"/>
>+          <exclude name="**/*Mock*.java"/>
>+        </fileset>
>+      </batchtest>
>+      <sysproperty key="SQLJET_FILE_LOG" value="false"/>
>+      <sysproperty key="SQLJET_FILE_PERFORMANCE_LOG" value="false"/>
>+      <sysproperty key="SQLJET_PAGER_LOG" value="false"/>
>+      <sysproperty key="SQLJET_TESTS_LOGGING" value="false"/>
>+      <sysproperty key="SqlJetBtreeTableTest.DELETE_COPY" value="true"/>
>+      <sysproperty key="SqlJetBtreeTableTest.REPEATS_COUNT" value="100"/>
>+    </junit>
>+  </target>
>+  <target name="jars" depends="clean, manifest, compile, sqljet-browser">
>+    <mkdir dir="build"/>
>+    <antcall target="init-build.number"/>
>+    <jar destfile="build/sqljet.jar" manifest="manifest.mf">
>+      <fileset dir="sqljet/bin">
>+        <include name="**/**"/>
>+      </fileset>
>+      <fileset dir="build">
>+        <include name="sqljet.build.properties"/>
>+      </fileset>
>+    </jar>
>+    <jar destfile="build/sqljet-browser.jar">
>+      <fileset dir="sqljet-browser/bin">
>+        <include name="**/**"/>
>+      </fileset>
>+    </jar>
>+  </target>
>+</project>
>diff --git a/sqljet-javadoc.patch b/sqljet-javadoc.patch
>deleted file mode 100644
>index 814a5dd..0000000
>--- a/sqljet-javadoc.patch
>+++ /dev/null
>@@ -1,27 +0,0 @@
>---- build.xml.orig	2009-11-18 03:30:24.000000000 +0200
>-+++ build.xml	2009-11-26 13:12:39.562877717 +0200
>-@@ -340,4 +340,23 @@ public class SqlParser</replacevalue>
>- 			<sysproperty key="SqlJetBtreeTableTest.REPEATS_COUNT" value="100" />
>- 		</junit>
>- 	</target>
>-+ <target name="jars" depends="clean, compile, compile-examples">
>-+        <mkdir dir="build" />
>-+    	
>-+    	<antcall target="init-build.number"/>
>-+
>-+	<jar destfile="build/sqljet.jar">
>-+            <fileset dir="sqljet/bin">
>-+                <include name="**/**"/>
>-+            </fileset>
>-+            <fileset dir="build">
>-+                <include name="sqljet.build.properties"/>
>-+            </fileset>
>-+        </jar>
>-+	<jar destfile="build/sqljet-browser.jar" >
>-+            <fileset dir="sqljet-examples/browser/bin">
>-+                <include name="**/**"/>
>-+            </fileset>
>-+        </jar>
>-+        </target>
>- </project>
>-\ No newline at end of file
>diff --git a/sqljet-pom.xml b/sqljet-pom.xml
>new file mode 100644
>index 0000000..1a1a026
>--- /dev/null
>+++ b/sqljet-pom.xml
>@@ -0,0 +1,27 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+<project>
>+  <modelVersion>4.0.0</modelVersion>
>+  <groupId>org.tmatesoft.sqljet</groupId>
>+  <artifactId>sqljet</artifactId>
>+  <packaging>jar</packaging>
>+  <version>%VSQLJET%</version>
>+  <name>SQLJet</name>
>+  <description>A pure Java library for managing SQLite databases</description>
>+  <url>http://sqljet.com/</url>
>+  <licenses>
>+    <license>
>+      <url>http://sqljet.com/</url>
>+    </license>
>+  </licenses>
>+  <distributionManagement>
>+    <downloadUrl>http://sqljet.com/</downloadUrl>
>+  </distributionManagement>
>+  <dependencies>
>+    <dependency>
>+      <groupId>org.antlr</groupId>
>+      <artifactId>antlr-runtime</artifactId>
>+      <version>%VANTLR%</version>
>+      <optional>false</optional>
>+    </dependency>
>+  </dependencies>
>+</project>
>\ No newline at end of file
>diff --git a/sqljet.spec b/sqljet.spec
>index ace1513..4632f0e 100644
>--- a/sqljet.spec
>+++ b/sqljet.spec
>@@ -1,18 +1,17 @@
> Name:           sqljet
>-Version:        1.0.4
>-Release:        8%{?dist}
>+Version:        1.1.4
>+Release:        3%{?dist}
> Summary:        Pure Java SQLite
> 
> Group:          Development/Libraries
> License:        GPLv2
> URL:            http://sqljet.com/
>-# Obtained by sh fetch-sqljet.sh
>-Source0:        %{name}-%{version}.tar.xz
>-Source1:        fetch-sqljet.sh
>+Source0:        http://sqljet.com/files/%{name}-%{version}-src.zip
>+
> Source2:        %{name}-browser.sh
> Source3:        %{name}-browser.desktop
>-Patch0:         %{name}-javadoc.patch
>-Patch1:         %{name}-1.0.4-suppressdupes.patch
>+Source4:        %{name}-build.xml
>+Source5:        %{name}-pom.xml
> 
> BuildRequires:  ant
> BuildRequires:  antlr
>@@ -23,6 +22,7 @@ BuildRequires:  netbeans-platform
> BuildRequires:  java-devel >= 1.6
> BuildRequires:  junit4
> BuildRequires:  desktop-file-utils
>+BuildRequires:  stringtemplate4
> Requires:       antlr3-java
> BuildArch: noarch
> 
>@@ -48,26 +48,32 @@ Requires:       jpackage-utils
> %description    javadoc
> API documentation for %{name}.
> 
>+
> %prep
>-%setup -q
>-%patch0
>-%patch1 -p1
>+%setup -q -n %{name}-%{version}
> 
> find $ -name '*.class' -o -name '*.jar' $ -delete
> 
>-pushd sqljet-examples/browser/lib
>-ln -s %{_javadir}/netbeans/swing-outline.jar org-netbeans-swing-outline.jar
>-popd
>+rm -rf gradlew.bat gradlew gradle
>+
>+cp %{SOURCE4} build.xml
>+
>+cat > sqljet.build.properties <<EOF
>+sqljet.version.major=1
>+sqljet.version.minor=1
>+sqljet.version.micro=4
>+sqljet.version.build=local
>+
>+antlr.version=3.1.3
>+sqlite.version=3.6.10
>+EOF
> 
>-# versions in pom xml are to be processed by ant, but we don't need that so just fix them here
>-sed -i 's/%sqljet.version%/%{version}/;s/%antlr.version%/3.1.3/' pom.xml sqljet/osgi/MANIFEST.MF
> 
> %build
> export CLASSPATH=$(build-classpath antlr3-runtime antlr3 antlr stringtemplate4 easymock2 junit4)
> 
> ant jars osgi javadoc
> 
>-jar umf sqljet/osgi/MANIFEST.MF build/sqljet.jar
> 
> %install
> # jars
>@@ -76,6 +82,8 @@ install -m 755  build/sqljet.jar %{buildroot}%{_javadir}/%{name}.jar
> install -m 755  build/sqljet-browser.jar  %{buildroot}%{_javadir}/%{name}-browser.jar
> 
> # maven metadata
>+cp %{SOURCE5} pom.xml
>+ant pom
> mkdir -p %{buildroot}%{_mavenpomdir}
> cp pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
> %add_maven_depmap JPP-%{name}.pom %{name}.jar
>@@ -93,22 +101,39 @@ desktop-file-install  --dir=%{buildroot}%{_datadir}/applications \
> 
> desktop-file-validate %{buildroot}/%{_datadir}/applications/sqljet-browser.desktop
> 
>+%post
>+%update_maven_depmap
>+
>+%postun
>+%update_maven_depmap
>+
>+
> %files
> %{_mavendepmapfragdir}/%{name}
> %{_mavenpomdir}/JPP-%{name}.pom
>-%doc COPYING README.txt
>+%doc LICENSE.txt README.txt CHANGES.txt
> %{_javadir}/%{name}.jar
> 
> %files browser
>+%doc LICENSE.txt
> %{_javadir}/%{name}-browser.jar
> %{_bindir}/%{name}-browser
> %{_datadir}/applications/%{name}-browser.desktop
> 
> %files javadoc
>-%doc COPYING
>+%doc LICENSE.txt
> %doc %{_javadocdir}/*
> 
> %changelog
>+* Tue Oct 9 2012 Ismael Olea <ismael@olea.org> - 1.1.4-3
>+- spec maven enhancements
>+
>+* Sat Oct 6 2012 Ismael Olea <ismael@olea.org> - 1.1.4-2
>+- beautifing build.xml
>+
>+* Fri Oct 5 2012 Ismael Olea <ismael@olea.org> - 1.1.4-1
>+- update to 1.1.4
>+
> * Tue Jul 31 2012 Alexander Kurtakov <akurtako@redhat.com> 1.0.4-8
> - Make jars readable.
> 
>-- 
>1.7.7.6
>

Actions: View | Diff

Attachments on bug 873749: 646274