Permalink
Browse files

did some refactoring of Glen E. Iveys substantial iframe contribution…

…s to follow the env practices for isolating platform implementation details to the rhino.js source. I also did a little clean up to simplify the repackaging of rhino he worked out, mostly to simplify naming conventions. Great work glen, im push this out as the first 1.0 release candidate. stay tuned for the addition of the html cleaner...
  • Loading branch information...
1 parent 404b1be commit cb6d649149173d77aa274d4b53c66990e904a5a2 thatcher committed Aug 17, 2009
View
@@ -1,4 +1,6 @@
dist/env.*.*.*.js
dist/env.rhino.*.*.*.js
+dist/env-js.*.jar
*~
rhino/build
+jshost
View
@@ -1,4 +1,4 @@
-JAR = java -jar rhino/js.jar
+JAR = java -jar dist/env-js.jar
test-rhino:
ant -emacs test
View
@@ -3,6 +3,9 @@
task :default => [:test]
task :test do
- classpath = [File.join(".", "rhino", "ant.jar"), File.join(".", "rhino", "ant-launcher.jar")].join(File::PATH_SEPARATOR)
+ 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 all"
end
View
@@ -0,0 +1,9 @@
+
+PROJECT: env-js
+BUILD_MAJOR: 1
+BUILD_MINOR: 0
+BUILD_ID: rc1
+BUILD: ${PROJECT}.${BUILD_MAJOR}.${BUILD_MINOR}.${BUILD_ID}
+VERSION: ${BUILD} ${DSTAMP}
+
+
View
@@ -1,9 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<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" />
- <property name="BUILD_ID" value="7" />
+ <tstamp/>
<property name="SRC_DIR"
location="src"
@@ -28,6 +26,9 @@
location="${PREFIX}/"
description="Folder for concatenated, min, lite and packed target" />
+
+ <property file="build.properties"/>
+
<!-- Files names for distribution -->
<property name="ENV_DIST"
location="${DIST_DIR}/env.${BUILD_MAJOR}.${BUILD_MINOR}.${BUILD_ID}.js" />
@@ -49,6 +50,12 @@
<!-- CORE -->
<echo message="Building ${ENV_DIST}" />
<concat destfile="${ENV_DIST}">
+ <filterchain>
+ <replacetokens>
+ <token key="VERSION" value="${BUILD}"/>
+ </replacetokens>
+ </filterchain>
+ <fileset dir="${SRC_DIR}" includes="build.js" />
<fileset dir="${SRC_DIR}" includes="intro.js" />
<fileset dir="${SRC_DIR}" includes="window/window.js" />
<fileset dir="${SRC_DIR}" includes="platform/xmlsax.js" />
@@ -144,6 +151,12 @@
<!-- RHINO -->
<echo message="Building ${ENV_RHINO}" />
<concat destfile="${ENV_RHINO}">
+ <filterchain>
+ <replacetokens>
+ <token key="VERSION" value="${BUILD}"/>
+ </replacetokens>
+ </filterchain>
+ <fileset dir="${SRC_DIR}" includes="build.js" />
<fileset dir="${SRC_DIR}" includes="platform/core.js" />
<fileset dir="${SRC_DIR}" includes="platform/rhino.js" />
<fileset dir="${DIST_DIR}" includes="env.js" />
@@ -153,7 +166,7 @@
</target>
<target name="test" description="Run the tests">
- <java fork="true" jar="rhino/env.js.jar" failonerror="true">
+ <java fork="true" jar="${DIST_DIR}/env-js.jar" failonerror="true">
<arg value="test/test.js"/>
<jvmarg value="-Dfile.encoding=utf-8"/>
</java>
Binary file not shown.
Oops, something went wrong.

0 comments on commit cb6d649

Please sign in to comment.