Menu
▾
▴
mxquery-commit
|
From: <max...@us...> - 2011-05-05 17:28:06
|
Revision: 4317
http://mxquery.svn.sourceforge.net/mxquery/?rev=4317&view=rev
Author: maxspeicher
Date: 2011-05-05 17:28:00 +0000 (Thu, 05 May 2011)
Log Message:
-----------
removed unnecessary lib imports from Android jar build target
Modified Paths:
--------------
trunk/MXQuery/build.xml
Modified: trunk/MXQuery/build.xml
===================================================================
--- trunk/MXQuery/build.xml 2011-05-05 17:21:27 UTC (rev 4316)
+++ trunk/MXQuery/build.xml 2011-05-05 17:28:00 UTC (rev 4317)
@@ -1169,8 +1169,6 @@
<target name="jar-android" depends="compile-android">
<echo message="Creating jar archive..."/>
<unjar src="${resources.dir}/kxml2-min-2.3.0.jar" dest="${build.dir}"></unjar>
- <unjar src="${resources.dir}/xmlpull_1_1_3_4c.jar" dest="${build.dir}"></unjar>
- <unjar src="${resources.dir}/jax-1_1-fr-qname-class.jar" dest="${build.dir}"></unjar>
<unjar src="${resources.dir}/xercesImpl.jar" dest="${build.dir}"></unjar>
<unjar src="${android.dir}/lib/jsr173_1.0_api-repackaged.jar" dest="${build.dir}"></unjar>
<unjar src="${resources.dir}/tagsoup-1.2.jar" dest="${build.dir}"></unjar>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <max...@us...> - 2011-05-16 16:15:28
|
Revision: 4345
http://mxquery.svn.sourceforge.net/mxquery/?rev=4345&view=rev
Author: maxspeicher
Date: 2011-05-16 16:15:22 +0000 (Mon, 16 May 2011)
Log Message:
-----------
- added Android SDK to classpath of target jar-android
Modified Paths:
--------------
trunk/MXQuery/build.xml
Modified: trunk/MXQuery/build.xml
===================================================================
--- trunk/MXQuery/build.xml 2011-05-16 14:29:52 UTC (rev 4344)
+++ trunk/MXQuery/build.xml 2011-05-16 16:15:22 UTC (rev 4345)
@@ -1165,6 +1165,7 @@
extdirs="">
<classpath>
<path refid="android.lib.path" />
+ <pathelement location="${sdk.dir}/platforms/android-8/android.jar" />
</classpath>
</javac>
</target>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pm_...@us...> - 2011-05-24 13:54:51
|
Revision: 4368
http://mxquery.svn.sourceforge.net/mxquery/?rev=4368&view=rev
Author: pm_fischer
Date: 2011-05-24 13:54:45 +0000 (Tue, 24 May 2011)
Log Message:
-----------
adapt build.xml for Java 1.4 matches
Modified Paths:
--------------
trunk/MXQuery/build.xml
Modified: trunk/MXQuery/build.xml
===================================================================
--- trunk/MXQuery/build.xml 2011-05-24 13:34:09 UTC (rev 4367)
+++ trunk/MXQuery/build.xml 2011-05-24 13:54:45 UTC (rev 4368)
@@ -217,6 +217,7 @@
<copy file="${altsrc.dir}/ch/ethz/mxquery/query/impl/CompilerImpl.java" todir="${customtmp.dir}/ch/ethz/mxquery/query/impl" overwrite="yes" />
<copy file="${altsrc.dir}/ch/ethz/mxquery/xdmio/xmlAdapters/NonValidatingDOMAdapter.java" todir="${customtmp.dir}/ch/ethz/mxquery/xdmio/xmlAdapters/" overwrite="yes" />
<copy file="${altsrc.dir}/ch/ethz/mxquery/functions/math/TransMath.java" todir="${customtmp.dir}/ch/ethz/mxquery/functions/math" overwrite="yes" />
+ <copy file="${altsrc.dir}/ch/ethz/mxquery/functions/Matches.java" todir="${customtmp.dir}/ch/ethz/mxquery/functions/" overwrite="yes" />
<depend srcdir="${customtmp.dir}"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <et...@us...> - 2011-10-03 22:05:49
|
Revision: 4466
http://mxquery.svn.sourceforge.net/mxquery/?rev=4466&view=rev
Author: etterth
Date: 2011-10-03 22:05:41 +0000 (Mon, 03 Oct 2011)
Log Message:
-----------
- added copying of tests to gwt_war
Modified Paths:
--------------
trunk/MXQuery/build.xml
Modified: trunk/MXQuery/build.xml
===================================================================
--- trunk/MXQuery/build.xml 2011-10-03 20:56:35 UTC (rev 4465)
+++ trunk/MXQuery/build.xml 2011-10-03 22:05:41 UTC (rev 4466)
@@ -17,18 +17,22 @@
<project name="MXQuery" default="jar" basedir=".">
-
- <property name="officialName" value="MXQuery"></property>
- <property name="version" value="0.6.1"></property>
- <property name="year" value="2006-2009"></property>
- <property name="copyright" value="ETH Zurich"></property>
-
- <property name="debug" value="on"/>
- <property name="optimize" value="on"/>
+
+ <property name="officialName" value="MXQuery">
+ </property>
+ <property name="version" value="0.6.1">
+ </property>
+ <property name="year" value="2006-2009">
+ </property>
+ <property name="copyright" value="ETH Zurich">
+ </property>
+
+ <property name="debug" value="on"/>
+ <property name="optimize" value="on"/>
<property name="src.version" value="1.3"/>
-
+
<property name="root.dir" value="."/>
- <property name="src.dir" value="${root.dir}/src"/>
+ <property name="src.dir" value="${root.dir}/src"/>
<property name="resources.dir" value="${root.dir}/lib"/>
<property name="build.dir" value="${root.dir}/build"/>
<property name="dist.dir" value="${root.dir}/dist"/>
@@ -36,19 +40,19 @@
<property name="customtmp.dir" value="${root.dir}/customtmp"/>
<property name="midptmp.dir" value="${customtmp.dir}"/>
<property name="xqibtmp.dir" value="${customtmp.dir}"/>
-
+
<property name="tmpfunc.dir" value="${customtmp.dir}/ch/ethz/mxquery/functions"/>
<property name="srcfunc.dir" value="${src.dir}/ch/ethz/mxquery/functions"/>
-
+
<property name="noparsertmp.dir" value="${root.dir}/noparsertmp"/>
-
+
<property name="modules.dir" value="${root.dir}/mod2export"/>
<property name="war.dir" value ="${build.dir}/war"/>
<property name="gwt_war.dir" value ="${build.dir}/gwt_war"/>
<property name="gwt_webinf.dir" value ="${gwt_war.dir}/WEB-INF"/>
<property name="gwt_webclasses.dir" value ="${gwt_webinf.dir}/classes"/>
<property name="xqib_samples.dir" value ="${root.dir}/xqib_samples"/>
-
+
<property name="webinf.dir" value="${war.dir}/WEB-INF"/>
<property name="weblib.dir" value="${webinf.dir}/lib"/>
<property name="webclasses.dir" value="${webinf.dir}/classes"/>
@@ -56,9 +60,9 @@
<property name="utilservlet.dir" value="${webclasses.dir}/ch/ethz/mxquery/util"/>
<property name="xspcontent.dir" value="${root.dir}/XSP"/>
-
+
<import file="generate_funcgallery.xml"/>
-
+
<condition property="wtk.home" value="C:\\WTK2.5.2_01">
<os family="windows"/>
</condition>
@@ -74,52 +78,52 @@
<property name="altsrc.dir" value="${root.dir}/altsrc"/>
<path id="project.class.path">
- <pathelement location="${resources.dir}/xml-apis.jar" />
- <fileset dir="${resources.dir}">
- <include name="*.jar"/>
- </fileset>
- <pathelement path="${java.class.path}"/>
+ <pathelement location="${resources.dir}/xml-apis.jar" />
+ <fileset dir="${resources.dir}">
+ <include name="*.jar"/>
+ </fileset>
+ <pathelement path="${java.class.path}"/>
</path>
-
+
<path id="midlet.class.path">
- <pathelement location="${build.dir}"/>
- <fileset dir="${resources.dir}">
- <include name="kxml2-min-2.3.0.jar"/>
- <include name="xmlpull_1_1_3_4c.jar"/>
- <include name="microlog-logger-core-2.3.5.jar"/>
+ <pathelement location="${build.dir}"/>
+ <fileset dir="${resources.dir}">
+ <include name="kxml2-min-2.3.0.jar"/>
+ <include name="xmlpull_1_1_3_4c.jar"/>
+ <include name="microlog-logger-core-2.3.5.jar"/>
- </fileset>
+ </fileset>
</path>
-
+
<taskdef resource="antenna.properties" classpath="${resources.dir}/antenna-bin-0.9.14.jar"/>
-
- <target name="clean">
- <echo message="Cleaning directories..."/>
- <delete>
- <fileset dir="${build.dir}/">
- <exclude name="gwt_war/mxqueryjs/**/*"/>
- <include name="**/*"/>
- </fileset>
- <fileset dir="${customtmp.dir}/">
- <include name="**/*"/>
- </fileset>
- </delete>
-
+
+ <target name="clean">
+ <echo message="Cleaning directories..."/>
+ <delete>
+ <fileset dir="${build.dir}/">
+ <exclude name="gwt_war/mxqueryjs/**/*"/>
+ <include name="**/*"/>
+ </fileset>
+ <fileset dir="${customtmp.dir}/">
+ <include name="**/*"/>
+ </fileset>
+ </delete>
+
<mkdir dir="${build.dir}"/>
- <mkdir dir="${dist.dir}"/>
- <mkdir dir="${customtmp.dir}"/>
- </target>
-
- <target name="compile" depends="clean">
+ <mkdir dir="${dist.dir}"/>
+ <mkdir dir="${customtmp.dir}"/>
+ </target>
+
+ <target name="compile" depends="clean">
<echo message="Compiling..."/>
-
+
<depend srcdir="${src.dir}"
destdir="${build.dir}"
cache="depcache"
closure="yes"
/>
- <javac source="${src.version}"
+ <javac source="${src.version}"
srcdir="${src.dir}"
destdir="${build.dir}"
target="1.4"
@@ -128,19 +132,21 @@
optimize="${optimize}"
extdirs=""
/>
- </target>
+ </target>
- <target name="compile-15" depends="clean">
- <echo message="Merging source trees"/>
- <delete>
- <fileset dir="${customtmp.dir}/">
- <include name="**/*"/>
- </fileset>
- </delete>
- <copy todir="${customtmp.dir}"><fileset dir="${src.dir}"/></copy>
+ <target name="compile-15" depends="clean">
+ <echo message="Merging source trees"/>
+ <delete>
+ <fileset dir="${customtmp.dir}/">
+ <include name="**/*"/>
+ </fileset>
+ </delete>
+ <copy todir="${customtmp.dir}">
+ <fileset dir="${src.dir}"/>
+ </copy>
- <delete file="${customtmp.dir}/ch/ethz/mxquery/functions/fn/NormalizeUnicode.java" />
+ <delete file="${customtmp.dir}/ch/ethz/mxquery/functions/fn/NormalizeUnicode.java" />
<depend srcdir="${customtmp.dir}"
destdir="${build.dir}"
@@ -148,7 +154,7 @@
closure="yes"
/>
- <javac source="${src.version}"
+ <javac source="${src.version}"
srcdir="${customtmp.dir}"
destdir="${build.dir}"
target="1.4"
@@ -157,67 +163,69 @@
optimize="${optimize}"
extdirs=""
/>
- </target>
+ </target>
- <target name="compile-14" depends="clean">
- <echo message="Merging source trees"/>
- <delete>
- <fileset dir="${customtmp.dir}/">
- <include name="**/*"/>
- </fileset>
- </delete>
- <copy todir="${customtmp.dir}"><fileset dir="${src.dir}"/></copy>
+ <target name="compile-14" depends="clean">
+ <echo message="Merging source trees"/>
+ <delete>
+ <fileset dir="${customtmp.dir}/">
+ <include name="**/*"/>
+ </fileset>
+ </delete>
+ <copy todir="${customtmp.dir}">
+ <fileset dir="${src.dir}"/>
+ </copy>
- <delete>
- <fileset dir="${customtmp.dir}/ch/ethz/mxquery/sms/MMimpl/" id="id">
- <include name="*.java"/>
- <exclude name="TokenBufferStore.java"/>
+ <delete>
+ <fileset dir="${customtmp.dir}/ch/ethz/mxquery/sms/MMimpl/" id="id">
+ <include name="*.java"/>
+ <exclude name="TokenBufferStore.java"/>
<exclude name="MaterializingTokenBufferStore.java"/>
- </fileset>
- <fileset dir="${customtmp.dir}/ch/ethz/mxquery/parallel" id="id">
- <include name="*.java"/>
- </fileset>
- </delete>
+ </fileset>
+ <fileset dir="${customtmp.dir}/ch/ethz/mxquery/parallel" id="id">
+ <include name="*.java"/>
+ </fileset>
+ </delete>
- <delete file="${customtmp.dir}/ch/ethz/mxquery/sms/activeStore/ReadThreadUpdate.java" />
- <delete file="${customtmp.dir}/ch/ethz/mxquery/sms/activeStore/ReadDataThread.java" />
+ <delete file="${customtmp.dir}/ch/ethz/mxquery/sms/activeStore/ReadThreadUpdate.java" />
+ <delete file="${customtmp.dir}/ch/ethz/mxquery/sms/activeStore/ReadDataThread.java" />
- <delete file="${customtmp.dir}/ch/ethz/mxquery/functions/fn/NormalizeUnicode.java" />
- <delete file="${customtmp.dir}/ch/ethz/mxquery/functions/fn/AvailEnvVars.java"/>
- <delete file="${customtmp.dir}/ch/ethz/mxquery/iterators/PFFLWORIterator.java" />
- <delete file="${customtmp.dir}/ch/ethz/mxquery/iterators/PGFLWORIterator.java"/>
- <delete file="${customtmp.dir}/ch/ethz/mxquery/iterators/PGroupBy.java"/>
- <delete file="${customtmp.dir}/ch/ethz/mxquery/iterators/forseq/ForseqWindowEarlyBinding.java" />
- <delete file="${customtmp.dir}/ch/ethz/mxquery/iterators/forseq/ForseqWindowEarlyBindingParallel.java" />
- <delete file="${midptmp.dir}/ch/ethz/mxquery/query/webservice/XSPMain.java"/>
- <delete file="${customtmp.dir}/ch/ethz/mxquery/query/parser/J56Parser.java" />
- <delete file="${customtmp.dir}/ch/ethz/mxquery/extensionsModules/util/Uuid.java" />
+ <delete file="${customtmp.dir}/ch/ethz/mxquery/functions/fn/NormalizeUnicode.java" />
+ <delete file="${customtmp.dir}/ch/ethz/mxquery/functions/fn/AvailEnvVars.java"/>
+ <delete file="${customtmp.dir}/ch/ethz/mxquery/iterators/PFFLWORIterator.java" />
+ <delete file="${customtmp.dir}/ch/ethz/mxquery/iterators/PGFLWORIterator.java"/>
+ <delete file="${customtmp.dir}/ch/ethz/mxquery/iterators/PGroupBy.java"/>
+ <delete file="${customtmp.dir}/ch/ethz/mxquery/iterators/forseq/ForseqWindowEarlyBinding.java" />
+ <delete file="${customtmp.dir}/ch/ethz/mxquery/iterators/forseq/ForseqWindowEarlyBindingParallel.java" />
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/query/webservice/XSPMain.java"/>
+ <delete file="${customtmp.dir}/ch/ethz/mxquery/query/parser/J56Parser.java" />
+ <delete file="${customtmp.dir}/ch/ethz/mxquery/extensionsModules/util/Uuid.java" />
- <delete file="${customtmp.dir}/examples/StreamExample.java" />
- <delete file="${customtmp.dir}/examples/StreamStatsDemo.java" />
- <delete file="${customtmp.dir}/examples/StreamLifecycleExample.java" />
- <delete>
- <fileset dir="${customtmp.dir}/ch/ethz/mxquery/dmcq/">
- <include name="*.java"/>
- </fileset>
- </delete>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/util/PerfTools.java" />
- <copy file="${midpsrc.dir}/ch/ethz/mxquery/functions/fn/String_Length.java" todir="${customtmp.dir}/ch/ethz/mxquery/functions/fn/" overwrite="yes"/>
- <copy file="${midpsrc.dir}/ch/ethz/mxquery/functions/fn/SubString.java" todir="${customtmp.dir}/ch/ethz/mxquery/functions/fn/" overwrite="yes"/>
- <copy file="${midpsrc.dir}/ch/ethz/mxquery/functions/fn/StringToCodepoints.java" todir="${customtmp.dir}/ch/ethz/mxquery/functions/fn/" overwrite="yes"/>
- <copy file="${midpsrc.dir}/ch/ethz/mxquery/functions/fn/Translate.java" todir="${customtmp.dir}/ch/ethz/mxquery/functions/fn/" overwrite="yes" />
- <copy file="${midpsrc.dir}/ch/ethz/mxquery/sms/MMimpl/TokenBufferStore.java" todir="${customtmp.dir}/ch/ethz/mxquery/sms/MMimpl/" overwrite="yes" />
- <copy file="${midpsrc.dir}/ch/ethz/mxquery/sms/StoreFactory.java" todir="${customtmp.dir}/ch/ethz/mxquery/sms/" overwrite="yes" />
+ <delete file="${customtmp.dir}/examples/StreamExample.java" />
+ <delete file="${customtmp.dir}/examples/StreamStatsDemo.java" />
+ <delete file="${customtmp.dir}/examples/StreamLifecycleExample.java" />
+ <delete>
+ <fileset dir="${customtmp.dir}/ch/ethz/mxquery/dmcq/">
+ <include name="*.java"/>
+ </fileset>
+ </delete>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/util/PerfTools.java" />
+ <copy file="${midpsrc.dir}/ch/ethz/mxquery/functions/fn/String_Length.java" todir="${customtmp.dir}/ch/ethz/mxquery/functions/fn/" overwrite="yes"/>
+ <copy file="${midpsrc.dir}/ch/ethz/mxquery/functions/fn/SubString.java" todir="${customtmp.dir}/ch/ethz/mxquery/functions/fn/" overwrite="yes"/>
+ <copy file="${midpsrc.dir}/ch/ethz/mxquery/functions/fn/StringToCodepoints.java" todir="${customtmp.dir}/ch/ethz/mxquery/functions/fn/" overwrite="yes"/>
+ <copy file="${midpsrc.dir}/ch/ethz/mxquery/functions/fn/Translate.java" todir="${customtmp.dir}/ch/ethz/mxquery/functions/fn/" overwrite="yes" />
+ <copy file="${midpsrc.dir}/ch/ethz/mxquery/sms/MMimpl/TokenBufferStore.java" todir="${customtmp.dir}/ch/ethz/mxquery/sms/MMimpl/" overwrite="yes" />
+ <copy file="${midpsrc.dir}/ch/ethz/mxquery/sms/StoreFactory.java" todir="${customtmp.dir}/ch/ethz/mxquery/sms/" overwrite="yes" />
- <copy file="${midpsrc.dir}/ch/ethz/mxquery/bindings/WindowBuffer.java" todir="${customtmp.dir}/ch/ethz/mxquery/bindings/" overwrite="yes" />
- <copy file="${altsrc.dir}/ch/ethz/mxquery/util/PlatformDependentUtils.java" todir="${customtmp.dir}/ch/ethz/mxquery/util" overwrite="yes" />
- <copy file="${altsrc.dir}/ch/ethz/mxquery/datamodel/MXQueryFloat.java" todir="${customtmp.dir}/ch/ethz/mxquery/datamodel" overwrite="yes" />
- <copy file="${altsrc.dir}/ch/ethz/mxquery/datamodel/MXQueryBigDecimal.java" todir="${customtmp.dir}/ch/ethz/mxquery/datamodel" overwrite="yes" />
- <copy file="${altsrc.dir}/ch/ethz/mxquery/query/impl/CompilerImpl.java" todir="${customtmp.dir}/ch/ethz/mxquery/query/impl" overwrite="yes" />
- <copy file="${altsrc.dir}/ch/ethz/mxquery/xdmio/xmlAdapters/NonValidatingDOMAdapter.java" todir="${customtmp.dir}/ch/ethz/mxquery/xdmio/xmlAdapters/" overwrite="yes" />
- <copy file="${altsrc.dir}/ch/ethz/mxquery/functions/math/TransMath.java" todir="${customtmp.dir}/ch/ethz/mxquery/functions/math" overwrite="yes" />
- <copy file="${altsrc.dir}/ch/ethz/mxquery/functions/fn/Matches.java" todir="${customtmp.dir}/ch/ethz/mxquery/functions/fn/" overwrite="yes" />
+ <copy file="${midpsrc.dir}/ch/ethz/mxquery/bindings/WindowBuffer.java" todir="${customtmp.dir}/ch/ethz/mxquery/bindings/" overwrite="yes" />
+ <copy file="${altsrc.dir}/ch/ethz/mxquery/util/PlatformDependentUtils.java" todir="${customtmp.dir}/ch/ethz/mxquery/util" overwrite="yes" />
+ <copy file="${altsrc.dir}/ch/ethz/mxquery/datamodel/MXQueryFloat.java" todir="${customtmp.dir}/ch/ethz/mxquery/datamodel" overwrite="yes" />
+ <copy file="${altsrc.dir}/ch/ethz/mxquery/datamodel/MXQueryBigDecimal.java" todir="${customtmp.dir}/ch/ethz/mxquery/datamodel" overwrite="yes" />
+ <copy file="${altsrc.dir}/ch/ethz/mxquery/query/impl/CompilerImpl.java" todir="${customtmp.dir}/ch/ethz/mxquery/query/impl" overwrite="yes" />
+ <copy file="${altsrc.dir}/ch/ethz/mxquery/xdmio/xmlAdapters/NonValidatingDOMAdapter.java" todir="${customtmp.dir}/ch/ethz/mxquery/xdmio/xmlAdapters/" overwrite="yes" />
+ <copy file="${altsrc.dir}/ch/ethz/mxquery/functions/math/TransMath.java" todir="${customtmp.dir}/ch/ethz/mxquery/functions/math" overwrite="yes" />
+ <copy file="${altsrc.dir}/ch/ethz/mxquery/functions/fn/Matches.java" todir="${customtmp.dir}/ch/ethz/mxquery/functions/fn/" overwrite="yes" />
<depend srcdir="${customtmp.dir}"
@@ -226,7 +234,7 @@
closure="yes"
/>
- <javac source="${src.version}"
+ <javac source="${src.version}"
srcdir="${customtmp.dir}"
destdir="${build.dir}"
target="1.4"
@@ -236,92 +244,115 @@
includeAntRuntime="false"
extdirs=""
/>
- </target>
-
+ </target>
+
<target name="jar" depends="compile">
<echo message="Creating jar archive..."/>
- <unjar src="${resources.dir}/kxml2-min-2.3.0.jar" dest="${build.dir}"></unjar>
- <unjar src="${resources.dir}/xmlpull_1_1_3_4c.jar" dest="${build.dir}"></unjar>
- <unjar src="${resources.dir}/xercesImpl.jar" dest="${build.dir}"></unjar>
- <unjar src="${resources.dir}/tagsoup-1.2.jar" dest="${build.dir}"></unjar>
- <unjar src="${resources.dir}/xqjapi.jar" dest="${build.dir}"></unjar>
- <unjar src="${resources.dir}/commons-cli-1.2.jar" dest="${build.dir}"></unjar>
+ <unjar src="${resources.dir}/kxml2-min-2.3.0.jar" dest="${build.dir}">
+ </unjar>
+ <unjar src="${resources.dir}/xmlpull_1_1_3_4c.jar" dest="${build.dir}">
+ </unjar>
+ <unjar src="${resources.dir}/xercesImpl.jar" dest="${build.dir}">
+ </unjar>
+ <unjar src="${resources.dir}/tagsoup-1.2.jar" dest="${build.dir}">
+ </unjar>
+ <unjar src="${resources.dir}/xqjapi.jar" dest="${build.dir}">
+ </unjar>
+ <unjar src="${resources.dir}/commons-cli-1.2.jar" dest="${build.dir}">
+ </unjar>
<jar jarfile="${dist.dir}/mxquery.jar">
<fileset dir="${build.dir}" excludes="examples/**/*.*"/>
<fileset dir="${src.dir}" includes="ch/**/*.xq"/>
- <fileset dir="${src.dir}" includes="ch/**/*.xml"/>
+ <fileset dir="${src.dir}" includes="ch/**/*.xml"/>
<fileset dir="${src.dir}" includes="ch/**/*.txt"/>
<fileset dir="${src.dir}" includes="**/*.servlet"/>
<fileset dir="${src.dir}" includes="ch/**/*.txt"/>
- <manifest>
- <attribute name="Built-By" value="MXQuery Team at ETH Zurich (in...@mx...)"/>
- <attribute name="Main-Class" value="ch.ethz.mxquery.cmdline.MXQuery"/>
- </manifest>
+ <manifest>
+ <attribute name="Built-By" value="MXQuery Team at ETH Zurich (in...@mx...)"/>
+ <attribute name="Main-Class" value="ch.ethz.mxquery.cmdline.MXQuery"/>
+ </manifest>
</jar>
</target>
<target name="jar-15" depends="compile-15">
<echo message="Creating jar archive..."/>
- <unjar src="${resources.dir}/kxml2-min-2.3.0.jar" dest="${build.dir}"></unjar>
- <unjar src="${resources.dir}/xmlpull_1_1_3_4c.jar" dest="${build.dir}"></unjar>
- <unjar src="${resources.dir}/jax-1_1-fr-qname-class.jar" dest="${build.dir}"></unjar>
- <unjar src="${resources.dir}/xercesImpl.jar" dest="${build.dir}"></unjar>
- <unjar src="${resources.dir}/jsr173_1.0_api.jar" dest="${build.dir}"></unjar>
- <unjar src="${resources.dir}/tagsoup-1.2.jar" dest="${build.dir}"></unjar>
- <unjar src="${resources.dir}/xqjapi.jar" dest="${build.dir}"></unjar>
- <unjar src="${resources.dir}/commons-cli-1.2.jar" dest="${build.dir}"></unjar>
+ <unjar src="${resources.dir}/kxml2-min-2.3.0.jar" dest="${build.dir}">
+ </unjar>
+ <unjar src="${resources.dir}/xmlpull_1_1_3_4c.jar" dest="${build.dir}">
+ </unjar>
+ <unjar src="${resources.dir}/jax-1_1-fr-qname-class.jar" dest="${build.dir}">
+ </unjar>
+ <unjar src="${resources.dir}/xercesImpl.jar" dest="${build.dir}">
+ </unjar>
+ <unjar src="${resources.dir}/jsr173_1.0_api.jar" dest="${build.dir}">
+ </unjar>
+ <unjar src="${resources.dir}/tagsoup-1.2.jar" dest="${build.dir}">
+ </unjar>
+ <unjar src="${resources.dir}/xqjapi.jar" dest="${build.dir}">
+ </unjar>
+ <unjar src="${resources.dir}/commons-cli-1.2.jar" dest="${build.dir}">
+ </unjar>
<jar jarfile="${dist.dir}/mxquery-15.jar">
<fileset dir="${build.dir}" excludes="examples/**/*.*"/>
<fileset dir="${src.dir}" includes="ch/**/*.xq"/>
- <fileset dir="${src.dir}" includes="ch/**/*.xml"/>
+ <fileset dir="${src.dir}" includes="ch/**/*.xml"/>
<fileset dir="${src.dir}" includes="ch/**/*.txt"/>
- <manifest>
- <attribute name="Built-By" value="MXQuery Team at ETH Zurich (in...@mx...)"/>
- <attribute name="Main-Class" value="ch.ethz.mxquery.cmdline.MXQuery"/>
- </manifest>
-
-
+ <manifest>
+ <attribute name="Built-By" value="MXQuery Team at ETH Zurich (in...@mx...)"/>
+ <attribute name="Main-Class" value="ch.ethz.mxquery.cmdline.MXQuery"/>
+ </manifest>
+
+
</jar>
- </target>
+ </target>
<target name="jar-14" depends="compile-14">
<echo message="Creating jar archive..."/>
- <unjar src="${resources.dir}/kxml2-min-2.3.0.jar" dest="${build.dir}"></unjar>
- <unjar src="${resources.dir}/xml-apis.jar" dest="${build.dir}"></unjar>
- <unjar src="${resources.dir}/xercesImpl.jar" dest="${build.dir}"></unjar>
- <unjar src="${resources.dir}/xmlpull_1_1_3_4c.jar" dest="${build.dir}"></unjar>
- <unjar src="${resources.dir}/jax-1_1-fr-qname-class.jar" dest="${build.dir}"></unjar>
- <unjar src="${resources.dir}/jsr173_1.0_api.jar" dest="${build.dir}"></unjar>
- <unjar src="${resources.dir}/tagsoup-1.2.jar" dest="${build.dir}"></unjar>
- <unjar src="${resources.dir}/xqjapi.jar" dest="${build.dir}"></unjar>
- <unjar src="${resources.dir}/commons-cli-1.2.jar" dest="${build.dir}"></unjar>
+ <unjar src="${resources.dir}/kxml2-min-2.3.0.jar" dest="${build.dir}">
+ </unjar>
+ <unjar src="${resources.dir}/xml-apis.jar" dest="${build.dir}">
+ </unjar>
+ <unjar src="${resources.dir}/xercesImpl.jar" dest="${build.dir}">
+ </unjar>
+ <unjar src="${resources.dir}/xmlpull_1_1_3_4c.jar" dest="${build.dir}">
+ </unjar>
+ <unjar src="${resources.dir}/jax-1_1-fr-qname-class.jar" dest="${build.dir}">
+ </unjar>
+ <unjar src="${resources.dir}/jsr173_1.0_api.jar" dest="${build.dir}">
+ </unjar>
+ <unjar src="${resources.dir}/tagsoup-1.2.jar" dest="${build.dir}">
+ </unjar>
+ <unjar src="${resources.dir}/xqjapi.jar" dest="${build.dir}">
+ </unjar>
+ <unjar src="${resources.dir}/commons-cli-1.2.jar" dest="${build.dir}">
+ </unjar>
<jar jarfile="${dist.dir}/mxquery-14.jar">
<fileset dir="${build.dir}" excludes="examples/**/*.*"/>
<fileset dir="${src.dir}" includes="ch/**/*.xq"/>
- <fileset dir="${src.dir}" includes="ch/**/*.xml"/>
+ <fileset dir="${src.dir}" includes="ch/**/*.xml"/>
<fileset dir="${src.dir}" includes="ch/**/*.txt"/>
- <manifest>
- <attribute name="Built-By" value="MXQuery Team at ETH Zurich (in...@mx...)"/>
- <attribute name="Main-Class" value="ch.ethz.mxquery.cmdline.MXQuery"/>
- </manifest>
+ <manifest>
+ <attribute name="Built-By" value="MXQuery Team at ETH Zurich (in...@mx...)"/>
+ <attribute name="Main-Class" value="ch.ethz.mxquery.cmdline.MXQuery"/>
+ </manifest>
</jar>
- </target>
-
+ </target>
+
<target name="war" depends="jar">
<echo message="Creating the SOAP Server war ... "/>
<mkdir dir="${war.dir}"/>
- <delete>
- <fileset dir="${war.dir}/">
- <include name="**/*"/>
- </fileset>
- </delete>
+ <delete>
+ <fileset dir="${war.dir}/">
+ <include name="**/*"/>
+ </fileset>
+ </delete>
<mkdir dir="${webinf.dir}"/>
<mkdir dir="${weblib.dir}"/>
<mkdir dir="${webclasses.dir}"/>
<mkdir dir="${servlet.dir}}"/>
- <mkdir dir="${utilservlet.dir}}"/>
+ <mkdir dir="${utilservlet.dir}}"/>
<copy file="${build.dir}/ch/ethz/mxquery/query/webservice/MultipleXQueryServer.class" todir="${servlet.dir}"/>
<copy file="${build.dir}/ch/ethz/mxquery/query/webservice/SingleXQueryServer.class" todir="${servlet.dir}"/>
<copy file="${build.dir}/ch/ethz/mxquery/util/MultipleSchemaExposer.class" todir="${utilservlet.dir}"/>
@@ -329,160 +360,169 @@
<copy file="${src.dir}/ch/ethz/mxquery/query/webservice/web.xml" todir="${webinf.dir}"/>
<copy file="${src.dir}/ch/ethz/mxquery/query/webservice/index.html" todir="${war.dir}"/>
<copy file="${dist.dir}/mxquery.jar" todir="${weblib.dir}"/>
- <copy todir="${war.dir}"><fileset dir="${modules.dir}"/></copy>
+ <copy todir="${war.dir}">
+ <fileset dir="${modules.dir}"/>
+ </copy>
<jar jarfile="${dist.dir}/MXQuery.war">
- <fileset dir="${war.dir}" includes="**/*.*"/>
- <manifest>
- <attribute name="Built-By" value="MXQuery Team at ETH Zurich (in...@mx...)"/>
- </manifest>
- </jar>
+ <fileset dir="${war.dir}" includes="**/*.*"/>
+ <manifest>
+ <attribute name="Built-By" value="MXQuery Team at ETH Zurich (in...@mx...)"/>
+ </manifest>
+ </jar>
</target>
-
-
+
+
<target name="xsp" depends="war">
<echo message="Creating the XSP war ... "/>
<mkdir dir="${war.dir}"/>
- <delete>
- <fileset dir="${war.dir}/">
- <include name="**/*"/>
- </fileset>
- </delete>
+ <delete>
+ <fileset dir="${war.dir}/">
+ <include name="**/*"/>
+ </fileset>
+ </delete>
<mkdir dir="${webinf.dir}"/>
<mkdir dir="${weblib.dir}"/>
<mkdir dir="${servlet.dir}}"/>
- <mkdir dir="${utilservlet.dir}}"/>
+ <mkdir dir="${utilservlet.dir}}"/>
<copy file="${build.dir}/ch/ethz/mxquery/query/webservice/XSPMain.class" todir="${utilservlet.dir}"/>
<copy file="${dist.dir}/mxquery.jar" todir="${weblib.dir}"/>
- <copy todir="${war.dir}"><fileset dir="${xspcontent.dir}"/></copy>
+ <copy todir="${war.dir}">
+ <fileset dir="${xspcontent.dir}"/>
+ </copy>
<jar jarfile="${dist.dir}/XSP.war">
- <fileset dir="${war.dir}" includes="**/*.*"/>
- <manifest>
- <attribute name="Built-By" value="MXQuery Team at ETH Zurich (in...@mx...)"/>
- </manifest>
- </jar>
+ <fileset dir="${war.dir}" includes="**/*.*"/>
+ <manifest>
+ <attribute name="Built-By" value="MXQuery Team at ETH Zurich (in...@mx...)"/>
+ </manifest>
+ </jar>
</target>
-
+
<target name="midp_prepare" depends="clean">
- <echo message="Merging source trees"/>
- <delete>
- <fileset dir="${midptmp.dir}/">
- <include name="**/*"/>
- </fileset>
- </delete>
- <copy todir="${midptmp.dir}"><fileset dir="${src.dir}"/></copy>
- <copy todir="${midptmp.dir}" overwrite="yes"><fileset dir="${midpsrc.dir}"/></copy>
- <echo message="Removing unsupported classes"/>
-
- <delete dir="${midptmp.dir}/ch/ethz/mxquery/parallel/"/>
+ <echo message="Merging source trees"/>
+ <delete>
+ <fileset dir="${midptmp.dir}/">
+ <include name="**/*"/>
+ </fileset>
+ </delete>
+ <copy todir="${midptmp.dir}">
+ <fileset dir="${src.dir}"/>
+ </copy>
+ <copy todir="${midptmp.dir}" overwrite="yes">
+ <fileset dir="${midpsrc.dir}"/>
+ </copy>
+ <echo message="Removing unsupported classes"/>
+
+ <delete dir="${midptmp.dir}/ch/ethz/mxquery/parallel/"/>
<delete dir="${midptmp.dir}/javax/"/>
<delete dir="${midptmp.dir}/org/tartarus"/>
<delete dir="${midptmp.dir}/com/"/>
- <delete dir="${midptmp.dir}/ch/ethz/mxquery/xqj/"/>
- <delete dir="${midptmp.dir}/ch/ethz/mxquery/opt/expr"/>
- <delete dir="${midptmp.dir}/ch/ethz/mxquery/opt/index"/>
- <delete dir="${midptmp.dir}/ch/ethz/mxquery/query/optimizer"/>
-
- <delete>
- <fileset dir="${midptmp.dir}/ch/ethz/mxquery/sms/MMimpl/">
- <include name="*.java"/>
- <exclude name="TokenBufferStore.java"/>
- <exclude name="MaterializingTokenBufferStore.java"/>
- </fileset>
- </delete>
- <delete>
- <fileset dir="${midptmp.dir}/examples">
- <include name="*.java"/>
- </fileset>
- </delete>
- <delete>
+ <delete dir="${midptmp.dir}/ch/ethz/mxquery/xqj/"/>
+ <delete dir="${midptmp.dir}/ch/ethz/mxquery/opt/expr"/>
+ <delete dir="${midptmp.dir}/ch/ethz/mxquery/opt/index"/>
+ <delete dir="${midptmp.dir}/ch/ethz/mxquery/query/optimizer"/>
+
+ <delete>
+ <fileset dir="${midptmp.dir}/ch/ethz/mxquery/sms/MMimpl/">
+ <include name="*.java"/>
+ <exclude name="TokenBufferStore.java"/>
+ <exclude name="MaterializingTokenBufferStore.java"/>
+ </fileset>
+ </delete>
+ <delete>
+ <fileset dir="${midptmp.dir}/examples">
+ <include name="*.java"/>
+ </fileset>
+ </delete>
+ <delete>
<fileset dir="${midptmp.dir}/ch/ethz/mxquery/cmdline">
<include name="*.java"/>
</fileset>
- </delete>
+ </delete>
- <delete>
- <fileset dir="${midptmp.dir}/ch/ethz/mxquery/extensionsModules" id="id">
+ <delete>
+ <fileset dir="${midptmp.dir}/ch/ethz/mxquery/extensionsModules" id="id">
<include name="**/*.java"/>
- <exclude name="ExtensionModulesConfig.java"/>
- <exclude name="zorbaRest/HttpIO.java"/>
- </fileset>
- </delete>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/sms/activeStore/ReadThreadUpdate.java" />
- <delete file="${midptmp.dir}/ch/ethz/mxquery/sms/activeStore/ReadDataThread.java" />
- <delete file="${midptmp.dir}/ch/ethz/mxquery/sms/interfaces/IndexInterface.java" />
- <delete file="${midptmp.dir}/ch/ethz/mxquery/sms/interfaces/IndexRead.java" />
- <delete file="${midptmp.dir}/ch/ethz/mxquery/sms/interfaces/IndexUpdate.java" />
- <delete file="${midptmp.dir}/ch/ethz/mxquery/sms/interfaces/RandomUpdate.java" />
- <delete file="${midptmp.dir}/ch/ethz/mxquery/sms/ftstore/SnowballBasedStemmer.java" />
- <delete>
+ <exclude name="ExtensionModulesConfig.java"/>
+ <exclude name="zorbaRest/HttpIO.java"/>
+ </fileset>
+ </delete>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/sms/activeStore/ReadThreadUpdate.java" />
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/sms/activeStore/ReadDataThread.java" />
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/sms/interfaces/IndexInterface.java" />
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/sms/interfaces/IndexRead.java" />
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/sms/interfaces/IndexUpdate.java" />
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/sms/interfaces/RandomUpdate.java" />
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/sms/ftstore/SnowballBasedStemmer.java" />
+ <delete>
<fileset dir="${midptmp.dir}/ch/ethz/mxquery/dmcq/">
<include name="*.java"/>
</fileset>
- </delete>
- <delete file="${customtmp.dir}/ch/ethz/mxquery/util/PerfTools.java" />
- <delete file="${midptmp.dir}/ch/ethz/mxquery/iterators/GroupByIndexIterator.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/iterators/DirectXMLIterator.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/iterators/PFFLWORIterator.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/iterators/PGFLWORIterator.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/iterators/PGroupBy.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/iterators/CommandLineInIterator.java"/>
- <delete file="${xqibtmp.dir}/ch/ethz/mxquery/iterators/NativeFuncCall.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/iterators/forseq/ForseqWindowIndexIterator.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/iterators/forseq/ForseqWindowEarlyBinding.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/iterators/forseq/ForseqWindowEarlyBindingParallel.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/util/UnicodeInputStream.java"/>
- <delete file="$...
[truncated message content] |
|
From: <et...@us...> - 2011-10-16 23:41:35
|
Revision: 4477
http://mxquery.svn.sourceforge.net/mxquery/?rev=4477&view=rev
Author: etterth
Date: 2011-10-16 23:41:27 +0000 (Sun, 16 Oct 2011)
Log Message:
-----------
- reverted changes in 4466 to build.xml (the test folder no longer needs to be added to gwt_war
Modified Paths:
--------------
trunk/MXQuery/build.xml
Modified: trunk/MXQuery/build.xml
===================================================================
--- trunk/MXQuery/build.xml 2011-10-16 23:32:38 UTC (rev 4476)
+++ trunk/MXQuery/build.xml 2011-10-16 23:41:27 UTC (rev 4477)
@@ -17,22 +17,18 @@
<project name="MXQuery" default="jar" basedir=".">
-
- <property name="officialName" value="MXQuery">
- </property>
- <property name="version" value="0.6.1">
- </property>
- <property name="year" value="2006-2009">
- </property>
- <property name="copyright" value="ETH Zurich">
- </property>
-
- <property name="debug" value="on"/>
- <property name="optimize" value="on"/>
+
+ <property name="officialName" value="MXQuery"></property>
+ <property name="version" value="0.6.1"></property>
+ <property name="year" value="2006-2009"></property>
+ <property name="copyright" value="ETH Zurich"></property>
+
+ <property name="debug" value="on"/>
+ <property name="optimize" value="on"/>
<property name="src.version" value="1.3"/>
-
+
<property name="root.dir" value="."/>
- <property name="src.dir" value="${root.dir}/src"/>
+ <property name="src.dir" value="${root.dir}/src"/>
<property name="resources.dir" value="${root.dir}/lib"/>
<property name="build.dir" value="${root.dir}/build"/>
<property name="dist.dir" value="${root.dir}/dist"/>
@@ -40,19 +36,19 @@
<property name="customtmp.dir" value="${root.dir}/customtmp"/>
<property name="midptmp.dir" value="${customtmp.dir}"/>
<property name="xqibtmp.dir" value="${customtmp.dir}"/>
-
+
<property name="tmpfunc.dir" value="${customtmp.dir}/ch/ethz/mxquery/functions"/>
<property name="srcfunc.dir" value="${src.dir}/ch/ethz/mxquery/functions"/>
-
+
<property name="noparsertmp.dir" value="${root.dir}/noparsertmp"/>
-
+
<property name="modules.dir" value="${root.dir}/mod2export"/>
<property name="war.dir" value ="${build.dir}/war"/>
<property name="gwt_war.dir" value ="${build.dir}/gwt_war"/>
<property name="gwt_webinf.dir" value ="${gwt_war.dir}/WEB-INF"/>
<property name="gwt_webclasses.dir" value ="${gwt_webinf.dir}/classes"/>
<property name="xqib_samples.dir" value ="${root.dir}/xqib_samples"/>
-
+
<property name="webinf.dir" value="${war.dir}/WEB-INF"/>
<property name="weblib.dir" value="${webinf.dir}/lib"/>
<property name="webclasses.dir" value="${webinf.dir}/classes"/>
@@ -60,9 +56,9 @@
<property name="utilservlet.dir" value="${webclasses.dir}/ch/ethz/mxquery/util"/>
<property name="xspcontent.dir" value="${root.dir}/XSP"/>
-
+
<import file="generate_funcgallery.xml"/>
-
+
<condition property="wtk.home" value="C:\\WTK2.5.2_01">
<os family="windows"/>
</condition>
@@ -78,52 +74,52 @@
<property name="altsrc.dir" value="${root.dir}/altsrc"/>
<path id="project.class.path">
- <pathelement location="${resources.dir}/xml-apis.jar" />
- <fileset dir="${resources.dir}">
- <include name="*.jar"/>
- </fileset>
- <pathelement path="${java.class.path}"/>
+ <pathelement location="${resources.dir}/xml-apis.jar" />
+ <fileset dir="${resources.dir}">
+ <include name="*.jar"/>
+ </fileset>
+ <pathelement path="${java.class.path}"/>
</path>
-
+
<path id="midlet.class.path">
- <pathelement location="${build.dir}"/>
- <fileset dir="${resources.dir}">
- <include name="kxml2-min-2.3.0.jar"/>
- <include name="xmlpull_1_1_3_4c.jar"/>
- <include name="microlog-logger-core-2.3.5.jar"/>
+ <pathelement location="${build.dir}"/>
+ <fileset dir="${resources.dir}">
+ <include name="kxml2-min-2.3.0.jar"/>
+ <include name="xmlpull_1_1_3_4c.jar"/>
+ <include name="microlog-logger-core-2.3.5.jar"/>
- </fileset>
+ </fileset>
</path>
-
+
<taskdef resource="antenna.properties" classpath="${resources.dir}/antenna-bin-0.9.14.jar"/>
-
- <target name="clean">
- <echo message="Cleaning directories..."/>
- <delete>
- <fileset dir="${build.dir}/">
- <exclude name="gwt_war/mxqueryjs/**/*"/>
- <include name="**/*"/>
- </fileset>
- <fileset dir="${customtmp.dir}/">
- <include name="**/*"/>
- </fileset>
- </delete>
-
+
+ <target name="clean">
+ <echo message="Cleaning directories..."/>
+ <delete>
+ <fileset dir="${build.dir}/">
+ <exclude name="gwt_war/mxqueryjs/**/*"/>
+ <include name="**/*"/>
+ </fileset>
+ <fileset dir="${customtmp.dir}/">
+ <include name="**/*"/>
+ </fileset>
+ </delete>
+
<mkdir dir="${build.dir}"/>
- <mkdir dir="${dist.dir}"/>
- <mkdir dir="${customtmp.dir}"/>
- </target>
-
- <target name="compile" depends="clean">
+ <mkdir dir="${dist.dir}"/>
+ <mkdir dir="${customtmp.dir}"/>
+ </target>
+
+ <target name="compile" depends="clean">
<echo message="Compiling..."/>
-
+
<depend srcdir="${src.dir}"
destdir="${build.dir}"
cache="depcache"
closure="yes"
/>
- <javac source="${src.version}"
+ <javac source="${src.version}"
srcdir="${src.dir}"
destdir="${build.dir}"
target="1.4"
@@ -132,21 +128,19 @@
optimize="${optimize}"
extdirs=""
/>
- </target>
+ </target>
- <target name="compile-15" depends="clean">
- <echo message="Merging source trees"/>
- <delete>
- <fileset dir="${customtmp.dir}/">
- <include name="**/*"/>
- </fileset>
- </delete>
- <copy todir="${customtmp.dir}">
- <fileset dir="${src.dir}"/>
- </copy>
+ <target name="compile-15" depends="clean">
+ <echo message="Merging source trees"/>
+ <delete>
+ <fileset dir="${customtmp.dir}/">
+ <include name="**/*"/>
+ </fileset>
+ </delete>
+ <copy todir="${customtmp.dir}"><fileset dir="${src.dir}"/></copy>
- <delete file="${customtmp.dir}/ch/ethz/mxquery/functions/fn/NormalizeUnicode.java" />
+ <delete file="${customtmp.dir}/ch/ethz/mxquery/functions/fn/NormalizeUnicode.java" />
<depend srcdir="${customtmp.dir}"
destdir="${build.dir}"
@@ -154,7 +148,7 @@
closure="yes"
/>
- <javac source="${src.version}"
+ <javac source="${src.version}"
srcdir="${customtmp.dir}"
destdir="${build.dir}"
target="1.4"
@@ -163,69 +157,67 @@
optimize="${optimize}"
extdirs=""
/>
- </target>
+ </target>
- <target name="compile-14" depends="clean">
- <echo message="Merging source trees"/>
- <delete>
- <fileset dir="${customtmp.dir}/">
- <include name="**/*"/>
- </fileset>
- </delete>
- <copy todir="${customtmp.dir}">
- <fileset dir="${src.dir}"/>
- </copy>
+ <target name="compile-14" depends="clean">
+ <echo message="Merging source trees"/>
+ <delete>
+ <fileset dir="${customtmp.dir}/">
+ <include name="**/*"/>
+ </fileset>
+ </delete>
+ <copy todir="${customtmp.dir}"><fileset dir="${src.dir}"/></copy>
- <delete>
- <fileset dir="${customtmp.dir}/ch/ethz/mxquery/sms/MMimpl/" id="id">
- <include name="*.java"/>
- <exclude name="TokenBufferStore.java"/>
+ <delete>
+ <fileset dir="${customtmp.dir}/ch/ethz/mxquery/sms/MMimpl/" id="id">
+ <include name="*.java"/>
+ <exclude name="TokenBufferStore.java"/>
<exclude name="MaterializingTokenBufferStore.java"/>
- </fileset>
- <fileset dir="${customtmp.dir}/ch/ethz/mxquery/parallel" id="id">
- <include name="*.java"/>
- </fileset>
- </delete>
+ </fileset>
+ <fileset dir="${customtmp.dir}/ch/ethz/mxquery/parallel" id="id">
+ <include name="*.java"/>
+ </fileset>
+ </delete>
- <delete file="${customtmp.dir}/ch/ethz/mxquery/sms/activeStore/ReadThreadUpdate.java" />
- <delete file="${customtmp.dir}/ch/ethz/mxquery/sms/activeStore/ReadDataThread.java" />
+ <delete file="${customtmp.dir}/ch/ethz/mxquery/sms/activeStore/ReadThreadUpdate.java" />
+ <delete file="${customtmp.dir}/ch/ethz/mxquery/sms/activeStore/ReadDataThread.java" />
- <delete file="${customtmp.dir}/ch/ethz/mxquery/functions/fn/NormalizeUnicode.java" />
- <delete file="${customtmp.dir}/ch/ethz/mxquery/functions/fn/AvailEnvVars.java"/>
- <delete file="${customtmp.dir}/ch/ethz/mxquery/iterators/PFFLWORIterator.java" />
- <delete file="${customtmp.dir}/ch/ethz/mxquery/iterators/PGFLWORIterator.java"/>
- <delete file="${customtmp.dir}/ch/ethz/mxquery/iterators/PGroupBy.java"/>
- <delete file="${customtmp.dir}/ch/ethz/mxquery/iterators/forseq/ForseqWindowEarlyBinding.java" />
- <delete file="${customtmp.dir}/ch/ethz/mxquery/iterators/forseq/ForseqWindowEarlyBindingParallel.java" />
- <delete file="${midptmp.dir}/ch/ethz/mxquery/query/webservice/XSPMain.java"/>
- <delete file="${customtmp.dir}/ch/ethz/mxquery/query/parser/J56Parser.java" />
- <delete file="${customtmp.dir}/ch/ethz/mxquery/extensionsModules/util/Uuid.java" />
+ <delete file="${customtmp.dir}/ch/ethz/mxquery/functions/fn/NormalizeUnicode.java" />
+ <delete file="${customtmp.dir}/ch/ethz/mxquery/functions/fn/AvailEnvVars.java"/>
+ <delete file="${customtmp.dir}/ch/ethz/mxquery/iterators/PFFLWORIterator.java" />
+ <delete file="${customtmp.dir}/ch/ethz/mxquery/iterators/PGFLWORIterator.java"/>
+ <delete file="${customtmp.dir}/ch/ethz/mxquery/iterators/PGroupBy.java"/>
+ <delete file="${customtmp.dir}/ch/ethz/mxquery/iterators/forseq/ForseqWindowEarlyBinding.java" />
+ <delete file="${customtmp.dir}/ch/ethz/mxquery/iterators/forseq/ForseqWindowEarlyBindingParallel.java" />
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/query/webservice/XSPMain.java"/>
+ <delete file="${customtmp.dir}/ch/ethz/mxquery/query/parser/J56Parser.java" />
+ <delete file="${customtmp.dir}/ch/ethz/mxquery/extensionsModules/util/Uuid.java" />
- <delete file="${customtmp.dir}/examples/StreamExample.java" />
- <delete file="${customtmp.dir}/examples/StreamStatsDemo.java" />
- <delete file="${customtmp.dir}/examples/StreamLifecycleExample.java" />
- <delete>
- <fileset dir="${customtmp.dir}/ch/ethz/mxquery/dmcq/">
- <include name="*.java"/>
- </fileset>
- </delete>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/util/PerfTools.java" />
- <copy file="${midpsrc.dir}/ch/ethz/mxquery/functions/fn/String_Length.java" todir="${customtmp.dir}/ch/ethz/mxquery/functions/fn/" overwrite="yes"/>
- <copy file="${midpsrc.dir}/ch/ethz/mxquery/functions/fn/SubString.java" todir="${customtmp.dir}/ch/ethz/mxquery/functions/fn/" overwrite="yes"/>
- <copy file="${midpsrc.dir}/ch/ethz/mxquery/functions/fn/StringToCodepoints.java" todir="${customtmp.dir}/ch/ethz/mxquery/functions/fn/" overwrite="yes"/>
- <copy file="${midpsrc.dir}/ch/ethz/mxquery/functions/fn/Translate.java" todir="${customtmp.dir}/ch/ethz/mxquery/functions/fn/" overwrite="yes" />
- <copy file="${midpsrc.dir}/ch/ethz/mxquery/sms/MMimpl/TokenBufferStore.java" todir="${customtmp.dir}/ch/ethz/mxquery/sms/MMimpl/" overwrite="yes" />
- <copy file="${midpsrc.dir}/ch/ethz/mxquery/sms/StoreFactory.java" todir="${customtmp.dir}/ch/ethz/mxquery/sms/" overwrite="yes" />
+ <delete file="${customtmp.dir}/examples/StreamExample.java" />
+ <delete file="${customtmp.dir}/examples/StreamStatsDemo.java" />
+ <delete file="${customtmp.dir}/examples/StreamLifecycleExample.java" />
+ <delete>
+ <fileset dir="${customtmp.dir}/ch/ethz/mxquery/dmcq/">
+ <include name="*.java"/>
+ </fileset>
+ </delete>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/util/PerfTools.java" />
+ <copy file="${midpsrc.dir}/ch/ethz/mxquery/functions/fn/String_Length.java" todir="${customtmp.dir}/ch/ethz/mxquery/functions/fn/" overwrite="yes"/>
+ <copy file="${midpsrc.dir}/ch/ethz/mxquery/functions/fn/SubString.java" todir="${customtmp.dir}/ch/ethz/mxquery/functions/fn/" overwrite="yes"/>
+ <copy file="${midpsrc.dir}/ch/ethz/mxquery/functions/fn/StringToCodepoints.java" todir="${customtmp.dir}/ch/ethz/mxquery/functions/fn/" overwrite="yes"/>
+ <copy file="${midpsrc.dir}/ch/ethz/mxquery/functions/fn/Translate.java" todir="${customtmp.dir}/ch/ethz/mxquery/functions/fn/" overwrite="yes" />
+ <copy file="${midpsrc.dir}/ch/ethz/mxquery/sms/MMimpl/TokenBufferStore.java" todir="${customtmp.dir}/ch/ethz/mxquery/sms/MMimpl/" overwrite="yes" />
+ <copy file="${midpsrc.dir}/ch/ethz/mxquery/sms/StoreFactory.java" todir="${customtmp.dir}/ch/ethz/mxquery/sms/" overwrite="yes" />
- <copy file="${midpsrc.dir}/ch/ethz/mxquery/bindings/WindowBuffer.java" todir="${customtmp.dir}/ch/ethz/mxquery/bindings/" overwrite="yes" />
- <copy file="${altsrc.dir}/ch/ethz/mxquery/util/PlatformDependentUtils.java" todir="${customtmp.dir}/ch/ethz/mxquery/util" overwrite="yes" />
- <copy file="${altsrc.dir}/ch/ethz/mxquery/datamodel/MXQueryFloat.java" todir="${customtmp.dir}/ch/ethz/mxquery/datamodel" overwrite="yes" />
- <copy file="${altsrc.dir}/ch/ethz/mxquery/datamodel/MXQueryBigDecimal.java" todir="${customtmp.dir}/ch/ethz/mxquery/datamodel" overwrite="yes" />
- <copy file="${altsrc.dir}/ch/ethz/mxquery/query/impl/CompilerImpl.java" todir="${customtmp.dir}/ch/ethz/mxquery/query/impl" overwrite="yes" />
- <copy file="${altsrc.dir}/ch/ethz/mxquery/xdmio/xmlAdapters/NonValidatingDOMAdapter.java" todir="${customtmp.dir}/ch/ethz/mxquery/xdmio/xmlAdapters/" overwrite="yes" />
- <copy file="${altsrc.dir}/ch/ethz/mxquery/functions/math/TransMath.java" todir="${customtmp.dir}/ch/ethz/mxquery/functions/math" overwrite="yes" />
- <copy file="${altsrc.dir}/ch/ethz/mxquery/functions/fn/Matches.java" todir="${customtmp.dir}/ch/ethz/mxquery/functions/fn/" overwrite="yes" />
+ <copy file="${midpsrc.dir}/ch/ethz/mxquery/bindings/WindowBuffer.java" todir="${customtmp.dir}/ch/ethz/mxquery/bindings/" overwrite="yes" />
+ <copy file="${altsrc.dir}/ch/ethz/mxquery/util/PlatformDependentUtils.java" todir="${customtmp.dir}/ch/ethz/mxquery/util" overwrite="yes" />
+ <copy file="${altsrc.dir}/ch/ethz/mxquery/datamodel/MXQueryFloat.java" todir="${customtmp.dir}/ch/ethz/mxquery/datamodel" overwrite="yes" />
+ <copy file="${altsrc.dir}/ch/ethz/mxquery/datamodel/MXQueryBigDecimal.java" todir="${customtmp.dir}/ch/ethz/mxquery/datamodel" overwrite="yes" />
+ <copy file="${altsrc.dir}/ch/ethz/mxquery/query/impl/CompilerImpl.java" todir="${customtmp.dir}/ch/ethz/mxquery/query/impl" overwrite="yes" />
+ <copy file="${altsrc.dir}/ch/ethz/mxquery/xdmio/xmlAdapters/NonValidatingDOMAdapter.java" todir="${customtmp.dir}/ch/ethz/mxquery/xdmio/xmlAdapters/" overwrite="yes" />
+ <copy file="${altsrc.dir}/ch/ethz/mxquery/functions/math/TransMath.java" todir="${customtmp.dir}/ch/ethz/mxquery/functions/math" overwrite="yes" />
+ <copy file="${altsrc.dir}/ch/ethz/mxquery/functions/fn/Matches.java" todir="${customtmp.dir}/ch/ethz/mxquery/functions/fn/" overwrite="yes" />
<depend srcdir="${customtmp.dir}"
@@ -234,7 +226,7 @@
closure="yes"
/>
- <javac source="${src.version}"
+ <javac source="${src.version}"
srcdir="${customtmp.dir}"
destdir="${build.dir}"
target="1.4"
@@ -244,115 +236,92 @@
includeAntRuntime="false"
extdirs=""
/>
- </target>
-
+ </target>
+
<target name="jar" depends="compile">
<echo message="Creating jar archive..."/>
- <unjar src="${resources.dir}/kxml2-min-2.3.0.jar" dest="${build.dir}">
- </unjar>
- <unjar src="${resources.dir}/xmlpull_1_1_3_4c.jar" dest="${build.dir}">
- </unjar>
- <unjar src="${resources.dir}/xercesImpl.jar" dest="${build.dir}">
- </unjar>
- <unjar src="${resources.dir}/tagsoup-1.2.jar" dest="${build.dir}">
- </unjar>
- <unjar src="${resources.dir}/xqjapi.jar" dest="${build.dir}">
- </unjar>
- <unjar src="${resources.dir}/commons-cli-1.2.jar" dest="${build.dir}">
- </unjar>
+ <unjar src="${resources.dir}/kxml2-min-2.3.0.jar" dest="${build.dir}"></unjar>
+ <unjar src="${resources.dir}/xmlpull_1_1_3_4c.jar" dest="${build.dir}"></unjar>
+ <unjar src="${resources.dir}/xercesImpl.jar" dest="${build.dir}"></unjar>
+ <unjar src="${resources.dir}/tagsoup-1.2.jar" dest="${build.dir}"></unjar>
+ <unjar src="${resources.dir}/xqjapi.jar" dest="${build.dir}"></unjar>
+ <unjar src="${resources.dir}/commons-cli-1.2.jar" dest="${build.dir}"></unjar>
<jar jarfile="${dist.dir}/mxquery.jar">
<fileset dir="${build.dir}" excludes="examples/**/*.*"/>
<fileset dir="${src.dir}" includes="ch/**/*.xq"/>
- <fileset dir="${src.dir}" includes="ch/**/*.xml"/>
+ <fileset dir="${src.dir}" includes="ch/**/*.xml"/>
<fileset dir="${src.dir}" includes="ch/**/*.txt"/>
<fileset dir="${src.dir}" includes="**/*.servlet"/>
<fileset dir="${src.dir}" includes="ch/**/*.txt"/>
- <manifest>
- <attribute name="Built-By" value="MXQuery Team at ETH Zurich (in...@mx...)"/>
- <attribute name="Main-Class" value="ch.ethz.mxquery.cmdline.MXQuery"/>
- </manifest>
+ <manifest>
+ <attribute name="Built-By" value="MXQuery Team at ETH Zurich (in...@mx...)"/>
+ <attribute name="Main-Class" value="ch.ethz.mxquery.cmdline.MXQuery"/>
+ </manifest>
</jar>
</target>
<target name="jar-15" depends="compile-15">
<echo message="Creating jar archive..."/>
- <unjar src="${resources.dir}/kxml2-min-2.3.0.jar" dest="${build.dir}">
- </unjar>
- <unjar src="${resources.dir}/xmlpull_1_1_3_4c.jar" dest="${build.dir}">
- </unjar>
- <unjar src="${resources.dir}/jax-1_1-fr-qname-class.jar" dest="${build.dir}">
- </unjar>
- <unjar src="${resources.dir}/xercesImpl.jar" dest="${build.dir}">
- </unjar>
- <unjar src="${resources.dir}/jsr173_1.0_api.jar" dest="${build.dir}">
- </unjar>
- <unjar src="${resources.dir}/tagsoup-1.2.jar" dest="${build.dir}">
- </unjar>
- <unjar src="${resources.dir}/xqjapi.jar" dest="${build.dir}">
- </unjar>
- <unjar src="${resources.dir}/commons-cli-1.2.jar" dest="${build.dir}">
- </unjar>
+ <unjar src="${resources.dir}/kxml2-min-2.3.0.jar" dest="${build.dir}"></unjar>
+ <unjar src="${resources.dir}/xmlpull_1_1_3_4c.jar" dest="${build.dir}"></unjar>
+ <unjar src="${resources.dir}/jax-1_1-fr-qname-class.jar" dest="${build.dir}"></unjar>
+ <unjar src="${resources.dir}/xercesImpl.jar" dest="${build.dir}"></unjar>
+ <unjar src="${resources.dir}/jsr173_1.0_api.jar" dest="${build.dir}"></unjar>
+ <unjar src="${resources.dir}/tagsoup-1.2.jar" dest="${build.dir}"></unjar>
+ <unjar src="${resources.dir}/xqjapi.jar" dest="${build.dir}"></unjar>
+ <unjar src="${resources.dir}/commons-cli-1.2.jar" dest="${build.dir}"></unjar>
<jar jarfile="${dist.dir}/mxquery-15.jar">
<fileset dir="${build.dir}" excludes="examples/**/*.*"/>
<fileset dir="${src.dir}" includes="ch/**/*.xq"/>
- <fileset dir="${src.dir}" includes="ch/**/*.xml"/>
+ <fileset dir="${src.dir}" includes="ch/**/*.xml"/>
<fileset dir="${src.dir}" includes="ch/**/*.txt"/>
- <manifest>
- <attribute name="Built-By" value="MXQuery Team at ETH Zurich (in...@mx...)"/>
- <attribute name="Main-Class" value="ch.ethz.mxquery.cmdline.MXQuery"/>
- </manifest>
-
-
+ <manifest>
+ <attribute name="Built-By" value="MXQuery Team at ETH Zurich (in...@mx...)"/>
+ <attribute name="Main-Class" value="ch.ethz.mxquery.cmdline.MXQuery"/>
+ </manifest>
+
+
</jar>
- </target>
+ </target>
<target name="jar-14" depends="compile-14">
<echo message="Creating jar archive..."/>
- <unjar src="${resources.dir}/kxml2-min-2.3.0.jar" dest="${build.dir}">
- </unjar>
- <unjar src="${resources.dir}/xml-apis.jar" dest="${build.dir}">
- </unjar>
- <unjar src="${resources.dir}/xercesImpl.jar" dest="${build.dir}">
- </unjar>
- <unjar src="${resources.dir}/xmlpull_1_1_3_4c.jar" dest="${build.dir}">
- </unjar>
- <unjar src="${resources.dir}/jax-1_1-fr-qname-class.jar" dest="${build.dir}">
- </unjar>
- <unjar src="${resources.dir}/jsr173_1.0_api.jar" dest="${build.dir}">
- </unjar>
- <unjar src="${resources.dir}/tagsoup-1.2.jar" dest="${build.dir}">
- </unjar>
- <unjar src="${resources.dir}/xqjapi.jar" dest="${build.dir}">
- </unjar>
- <unjar src="${resources.dir}/commons-cli-1.2.jar" dest="${build.dir}">
- </unjar>
+ <unjar src="${resources.dir}/kxml2-min-2.3.0.jar" dest="${build.dir}"></unjar>
+ <unjar src="${resources.dir}/xml-apis.jar" dest="${build.dir}"></unjar>
+ <unjar src="${resources.dir}/xercesImpl.jar" dest="${build.dir}"></unjar>
+ <unjar src="${resources.dir}/xmlpull_1_1_3_4c.jar" dest="${build.dir}"></unjar>
+ <unjar src="${resources.dir}/jax-1_1-fr-qname-class.jar" dest="${build.dir}"></unjar>
+ <unjar src="${resources.dir}/jsr173_1.0_api.jar" dest="${build.dir}"></unjar>
+ <unjar src="${resources.dir}/tagsoup-1.2.jar" dest="${build.dir}"></unjar>
+ <unjar src="${resources.dir}/xqjapi.jar" dest="${build.dir}"></unjar>
+ <unjar src="${resources.dir}/commons-cli-1.2.jar" dest="${build.dir}"></unjar>
<jar jarfile="${dist.dir}/mxquery-14.jar">
<fileset dir="${build.dir}" excludes="examples/**/*.*"/>
<fileset dir="${src.dir}" includes="ch/**/*.xq"/>
- <fileset dir="${src.dir}" includes="ch/**/*.xml"/>
+ <fileset dir="${src.dir}" includes="ch/**/*.xml"/>
<fileset dir="${src.dir}" includes="ch/**/*.txt"/>
- <manifest>
- <attribute name="Built-By" value="MXQuery Team at ETH Zurich (in...@mx...)"/>
- <attribute name="Main-Class" value="ch.ethz.mxquery.cmdline.MXQuery"/>
- </manifest>
+ <manifest>
+ <attribute name="Built-By" value="MXQuery Team at ETH Zurich (in...@mx...)"/>
+ <attribute name="Main-Class" value="ch.ethz.mxquery.cmdline.MXQuery"/>
+ </manifest>
</jar>
- </target>
-
+ </target>
+
<target name="war" depends="jar">
<echo message="Creating the SOAP Server war ... "/>
<mkdir dir="${war.dir}"/>
- <delete>
- <fileset dir="${war.dir}/">
- <include name="**/*"/>
- </fileset>
- </delete>
+ <delete>
+ <fileset dir="${war.dir}/">
+ <include name="**/*"/>
+ </fileset>
+ </delete>
<mkdir dir="${webinf.dir}"/>
<mkdir dir="${weblib.dir}"/>
<mkdir dir="${webclasses.dir}"/>
<mkdir dir="${servlet.dir}}"/>
- <mkdir dir="${utilservlet.dir}}"/>
+ <mkdir dir="${utilservlet.dir}}"/>
<copy file="${build.dir}/ch/ethz/mxquery/query/webservice/MultipleXQueryServer.class" todir="${servlet.dir}"/>
<copy file="${build.dir}/ch/ethz/mxquery/query/webservice/SingleXQueryServer.class" todir="${servlet.dir}"/>
<copy file="${build.dir}/ch/ethz/mxquery/util/MultipleSchemaExposer.class" todir="${utilservlet.dir}"/>
@@ -360,169 +329,160 @@
<copy file="${src.dir}/ch/ethz/mxquery/query/webservice/web.xml" todir="${webinf.dir}"/>
<copy file="${src.dir}/ch/ethz/mxquery/query/webservice/index.html" todir="${war.dir}"/>
<copy file="${dist.dir}/mxquery.jar" todir="${weblib.dir}"/>
- <copy todir="${war.dir}">
- <fileset dir="${modules.dir}"/>
- </copy>
+ <copy todir="${war.dir}"><fileset dir="${modules.dir}"/></copy>
<jar jarfile="${dist.dir}/MXQuery.war">
- <fileset dir="${war.dir}" includes="**/*.*"/>
- <manifest>
- <attribute name="Built-By" value="MXQuery Team at ETH Zurich (in...@mx...)"/>
- </manifest>
- </jar>
+ <fileset dir="${war.dir}" includes="**/*.*"/>
+ <manifest>
+ <attribute name="Built-By" value="MXQuery Team at ETH Zurich (in...@mx...)"/>
+ </manifest>
+ </jar>
</target>
-
-
+
+
<target name="xsp" depends="war">
<echo message="Creating the XSP war ... "/>
<mkdir dir="${war.dir}"/>
- <delete>
- <fileset dir="${war.dir}/">
- <include name="**/*"/>
- </fileset>
- </delete>
+ <delete>
+ <fileset dir="${war.dir}/">
+ <include name="**/*"/>
+ </fileset>
+ </delete>
<mkdir dir="${webinf.dir}"/>
<mkdir dir="${weblib.dir}"/>
<mkdir dir="${servlet.dir}}"/>
- <mkdir dir="${utilservlet.dir}}"/>
+ <mkdir dir="${utilservlet.dir}}"/>
<copy file="${build.dir}/ch/ethz/mxquery/query/webservice/XSPMain.class" todir="${utilservlet.dir}"/>
<copy file="${dist.dir}/mxquery.jar" todir="${weblib.dir}"/>
- <copy todir="${war.dir}">
- <fileset dir="${xspcontent.dir}"/>
- </copy>
+ <copy todir="${war.dir}"><fileset dir="${xspcontent.dir}"/></copy>
<jar jarfile="${dist.dir}/XSP.war">
- <fileset dir="${war.dir}" includes="**/*.*"/>
- <manifest>
- <attribute name="Built-By" value="MXQuery Team at ETH Zurich (in...@mx...)"/>
- </manifest>
- </jar>
+ <fileset dir="${war.dir}" includes="**/*.*"/>
+ <manifest>
+ <attribute name="Built-By" value="MXQuery Team at ETH Zurich (in...@mx...)"/>
+ </manifest>
+ </jar>
</target>
-
+
<target name="midp_prepare" depends="clean">
- <echo message="Merging source trees"/>
- <delete>
- <fileset dir="${midptmp.dir}/">
- <include name="**/*"/>
- </fileset>
- </delete>
- <copy todir="${midptmp.dir}">
- <fileset dir="${src.dir}"/>
- </copy>
- <copy todir="${midptmp.dir}" overwrite="yes">
- <fileset dir="${midpsrc.dir}"/>
- </copy>
- <echo message="Removing unsupported classes"/>
-
- <delete dir="${midptmp.dir}/ch/ethz/mxquery/parallel/"/>
+ <echo message="Merging source trees"/>
+ <delete>
+ <fileset dir="${midptmp.dir}/">
+ <include name="**/*"/>
+ </fileset>
+ </delete>
+ <copy todir="${midptmp.dir}"><fileset dir="${src.dir}"/></copy>
+ <copy todir="${midptmp.dir}" overwrite="yes"><fileset dir="${midpsrc.dir}"/></copy>
+ <echo message="Removing unsupported classes"/>
+
+ <delete dir="${midptmp.dir}/ch/ethz/mxquery/parallel/"/>
<delete dir="${midptmp.dir}/javax/"/>
<delete dir="${midptmp.dir}/org/tartarus"/>
<delete dir="${midptmp.dir}/com/"/>
- <delete dir="${midptmp.dir}/ch/ethz/mxquery/xqj/"/>
- <delete dir="${midptmp.dir}/ch/ethz/mxquery/opt/expr"/>
- <delete dir="${midptmp.dir}/ch/ethz/mxquery/opt/index"/>
- <delete dir="${midptmp.dir}/ch/ethz/mxquery/query/optimizer"/>
-
- <delete>
- <fileset dir="${midptmp.dir}/ch/ethz/mxquery/sms/MMimpl/">
- <include name="*.java"/>
- <exclude name="TokenBufferStore.java"/>
- <exclude name="MaterializingTokenBufferStore.java"/>
- </fileset>
- </delete>
- <delete>
- <fileset dir="${midptmp.dir}/examples">
- <include name="*.java"/>
- </fileset>
- </delete>
- <delete>
+ <delete dir="${midptmp.dir}/ch/ethz/mxquery/xqj/"/>
+ <delete dir="${midptmp.dir}/ch/ethz/mxquery/opt/expr"/>
+ <delete dir="${midptmp.dir}/ch/ethz/mxquery/opt/index"/>
+ <delete dir="${midptmp.dir}/ch/ethz/mxquery/query/optimizer"/>
+
+ <delete>
+ <fileset dir="${midptmp.dir}/ch/ethz/mxquery/sms/MMimpl/">
+ <include name="*.java"/>
+ <exclude name="TokenBufferStore.java"/>
+ <exclude name="MaterializingTokenBufferStore.java"/>
+ </fileset>
+ </delete>
+ <delete>
+ <fileset dir="${midptmp.dir}/examples">
+ <include name="*.java"/>
+ </fileset>
+ </delete>
+ <delete>
<fileset dir="${midptmp.dir}/ch/ethz/mxquery/cmdline">
<include name="*.java"/>
</fileset>
- </delete>
+ </delete>
- <delete>
- <fileset dir="${midptmp.dir}/ch/ethz/mxquery/extensionsModules" id="id">
+ <delete>
+ <fileset dir="${midptmp.dir}/ch/ethz/mxquery/extensionsModules" id="id">
<include name="**/*.java"/>
- <exclude name="ExtensionModulesConfig.java"/>
- <exclude name="zorbaRest/HttpIO.java"/>
- </fileset>
- </delete>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/sms/activeStore/ReadThreadUpdate.java" />
- <delete file="${midptmp.dir}/ch/ethz/mxquery/sms/activeStore/ReadDataThread.java" />
- <delete file="${midptmp.dir}/ch/ethz/mxquery/sms/interfaces/IndexInterface.java" />
- <delete file="${midptmp.dir}/ch/ethz/mxquery/sms/interfaces/IndexRead.java" />
- <delete file="${midptmp.dir}/ch/ethz/mxquery/sms/interfaces/IndexUpdate.java" />
- <delete file="${midptmp.dir}/ch/ethz/mxquery/sms/interfaces/RandomUpdate.java" />
- <delete file="${midptmp.dir}/ch/ethz/mxquery/sms/ftstore/SnowballBasedStemmer.java" />
- <delete>
+ <exclude name="ExtensionModulesConfig.java"/>
+ <exclude name="zorbaRest/HttpIO.java"/>
+ </fileset>
+ </delete>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/sms/activeStore/ReadThreadUpdate.java" />
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/sms/activeStore/ReadDataThread.java" />
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/sms/interfaces/IndexInterface.java" />
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/sms/interfaces/IndexRead.java" />
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/sms/interfaces/IndexUpdate.java" />
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/sms/interfaces/RandomUpdate.java" />
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/sms/ftstore/SnowballBasedStemmer.java" />
+ <delete>
<fileset dir="${midptmp.dir}/ch/ethz/mxquery/dmcq/">
<include name="*.java"/>
</fileset>
- </delete>
- <delete file="${customtmp.dir}/ch/ethz/mxquery/util/PerfTools.java" />
- <delete file="${midptmp.dir}/ch/ethz/mxquery/iterators/GroupByIndexIterator.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/iterators/DirectXMLIterator.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/iterators/PFFLWORIterator.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/iterators/PGFLWORIterator.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/iterators/PGroupBy.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/iterators/CommandLineInIterator.java"/>
- <delete file="${xqibtmp.dir}/ch/ethz/mxquery/iterators/NativeFuncCall.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/iterators/forseq/ForseqWindowIndexIterator.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/iterators/forseq/ForseqWindowEarlyBinding.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/iterators/forseq/ForseqWindowEarlyBindingParallel.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/util/UnicodeInputStrea...
[truncated message content] |
|
From: <et...@us...> - 2012-02-06 21:12:53
|
Revision: 4513
http://mxquery.svn.sourceforge.net/mxquery/?rev=4513&view=rev
Author: etterth
Date: 2012-02-06 21:12:47 +0000 (Mon, 06 Feb 2012)
Log Message:
-----------
- Fail the build if the GWT compilation fails
Modified Paths:
--------------
trunk/MXQuery/build.xml
Modified: trunk/MXQuery/build.xml
===================================================================
--- trunk/MXQuery/build.xml 2012-02-06 17:29:43 UTC (rev 4512)
+++ trunk/MXQuery/build.xml 2012-02-06 21:12:47 UTC (rev 4513)
@@ -805,7 +805,7 @@
<echo message="Compiling with GWT..."/>
- <java classpathref="run.MXQueryJS.classpath" fork="true"
+ <java classpathref="run.MXQueryJS.classpath" fork="true" failonerror="true"
classname="com.google.gwt.dev.Compiler">
<arg line="-war ${gwt_war.dir}/"/>
<arg line="-style OBFUSCATED"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pm_...@us...> - 2012-02-07 09:34:56
|
Revision: 4527
http://mxquery.svn.sourceforge.net/mxquery/?rev=4527&view=rev
Author: pm_fischer
Date: 2012-02-07 09:34:46 +0000 (Tue, 07 Feb 2012)
Log Message:
-----------
remove Projection STaX adapter from MIDP
Modified Paths:
--------------
trunk/MXQuery/build.xml
Modified: trunk/MXQuery/build.xml
===================================================================
--- trunk/MXQuery/build.xml 2012-02-07 09:21:35 UTC (rev 4526)
+++ trunk/MXQuery/build.xml 2012-02-07 09:34:46 UTC (rev 4527)
@@ -465,6 +465,7 @@
<delete file="${midptmp.dir}/ch/ethz/mxquery/xdmio/xmlAdapters/NonSchemaValidatingSaxImportAdapter.java"/>
<delete file="${midptmp.dir}/ch/ethz/mxquery/xdmio/xmlAdapters/NonValidatingDOMAdapter.java"/>
<delete file="${midptmp.dir}/ch/ethz/mxquery/xdmio/xmlAdapters/NonValidatingStaxAdapter.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/xdmio/xmlAdapters/NonValidatingStaxAdapterProjection.java"/>
<delete file="${midptmp.dir}/ch/ethz/mxquery/query/webservice/MultipleXQueryServer.java"/>
<delete file="${midptmp.dir}/ch/ethz/mxquery/query/webservice/SingleXQueryServer.java"/>
<delete file="${midptmp.dir}/ch/ethz/mxquery/query/webservice/XSPMain.java"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pm_...@us...> - 2012-02-08 17:01:20
|
Revision: 4530
http://mxquery.svn.sourceforge.net/mxquery/?rev=4530&view=rev
Author: pm_fischer
Date: 2012-02-08 17:01:07 +0000 (Wed, 08 Feb 2012)
Log Message:
-----------
restore building on Android
Modified Paths:
--------------
trunk/MXQuery/build.xml
Modified: trunk/MXQuery/build.xml
===================================================================
--- trunk/MXQuery/build.xml 2012-02-08 16:19:00 UTC (rev 4529)
+++ trunk/MXQuery/build.xml 2012-02-08 17:01:07 UTC (rev 4530)
@@ -1116,6 +1116,7 @@
<delete>
<fileset dir="${androidtmp.dir}/ch/ethz/mxquery/xdmio/xmlAdapters/">
<include name="NonValidatingStaxAdapter.java"/>
+ <include name="NonValidatingStaxAdapterProjection.java"/>
<include name="Token2StaxAdapter.java"/>
</fileset>
</delete>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X