Skip to content
This repository was archived by the owner on Oct 1, 2018. It is now read-only.

fix ant build issue #7

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

fix ant build issue #7

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
484a9b7
fix ant build issue
zhengjl May 3, 2018
d9bc7de
update netbeans setting
zhengjl May 4, 2018
d5c8d04
update netbeans setting
zhengjl May 7, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions performance/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@
<fileset dir="${xsbdrivers.dir}" includes="lib/**/*.jar"/>
<fileset dir="${xsbdrivers.dir}" includes="dist/*.jar"/>
<fileset dir="${roundtriptest.dir}" includes="lib/*.jar"/>
<fileset dir="${streambuffer.dir}" includes="lib/*.jar"/>
<fileset dir="${streambuffer.dir}" includes="dist/*.jar"/>
<fileset dir="${streambuffer.dir}" includes="target/*.jar"/>
</path>

<property name="japex.classPath" refid="japex.class.path"/>
Expand All @@ -36,6 +35,7 @@
classname="com.sun.japex.Japex">
<jvmarg value="-server"/>
<jvmarg value="-XX:+UseJumpTables"/>
<jvmarg value="-Djava.endorsed.dirs=./xsbdrivers/lib"/>
<!--
<jvmarg value="-verbose:gc"/>
<jvmarg value="-Xms384m"/>
Expand Down
Binary file added performance/xsbdrivers/lib/ant-1.9.8.jar
View file
Open in desktop
Binary file not shown.
Binary file added performance/xsbdrivers/lib/stax-ex-1.8.jar
View file
Open in desktop
Binary file not shown.
0 ...sbdrivers/lib/xerces.2.7.1/xercesImpl.jar → performance/xsbdrivers/lib/xercesImpl.jar
View file
Open in desktop
File renamed without changes.
10 changes: 8 additions & 2 deletions performance/xsbdrivers/nbproject/build-impl.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,11 @@ is divided into following sections:
-->
<project name="xsbdrivers-impl" default="default" basedir=".." xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:j2seproject2="http://www.netbeans.org/ns/j2se-project/2" xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1">
<target name="default" depends="test,jar,javadoc" description="Build and test whole project."/>
<path id="class.path">
<fileset dir="../../streambuffer" includes="target/*.jar"/>
<fileset dir="./lib" includes="*.jar"/>
</path>
<property name="javac.classPath" refid="class.path"/>
<!--
======================
INITIALIZATION SECTION
Expand Down Expand Up @@ -234,7 +239,7 @@ is divided into following sections:
===================
-->
<target name="deps-jar" depends="init" unless="no.deps">
<ant target="jar" inheritall="false" antfile="${project.streambuffer}/build.xml"/>
<!-- <ant target="jar" inheritall="false" antfile="${project.streambuffer}/build.xml"/>-->
</target>
<target name="-pre-pre-compile" depends="init,deps-jar">
<mkdir dir="${build.classes.dir}"/>
Expand All @@ -244,7 +249,7 @@ is divided into following sections:
<!-- You can override this target in the ../build.xml file. -->
</target>
<target name="-do-compile" depends="init,deps-jar,-pre-pre-compile,-pre-compile" if="have.sources">
<j2seproject3:javac/>
<j2seproject3:javac classpath="${javac.classPath}" />
<copy todir="${build.classes.dir}">
<fileset dir="${src.dir}" excludes="${build.classes.excludes}"/>
</copy>
Expand Down Expand Up @@ -394,6 +399,7 @@ is divided into following sections:
<javadoc destdir="${dist.javadoc.dir}" source="${javac.source}" notree="${javadoc.notree}" use="${javadoc.use}" nonavbar="${javadoc.nonavbar}" noindex="${javadoc.noindex}" splitindex="${javadoc.splitindex}" author="${javadoc.author}" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}" private="${javadoc.private}" additionalparam="${javadoc.additionalparam}" failonerror="true" useexternalfile="true">
<classpath>
<path path="${javac.classpath}"/>
<path refid="class.path"/>
</classpath>
<sourcepath>
<pathelement location="${src.dir}"/>
Expand Down
Binary file added roundtriptest/lib/stax-ex-1.8.jar
View file
Open in desktop
Binary file not shown.
10 changes: 8 additions & 2 deletions roundtriptest/nbproject/build-impl.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,11 @@ is divided into following sections:
-->
<project name="roundtriptest-impl" default="default" basedir=".." xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:j2seproject2="http://www.netbeans.org/ns/j2se-project/2" xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1">
<target name="default" depends="test,jar,javadoc" description="Build and test whole project."/>
<path id="class.path">
<fileset dir="../streambuffer" includes="target/*.jar"/>
<fileset dir="./lib" includes="*.jar"/>
</path>
<property name="javac.classPath" refid="class.path"/>
<!--
======================
INITIALIZATION SECTION
Expand Down Expand Up @@ -234,7 +239,7 @@ is divided into following sections:
===================
-->
<target name="deps-jar" depends="init" unless="no.deps">
<ant target="jar" inheritall="false" antfile="${project.streambuffer}/build.xml"/>
<!--<ant target="jar" inheritall="false" antfile="${project.streambuffer}/build.xml"/>-->
</target>
<target name="-pre-pre-compile" depends="init,deps-jar">
<mkdir dir="${build.classes.dir}"/>
Expand All @@ -244,7 +249,7 @@ is divided into following sections:
<!-- You can override this target in the ../build.xml file. -->
</target>
<target name="-do-compile" depends="init,deps-jar,-pre-pre-compile,-pre-compile" if="have.sources">
<j2seproject3:javac/>
<j2seproject3:javac classpath="${javac.classPath}"/>
<copy todir="${build.classes.dir}">
<fileset dir="${src.dir}" excludes="${build.classes.excludes}"/>
</copy>
Expand Down Expand Up @@ -394,6 +399,7 @@ is divided into following sections:
<javadoc destdir="${dist.javadoc.dir}" source="${javac.source}" notree="${javadoc.notree}" use="${javadoc.use}" nonavbar="${javadoc.nonavbar}" noindex="${javadoc.noindex}" splitindex="${javadoc.splitindex}" author="${javadoc.author}" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}" private="${javadoc.private}" additionalparam="${javadoc.additionalparam}" failonerror="true" useexternalfile="true">
<classpath>
<path path="${javac.classpath}"/>
<path refid="class.path" />
</classpath>
<sourcepath>
<pathelement location="${src.dir}"/>
Expand Down