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
Show file tree
Hide file tree
Changes from all commits
Commits
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
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
8 changes: 6 additions & 2 deletions performance/xsbdrivers/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
<!-- You may freely edit this file. See commented blocks below for -->
<!-- some examples of how to customize the build. -->
<!-- (If you delete it and reopen the project it will be recreated.) -->
<!-- By default, only the Clean and Build commands use this build script. -->
<!-- Commands such as Run, Debug, and Test only use this build script if -->
<!-- the Compile on Save feature is turned off for the project. -->
<!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
<!-- in the project's Project Properties dialog box.-->
<project name="xsbdrivers" default="default" basedir=".">
<description>Builds, tests, and runs the project xsbdrivers.</description>
<import file="nbproject/build-impl.xml"/>
Expand Down Expand Up @@ -46,8 +51,7 @@
-init-macrodef-junit: defines macro for junit execution
-init-macrodef-debug: defines macro for class debugging
-init-macrodef-java: defines macro for class execution
-do-jar-with-manifest: JAR building (if you are using a manifest)
-do-jar-without-manifest: JAR building (if you are not using a manifest)
-do-jar: JAR building
run: execution of project
-javadoc-build: Javadoc generation
test-report: JUnit report generation
Expand Down
Binary file added performance/xsbdrivers/lib/ant-1.9.8.jar
Binary file not shown.
Binary file added performance/xsbdrivers/lib/stax-ex-1.8.jar
Binary file not shown.
1,351 changes: 1,121 additions & 230 deletions performance/xsbdrivers/nbproject/build-impl.xml

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions performance/xsbdrivers/nbproject/genfiles.properties
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
build.xml.data.CRC32=ef74613c
build.xml.script.CRC32=e18abc43
build.xml.stylesheet.CRC32=d5b6853a
build.xml.script.CRC32=e1acd32e
build.xml.stylesheet.CRC32=8064a381@1.80.1.48
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
nbproject/build-impl.xml.data.CRC32=ef74613c
nbproject/build-impl.xml.script.CRC32=bb7d3f29
nbproject/build-impl.xml.stylesheet.CRC32=99b91518
nbproject/build-impl.xml.script.CRC32=380565bf
nbproject/build-impl.xml.stylesheet.CRC32=830a3534@1.80.1.48
23 changes: 15 additions & 8 deletions performance/xsbdrivers/nbproject/project.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
annotation.processing.enabled=true
annotation.processing.enabled.in.editor=false
annotation.processing.processors.list=
annotation.processing.run.all.processors=true
application.args=
build.classes.dir=${build.dir}/classes
build.classes.excludes=**/*.java,**/*.form
Expand All @@ -15,16 +19,17 @@ debug.test.classpath=\
dist.dir=dist
dist.jar=${dist.dir}/xsbdrivers.jar
dist.javadoc.dir=${dist.dir}/javadoc
endorsed.classpath=
excludes=
file.reference.activation.jar=lib/activation.jar
file.reference.japex.jar=lib/japex.jar
file.reference.jaxb-api.jar=lib/jaxb-api.jar
file.reference.jaxb-impl.jar=lib/jaxb-impl.jar
file.reference.jcommon-1.0.0-rc1.jar=lib/jcommon-1.0.0-rc1.jar
file.reference.jdsl.jar=lib/jdsl.jar
file.reference.jfreechart-1.0.0-rc1.jar=lib/jfreechart-1.0.0-rc1.jar
file.reference.jsr173_api.jar=../../streambuffer/lib/jsr173_api.jar
file.reference.sjsxp.jar=../../streambuffer/lib/sjsxp.jar
file.reference.stax-ex.jar=../../streambuffer/lib/stax-ex.jar
file.reference.stax-ex.jar=lib/stax-ex-1.8.jar
includes=**
jar.compress=false
javac.classpath=\
${file.reference.activation.jar}:\
Expand All @@ -35,14 +40,15 @@ javac.classpath=\
${file.reference.jcommon-1.0.0-rc1.jar}:\
${file.reference.jfreechart-1.0.0-rc1.jar}:\
${reference.streambuffer.jar}:\
${file.reference.jsr173_api.jar}:\
${file.reference.sjsxp.jar}:\
${file.reference.stax-ex.jar}
# Space-separated list of extra javac options
javac.compilerargs=
javac.deprecation=false
javac.source=1.5
javac.target=1.5
javac.external.vm=false
javac.processorpath=\
${javac.classpath}
javac.source=1.8
javac.target=1.8
javac.test.classpath=\
${javac.classpath}:\
${build.classes.dir}:\
Expand All @@ -58,9 +64,10 @@ javadoc.splitindex=true
javadoc.use=true
javadoc.version=false
javadoc.windowtitle=
mkdist.disabled=false
platform.active=default_platform
project.streambuffer=../../streambuffer
reference.streambuffer.jar=${project.streambuffer}/dist/streambuffer.jar
reference.streambuffer.jar=${project.streambuffer}/target/streambuffer-1.5.5-SNAPSHOT.jar
run.classpath=\
${javac.classpath}:\
${build.classes.dir}
Expand Down
8 changes: 6 additions & 2 deletions roundtriptest/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
<!-- You may freely edit this file. See commented blocks below for -->
<!-- some examples of how to customize the build. -->
<!-- (If you delete it and reopen the project it will be recreated.) -->
<!-- By default, only the Clean and Build commands use this build script. -->
<!-- Commands such as Run, Debug, and Test only use this build script if -->
<!-- the Compile on Save feature is turned off for the project. -->
<!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
<!-- in the project's Project Properties dialog box.-->
<project name="roundtriptest" default="default" basedir=".">
<description>Builds, tests, and runs the project roundtriptest.</description>
<import file="nbproject/build-impl.xml"/>
Expand Down Expand Up @@ -46,8 +51,7 @@
-init-macrodef-junit: defines macro for junit execution
-init-macrodef-debug: defines macro for class debugging
-init-macrodef-java: defines macro for class execution
-do-jar-with-manifest: JAR building (if you are using a manifest)
-do-jar-without-manifest: JAR building (if you are not using a manifest)
-do-jar: JAR building
run: execution of project
-javadoc-build: Javadoc generation
test-report: JUnit report generation
Expand Down
Binary file added roundtriptest/lib/stax-ex-1.8.jar
Binary file not shown.
Loading