Permalink
Browse files

Split up ringo.jar into ringo-core.jar (java classes) and ringo-modul…

…es.jar (js modules)
  • Loading branch information...
1 parent 96cdee7 commit 00e3f8f79bd06c0908c1eb1e6ae16515198cd2db @hns hns committed Sep 2, 2012
Showing with 13 additions and 7 deletions.
  1. +11 −5 build.xml
  2. +2 −2 tools/admin/create.js
View
@@ -33,7 +33,8 @@
<property name="jsdocs" value="${home}/docs/modules"/>
<property name="javadocs" value="${home}/docs/java"/>
- <property name="ringo.jar" value="${lib}/ringo.jar"/>
+ <property name="ringo-core.jar" value="${lib}/ringo-core.jar"/>
+ <property name="ringo-modules.jar" value="${lib}/ringo-modules.jar"/>
<property name="debug" value="on"/>
<property name="optimize" value="on"/>
@@ -44,7 +45,7 @@
<path id="classpath">
<fileset dir="lib">
<include name="**/*.jar"/>
- <exclude name="${ringo.jar}"/>
+ <exclude name="${ringo-core.jar}"/>
</fileset>
<pathelement location="${classes}"/>
</path>
@@ -103,11 +104,13 @@
<!-- Creates a jar file in the lib-directory -->
<!-- =================================================================== -->
<target name="jar" depends="compile">
- <jar jarfile="${ringo.jar}">
+ <jar jarfile="${ringo-core.jar}">
<fileset dir="${classes}"/>
- <fileset dir="${home}" includes="modules/**"/>
<fileset dir="${src}" excludes="**/*.java,**/package.html"/>
</jar>
+ <jar jarfile="${ringo-modules.jar}">
+ <fileset dir="${home}" includes="modules/**"/>
+ </jar>
<jar jarfile="run.jar"
basedir="${classes}"
includes="**/tools/launcher/**"
@@ -172,8 +175,11 @@
<!-- =================================================================== -->
<target name="clean" depends="init">
<delete dir="${build}"/>
- <delete file="${ringo.jar}"/>
+ <delete file="${ringo-core.jar}"/>
+ <delete file="${ringo-modules.jar}"/>
<delete file="run.jar"/>
+ <!-- transitional: delete old ringo.jar file -->
+ <delete file="lib/ringo.jar"/>
</target>
View
@@ -76,8 +76,8 @@ function fixAppEngineDirs(dest) {
function copyJars(home, dest, symlink) {
var jars = [
- "ringo.jar",
- "ivy/rhino-1.7R3.jar",
+ "ringo-core.jar",
+ "ivy/rhino-1.7R5-SNAPSHOT.jar",
"ivy/jaffl-0.5.11.jar",
"ivy/jnr-posix-1.1.9.jar"
];

0 comments on commit 00e3f8f

Please sign in to comment.