diff --git a/Rakefile b/Rakefile index 6af9fec49..7ce6b697a 100644 --- a/Rakefile +++ b/Rakefile @@ -339,8 +339,7 @@ if defined?(RUBY_ENGINE) and RUBY_ENGINE == 'jruby' myruby '-S', 'testrb', '-Ilib', *Dir['tests/*.rb'] end - desc "Create parser jar" - task :create_parser_jar => :compile_jruby do + file JRUBY_PARSER_JAR => :compile_jruby do cd 'java/src' do parser_classes = FileList[ "json/ext/ByteListTranscoder*.class", @@ -355,8 +354,10 @@ if defined?(RUBY_ENGINE) and RUBY_ENGINE == 'jruby' end end - desc "Create generator jar" - task :create_generator_jar => :compile_jruby do + desc "Create parser jar" + task :create_parser_jar => JRUBY_PARSER_JAR + + file JRUBY_GENERATOR_JAR => :compile_jruby do cd 'java/src' do generator_classes = FileList[ "json/ext/ByteListTranscoder*.class", @@ -371,6 +372,9 @@ if defined?(RUBY_ENGINE) and RUBY_ENGINE == 'jruby' end end + desc "Create generator jar" + task :create_generator_jar => JRUBY_GENERATOR_JAR + desc "Create parser and generator jars" task :create_jar => [ :create_parser_jar, :create_generator_jar ] diff --git a/build.xml b/build.xml deleted file mode 100644 index 7c8820e58..000000000 --- a/build.xml +++ /dev/null @@ -1,80 +0,0 @@ - - - Builds, tests, and runs the project JSON-JRuby. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml deleted file mode 100644 index 1ddf7e809..000000000 --- a/nbproject/build-impl.xml +++ /dev/null @@ -1,805 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must set src.dir - Must set test.src.dir - Must set build.dir - Must set dist.dir - Must set build.classes.dir - Must set dist.javadoc.dir - Must set build.test.classes.dir - Must set build.test.results.dir - Must set build.classes.excludes - Must set dist.jar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must set javac.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select some files in the IDE or set javac.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - To run this application from the command line without Ant, try: - - - - - - - java -cp "${run.classpath.with.dist.jar}" ${main.class} - - - - - - - - - - - - - - - - - - - - - - - To run this application from the command line without Ant, try: - - java -jar "${dist.jar.resolved}" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select one file in the IDE or set run.class - - - - Must select one file in the IDE or set run.class - - - - - - - - - - - - - - - - - - - - - - - Must select one file in the IDE or set debug.class - - - - - Must select one file in the IDE or set debug.class - - - - - Must set fix.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select some files in the IDE or set javac.includes - - - - - - - - - - - - - - - - - - - - Some tests failed; see details above. - - - - - - - - - Must select some files in the IDE or set test.includes - - - - Some tests failed; see details above. - - - - - Must select one file in the IDE or set test.class - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select one file in the IDE or set applet.url - - - - - - - - - Must select one file in the IDE or set applet.url - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties deleted file mode 100644 index a9c62d4ac..000000000 --- a/nbproject/genfiles.properties +++ /dev/null @@ -1,8 +0,0 @@ -build.xml.data.CRC32=82862954 -build.xml.script.CRC32=4ee68ef3 -build.xml.stylesheet.CRC32=be360661 -# 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=82862954 -nbproject/build-impl.xml.script.CRC32=7ab44279 -nbproject/build-impl.xml.stylesheet.CRC32=576378a2@1.32.1.45 diff --git a/nbproject/project.properties b/nbproject/project.properties deleted file mode 100644 index e19917219..000000000 --- a/nbproject/project.properties +++ /dev/null @@ -1,70 +0,0 @@ -application.homepage=http://json-jruby.rubyforge.org/ -application.title=JSON-JRuby -application.vendor=mernen -build.classes.dir=${build.dir}/classes -build.classes.excludes=**/*.java,**/*.form -# This directory is removed when the project is cleaned: -build.dir=build -build.generated.sources.dir=${build.dir}/generated-sources -endorsed.classpath= -jaxbwiz.endorsed.dirs="${netbeans.home}/../ide12/modules/ext/jaxb/api" -lib.dir=lib -jruby.dir=../jruby -build.generated.dir=${build.dir}/generated -generator.jar=${lib.dir}/json/ext/generator.jar -parser.jar=${lib.dir}/json/ext/parser.jar -# Only compile against the classpath explicitly listed here: -build.sysclasspath=ignore -build.test.classes.dir=${build.dir}/test/classes -build.test.results.dir=${build.dir}/test/results -debug.classpath=\ - ${run.classpath} -debug.test.classpath=\ - ${run.test.classpath} -# This directory is removed when the project is cleaned: -dist.dir=dist -dist.jar=${dist.dir}/ext.jar -dist.javadoc.dir=${dist.dir}/javadoc -excludes= -file.reference.bytelist.jar=${jruby.dir}/build_lib/bytelist.jar -includes=** -jar.compress=false -javac.classpath=\ - ${file.reference.bytelist.jar}:\ - ${libs.Byelist.classpath}:\ - ${libs.Constantine.classpath}:\ - ${libs.JCodings.classpath} -# Space-separated list of extra javac options -javac.compilerargs=-Xlint -Xlint:-serial -javac.deprecation=true -javac.source=1.5 -javac.target=1.5 -javac.test.classpath=\ - ${javac.classpath}:\ - ${build.classes.dir} -javadoc.additionalparam= -javadoc.author=false -javadoc.encoding=${source.encoding} -javadoc.noindex=false -javadoc.nonavbar=false -javadoc.notree=false -javadoc.private=false -javadoc.splitindex=true -javadoc.use=true -javadoc.version=false -javadoc.windowtitle= -meta.inf.dir=${src.dir}/META-INF -platform.active=default_platform -run.classpath=\ - ${javac.classpath}:\ - ${build.classes.dir} -# Space-separated list of JVM arguments used when running the project -# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value -# or test-sys-prop.name=value to set system properties for unit tests): -run.jvmargs= -run.test.classpath=\ - ${javac.test.classpath}:\ - ${build.test.classes.dir} -source.encoding=UTF-8 -src.dir=src -test.src.dir=test diff --git a/nbproject/project.xml b/nbproject/project.xml deleted file mode 100644 index 7a9c7315b..000000000 --- a/nbproject/project.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - org.netbeans.modules.java.j2seproject - - - JSON-JRuby - 1.6.5 - - - - - - - - -