packages/sqljet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix errors due to wrong path in sqljet-build.xml

Browse Source
This commit is contained in:
Dingli Zhang 2024-05-07 16:34:42 +08:00
parent 58eeffb361
commit ab96ad4526
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sqljet-build.xml
View File

@ -44,13 +44,15 @@
</target> </target>
<target name="antlr"> <target name="antlr">
<java classname="org.antlr.Tool" fork="true" failonerror="true"> <java classname="org.antlr.Tool" fork="true" failonerror="true">
<arg value="-Xconversiontimeout"/>
<arg value="100000"/>
<arg value="-report"/> <arg value="-report"/>
<arg value="-fo"/> <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"/>
<arg value="sqljet/src/main/antlr/org/tmatesoft/sqljet/core/internal/lang/Sql.g"/> <arg value="sqljet/src/main/antlr/org/tmatesoft/sqljet/core/internal/lang/Sql.g"/>
<classpath> <classpath>
<pathelement location="/usr/share/java/antlr3.jar"/> <pathelement location="/usr/share/java/antlr32/antlr-3.2.jar"/>
<pathelement location="/usr/share/java/antlr3-runtime.jar"/> <pathelement location="/usr/share/java/antlr32/antlr-runtime-3.2.jar"/>
<pathelement location="/usr/share/java/stringtemplate4.jar"/> <pathelement location="/usr/share/java/stringtemplate4.jar"/>
<pathelement path="${java.class.path}"/> <pathelement path="${java.class.path}"/>
</classpath> </classpath>
@ -73,7 +75,7 @@ public class SqlParser</replacevalue>
<javac destdir="sqljet/bin" srcdir="sqljet/src/main/java" debug="true" verbose="no"> <javac destdir="sqljet/bin" srcdir="sqljet/src/main/java" debug="true" verbose="no">
<compilerarg value="-O"/> <compilerarg value="-O"/>
<classpath> <classpath>
<pathelement location="/usr/share/java/antlr3-runtime.jar"/> <pathelement location="/usr/share/java/antlr32/antlr-runtime-3.2.jar"/>
</classpath> </classpath>
</javac> </javac>
<javac destdir="sqljet-test/bin" srcdir="sqljet/src/test/" debug="true" verbose="no"> <javac destdir="sqljet-test/bin" srcdir="sqljet/src/test/" debug="true" verbose="no">
@ -83,7 +85,7 @@ public class SqlParser</replacevalue>
<fileset dir="sqljet-test/bin" includes="*.jar"/> <fileset dir="sqljet-test/bin" includes="*.jar"/>
<pathelement location="/usr/share/java/junit.jar"/> <pathelement location="/usr/share/java/junit.jar"/>
<pathelement location="/usr/share/java/easymock2.jar"/> <pathelement location="/usr/share/java/easymock2.jar"/>
<pathelement location="/usr/share/java/antlr3-runtime.jar"/> <pathelement location="/usr/share/java/antlr32/antlr-runtime-3.2.jar"/>
</classpath> </classpath>
</javac> </javac>
</target> </target>
@ -110,11 +112,11 @@ public class SqlParser</replacevalue>
<mkdir dir="build"/> <mkdir dir="build"/>
<mkdir dir="build/javadoc"/> <mkdir dir="build/javadoc"/>
<path id="doc.classpath"> <path id="doc.classpath">
<pathelement location="/usr/share/java/antlr3-runtime.jar"/> <pathelement location="/usr/share/java/antlr32/antlr-runtime-3.2.jar"/>
</path> </path>
<javadoc destdir="build/javadoc" packagenames="org.tmatesoft.sqljet" <javadoc destdir="build/javadoc" packagenames="org.tmatesoft.sqljet"
sourcepath="sqljet/src" verbose="no" classpathref="doc.classpath" sourcepath="sqljet/src" verbose="no" classpathref="doc.classpath"
overview="sqljet/src/overview.html" failonerror="false"> overview="sqljet/src/main/javadoc/overview.html" failonerror="false" additionalparam="-Xdoclint:none">
<packageset dir="sqljet/src/main/java" defaultexcludes="yes"> <packageset dir="sqljet/src/main/java" defaultexcludes="yes">
<exclude name="**/test/**"/> <exclude name="**/test/**"/>
</packageset> </packageset>
@ -153,7 +155,7 @@ public class SqlParser</replacevalue>
<fileset dir="sqljet-test/bin" includes="*.jar"/> <fileset dir="sqljet-test/bin" includes="*.jar"/>
<pathelement location="/usr/share/java/junit.jar"/> <pathelement location="/usr/share/java/junit.jar"/>
<pathelement location="/usr/share/java/easymock2.jar"/> <pathelement location="/usr/share/java/easymock2.jar"/>
<pathelement location="/usr/share/java/antlr3-runtime.jar"/> <pathelement location="/usr/share/java/antlr32/antlr-runtime-3.2.jar"/>
</classpath> </classpath>
</javac> </javac>
<jar destfile="build/org.tmatesoft.sqljet_${build.number}.jar" manifest="build/osgi-manifest"> <jar destfile="build/org.tmatesoft.sqljet_${build.number}.jar" manifest="build/osgi-manifest">
@ -352,7 +354,7 @@ public class SqlParser</replacevalue>
<classpath> <classpath>
<pathelement location="/usr/share/java/junit.jar"/> <pathelement location="/usr/share/java/junit.jar"/>
<pathelement location="/usr/share/java/easymock2.jar"/> <pathelement location="/usr/share/java/easymock2.jar"/>
<pathelement location="/usr/share/java/antlr3-runtime.jar"/> <pathelement location="/usr/share/java/antlr32/antlr-runtime-3.2.jar"/>
</classpath> </classpath>
<batchtest fork="yes" todir="sqljet-test/bin"> <batchtest fork="yes" todir="sqljet-test/bin">

6
sqljet.spec
View File

@ -1,6 +1,6 @@
Name: sqljet Name: sqljet
Version: 1.1.10 Version: 1.1.10
Release: 1 Release: 2
Summary: Pure Java SQLite Summary: Pure Java SQLite
License: GPLv2 License: GPLv2
URL: http://sqljet.com/ URL: http://sqljet.com/
@ -52,5 +52,9 @@ ant jars osgi javadoc pom
%license LICENSE.txt %license LICENSE.txt
%changelog %changelog
* Tue May 07 2024 Dingli Zhang <dingli@iscas.ac.cn> - 1.1.10-2
- Fix errors due to wrong path in sqljet-build.xml
- Add -Xconversiontimeout to avoid timeout errors for riscv64.
* Sat May 15 2021 baizhonggui <baizhonggui@huawei.com> - 1.1.10-1 * Sat May 15 2021 baizhonggui <baizhonggui@huawei.com> - 1.1.10-1
- package init - package init