Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files
Merge branch 'issue/45a' into develop
  • Loading branch information
pmuellr committed May 3, 2011
2 parents 358a20d + 2334e2e commit 05e71f5a0a6ee14345cb9dd3da7a039bdea7ca30
Showing 7 changed files with 30 additions and 2 deletions.
@@ -176,6 +176,10 @@
<fileset file="${VENDOR}/modjewel/modjewel-require.js"/>
</copy>

<copy todir="${WEB}">
<fileset file="${VENDOR}/json2/json2.js"/>
</copy>

<copy todir="${WEB}">
<fileset dir="../${PROJECT_WEB}">
<exclude name="versions.js"/>
@@ -212,6 +216,7 @@
<filter token="BUILD_NUMBER_DATE" value="${BUILD_NUMBER_DATE}"/>
<filter token="CLI_VERSION" value="${CLI_VERSION}"/>
<filter token="JSON4J_VERSION" value="${JSON4J_VERSION}"/>
<filter token="JSON2_VERSION" value="${JSON2_VERSION}"/>
<filter token="WEBKIT_VERSION" value="${WEBKIT_VERSION}"/>
<filter token="SWT_VERSION" value="${SWT_VERSION}"/>
<filter token="JETTY_VERSION" value="${JETTY_VERSION}"/>
@@ -21,6 +21,7 @@
<delete dir="${VENDOR}"/>
<mkdir dir="${VENDOR}"/>

<antcall target="get-json2"/>
<antcall target="get-cli"/>
<antcall target="get-json4j"/>
<antcall target="get-jetty"/>
@@ -158,6 +159,8 @@

</target>

<!-- ============================================================ -->

<target name="get-swt-mac">
<delete dir="${VENDOR}/swt"/>
<mkdir dir="${VENDOR}/swt"/>
@@ -174,4 +177,13 @@
<delete dir="${TMP}"/>
</target>

<!-- ============================================================ -->

<target name="get-json2">
<delete dir="${VENDOR}/json2"/>
<mkdir dir="${VENDOR}/json2"/>

<get src="${JSON2_URL_PREFIX}/json2.js" dest="${VENDOR}/json2/json2.js" verbose="false"/>
</target>

</project>
@@ -73,12 +73,19 @@ SWT_URL_PREFIX: http://archive.eclipse.org/eclipse/downloads/drops/R-${SWT_VE
# location of scooj
#-----------------------------------------------------------

SCOOJ_VERSION: master
SCOOJ_VERSION: 8f3534ba5a1b2fb8ea82a24eb0acedfcc6aca7b4
SCOOJ_URL_PREFIX: https://github.com/pmuellr/scooj/raw/${SCOOJ_VERSION}

#-----------------------------------------------------------
# location of json2
#-----------------------------------------------------------

JSON2_VERSION: 8e0b15cb492f63067a88ad786e4d5fc0fa89a241
JSON2_URL_PREFIX: https://github.com/douglascrockford/JSON-js/raw/${JSON2_VERSION}

#-----------------------------------------------------------
# location of modjewel
#-----------------------------------------------------------

MODJEWEL_VERSION: master
MODJEWEL_VERSION: 48f3eb797850e5ab3e2132b19a1db4797559efe7
MODJEWEL_URL_PREFIX: https://github.com/pmuellr/modjewel/raw/${MODJEWEL_VERSION}
@@ -12,6 +12,7 @@
<link rel="stylesheet" href="weinre-demo.css">
<script src="weinre-demo.js"></script>
<script src="/modjewel-require.js"></script>
<script src="/json2.js"></script>
<script type="text/javascript">require("modjewel").warnOnRecursiveRequire(true)</script>
<script src="/scooj.transportd.js"></script>
<script src="/weinre/common/Ex.transportd.js"></script>
@@ -95,6 +95,7 @@ <h2>Versions</h2>
<tr><td>jetty servlet: <td> <span id="version-servlet">???</span>
<tr><td>apache cli: <td> <span id="version-cli">???</span>
<tr><td>apache json4j: <td> <span id="version-json4j">???</span>
<tr><td>json2: <td> <span id="version-json2">???</span>
<tr><td>scooj: <td> <span id="version-scooj">???</span>
<tr><td>modjewel: <td> <span id="version-modjewel">???</span>
</table>
@@ -34,6 +34,7 @@ replaceText("version-jetty", Weinre.Versions.jetty)
replaceText("version-servlet", Weinre.Versions.servlet)
replaceText("version-cli", Weinre.Versions.cli)
replaceText("version-json4j", Weinre.Versions.json4j)
replaceText("version-json2", Weinre.Versions.json2)
replaceText("version-swt", Weinre.Versions.swt)
replaceText("version-scooj", Weinre.Versions.scooj)
replaceText("version-modjewel", Weinre.Versions.modjewel)
@@ -15,6 +15,7 @@
webkit: "@WEBKIT_VERSION@",
cli: "@CLI_VERSION@",
json4j: "@JSON4J_VERSION@",
json2: "@JSON2_VERSION@",
swt: "@SWT_VERSION@",
modjewel: "@MODJEWEL_VERSION@",
scooj: "@SCOOJ_VERSION@"

0 comments on commit 05e71f5

Please sign in to comment.