@@ -3,4 +3,5 @@ target **/*.log examples/*/tmp examples/merb/merb.war -examples/rails/rails.war \ No newline at end of file +examples/rails/rails.war +nbproject/private/* \ No newline at end of file .gitignore @@ -313,7 +313,7 @@ is divided into following sections: =================== --> <target depends="init" name="deps-jar" unless="no.deps"> - <ant antfile="${project.JRuby}/build.xml" inheritall="false" target="jar"/> + <ant antfile="${project.JRuby_trunk}/build.xml" inheritall="false" target="jar"/> </target> <target depends="init,deps-jar" name="-pre-pre-compile"> <mkdir dir="${build.classes.dir}"/> @@ -625,8 +625,7 @@ is divided into following sections: =============== --> <target depends="init" name="deps-clean" unless="no.deps"> - <ant antfile="${project.JRuby}/build.xml" inheritall="false" target="clean"/> - <ant antfile="${project.JRuby}/build.xml" inheritall="false" target="clean"/> + <ant antfile="${project.JRuby_trunk}/build.xml" inheritall="false" target="clean"/> </target> <target depends="init" name="-do-clean"> <delete dir="${build.dir}"/> nbproject/build-impl.xml @@ -1,8 +1,8 @@ -build.xml.data.CRC32=63b0d262 +build.xml.data.CRC32=e98221f4 build.xml.script.CRC32=cafd15dc 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=63b0d262 -nbproject/build-impl.xml.script.CRC32=7d4bac5a +nbproject/build-impl.xml.data.CRC32=e98221f4 +nbproject/build-impl.xml.script.CRC32=5fedd2f2 nbproject/build-impl.xml.stylesheet.CRC32=487672f9 nbproject/genfiles.properties @@ -18,18 +18,19 @@ dist.dir=target dist.jar=${dist.dir}/rack.jar dist.javadoc.dir=${dist.dir}/javadoc excludes= +jnlp.codebase.type=local +jnlp.codebase.url=file:/Users/nicksieger/Projects/ruby/jruby-rack/target/ +jnlp.enabled=false +jnlp.offline-allowed=false +jnlp.signed=false maven.repos=${user.home}/.m2/repository file.reference.main-java=src/main/java -file.reference.rack-lib=lib -file.reference.rack-spec=spec file.reference.servlet-api-2.3.jar=${maven.repos}/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar includes=** jar.compress=false javac.classpath=\ - ${reference.JRuby.jar2}:\ - ${reference.JRuby.jar}:\ - ${reference.JRuby.jar.1}:\ - ${file.reference.servlet-api-2.3.jar} + ${file.reference.servlet-api-2.3.jar}:\ + ${reference.JRuby_trunk.jar2} # Space-separated list of extra javac options javac.compilerargs= javac.deprecation=false @@ -37,9 +38,7 @@ javac.source=1.5 javac.target=1.5 javac.test.classpath=\ ${javac.classpath}:\ - ${build.classes.dir}:\ - ${libs.junit.classpath}:\ - ${libs.junit_4.classpath} + ${build.classes.dir} javadoc.additionalparam= javadoc.author=false javadoc.encoding=${source.encoding} @@ -56,10 +55,8 @@ manifest.file=manifest.mf meta.inf.dir=${src.dir}/META-INF no.dependencies=true platform.active=default_platform -project.JRuby=../../trunk/jruby -reference.JRuby.jar=${project.JRuby}/build/classes/jruby -reference.JRuby.jar.1=${project.JRuby}/build/classes/test -reference.JRuby.jar2=${project.JRuby}/lib/jruby.jar +project.JRuby_trunk=../../jruby/trunk/jruby +reference.JRuby_trunk.jar2=${project.JRuby_trunk}/lib/jruby.jar run.classpath=\ ${javac.classpath}:\ ${build.classes.dir} nbproject/project.properties @@ -15,17 +15,9 @@ </data> <references xmlns="http://www.netbeans.org/ns/ant-project-references/2"> <reference> - <foreign-project>JRuby</foreign-project> - <artifact-type>folder</artifact-type> - <script>${project.JRuby}/build.xml</script> - <target>jar</target> - <clean-target>clean</clean-target> - <id>jar</id> - </reference> - <reference> - <foreign-project>JRuby</foreign-project> + <foreign-project>JRuby_trunk</foreign-project> <artifact-type>jar</artifact-type> - <script>${project.JRuby}/build.xml</script> + <script>${project.JRuby_trunk}/build.xml</script> <target>jar</target> <clean-target>clean</clean-target> <id>jar2</id> nbproject/project.xml 0d7d88d6be4c9a90326d747207a8890935b3942f nsieger nsieger@97a6c6ee-731e-0410-87e5-e5612b5efbfe http://github.com/nicksieger/jruby-rack/commit/5ef969e76f12dabfe33bbaa2d4f6fd5f069e7041 5ef969e76f12dabfe33bbaa2d4f6fd5f069e7041 2008-05-20T11:34:41-07:00 2008-05-20T11:34:41-07:00 Gah. NB goo changes every time I reshuffle the src location git-svn-id: https://svn.codehaus.org/jruby-contrib/trunk/rack@166 97a6c6ee-731e-0410-87e5-e5612b5efbfe b94d1797d3b7fe17eea592a131b2f43d5109a258 nsieger nsieger@97a6c6ee-731e-0410-87e5-e5612b5efbfe