Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'master' of git@github.com:thatcher/env-js
  • Loading branch information
thatcher committed May 20, 2009
2 parents 7f2fb47 + cc93fab commit 2993b28
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 21 deletions.
4 changes: 2 additions & 2 deletions README
Expand Up @@ -63,5 +63,5 @@ Testing jQuery Compatibility:
* run ./bin/test-jquery.sh 1.3.2
* run ./bin/test-jquery.sh 1.3.1
* run ./bin/test-jquery.sh 1.2.6
* Checks out the given jQuery tag from Subversion into test/vendor/jQuery/[version], moves dist/env.rhino.js into
the correct location in their tree, and runs the test suites.
* Checks out the given jQuery tag from Subversion into test/vendor/jQuery/[version],
moves dist/env.rhino.js into the correct location in their tree, and runs the test suites.
2 changes: 1 addition & 1 deletion Rakefile
Expand Up @@ -4,5 +4,5 @@ task :default => [:test]

task :test do
classpath = [File.join(".", "rhino", "ant.jar"), File.join(".", "rhino", "ant-launcher.jar")].join(File::PATH_SEPARATOR)
exec "java -cp #{classpath} org.apache.tools.ant.Main -emacs test"
exec "java -cp #{classpath} org.apache.tools.ant.Main -emacs all"
end
22 changes: 4 additions & 18 deletions build.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- 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.) -->
<project name="Env" default="default" basedir=".">
<project name="Env" default="all" basedir=".">
<description>Builds, tests, and runs the project Env.</description>
<property name="BUILD_MAJOR" value="0" />
<property name="BUILD_MINOR" value="9" />
Expand Down Expand Up @@ -42,18 +39,7 @@
location="${DIST_DIR}/env.rhino.js"/>

<!-- BUILD TARGETS -->
<target name="default" depends="lint"/>

<target name="all" depends="default"/>

<target name="lint" depends="concat">
<!--java jar="${JSLINT_JAR}" classpath="${RHINO_JAR}" fork="true">
<arg value="${ENV_DIST}" />
</java>
<java jar="${JSLINT_JAR}" classpath="${RHINO_JAR}" fork="true">
<arg value="${ENV_RHINO}" />
</java-->
</target>
<target name="all" depends="concat,test"/>

<target name="concat" description="Main ENV build">
<mkdir dir="${DIST_DIR}" />
Expand Down Expand Up @@ -155,8 +141,8 @@
</target>

<target name="test" description="Run the tests">
<java fork="true" jar="rhino/js.jar">
<arg value="test/test.js"/>
<java fork="true" jar="rhino/js.jar" failonerror="true">
<arg value="test/test.js"/>
<jvmarg value="-Dfile.encoding=utf-8"/>
</java>
</target>
Expand Down

0 comments on commit 2993b28

Please sign in to comment.