Permalink
Browse files

TIMOB-12185: Remove rhino as supported runtime. Building the sdk will…

… only build for v8, and building an app will always default to v8 as well.
  • Loading branch information...
1 parent 7b8f3f0 commit e0f351ed5c93ec745d86d3a5981a4b0cea271914 Allen Yeung committed Mar 9, 2013
Showing with 142 additions and 4,915 deletions.
  1. +3 −92 android/build/common.xml
  2. +0 −1 android/dependency.json
  3. +2 −2 android/kroll-apt/src/java/org/appcelerator/kroll/annotations/Kroll.java
  4. +1 −1 android/kroll-apt/src/java/org/appcelerator/kroll/annotations/generator/JSONUtils.java
  5. +1 −1 android/kroll-apt/src/java/org/appcelerator/kroll/annotations/generator/KrollAPIUpdater.java
  6. +1 −1 android/kroll-apt/src/java/org/appcelerator/kroll/annotations/generator/KrollAnnotationUtils.java
  7. +21 −101 android/kroll-apt/src/java/org/appcelerator/kroll/annotations/generator/KrollBindingGenerator.java
  8. +0 −92 ...oll-apt/src/java/org/appcelerator/kroll/annotations/generator/KrollGeneratedBindingsRhino.java.fm
  9. +1 −1 android/kroll-apt/src/java/org/appcelerator/kroll/annotations/generator/KrollJSONGenerator.java
  10. +0 −15 .../kroll-apt/src/java/org/appcelerator/kroll/annotations/generator/KrollModuleBindingsRhino.java.fm
  11. +1 −1 android/kroll-apt/src/java/org/appcelerator/kroll/annotations/generator/KrollVisitor.java
  12. +0 −514 android/kroll-apt/src/java/org/appcelerator/kroll/annotations/generator/ProxyBindingRhino.java.fm
  13. +1 −1 android/kroll-apt/src/java/org/appcelerator/kroll/annotations/generator/ProxyBindingV8.cpp.fm
  14. +1 −1 android/kroll-apt/src/java/org/appcelerator/kroll/annotations/generator/ProxyBindingV8.h.fm
  15. +2 −2 android/runtime/common/src/java/org/appcelerator/kroll/KrollRuntime.java
  16. +1 −1 android/runtime/common/src/js/console.js
  17. +1 −1 android/runtime/common/src/js/invoker.js
  18. +7 −12 android/runtime/common/src/js/kroll.js
  19. +30 −71 android/runtime/common/src/js/module.js
  20. +15 −31 android/runtime/common/src/js/titanium.js
  21. +1 −1 android/runtime/common/src/js/url.js
  22. +0 −12 android/runtime/rhino/.classpath
  23. +0 −2 android/runtime/rhino/.gitignore
  24. +0 −33 android/runtime/rhino/.project
  25. +0 −11 android/runtime/rhino/AndroidManifest.xml
  26. +0 −209 android/runtime/rhino/build.xml
  27. BIN android/runtime/rhino/lib/js.jar
  28. +0 −40 android/runtime/rhino/proguard.cfg
  29. +0 −13 android/runtime/rhino/project.properties
  30. +0 −4 android/runtime/rhino/res/values/strings.xml
  31. +0 −19 android/runtime/rhino/src/bindings/KrollGeneratedBindings.java
  32. +0 −146 android/runtime/rhino/src/java/org/appcelerator/kroll/runtime/rhino/EventEmitter.java
  33. +0 −90 android/runtime/rhino/src/java/org/appcelerator/kroll/runtime/rhino/GlobalSandbox.java
  34. +0 −296 android/runtime/rhino/src/java/org/appcelerator/kroll/runtime/rhino/KrollBindings.java
  35. +0 −37 android/runtime/rhino/src/java/org/appcelerator/kroll/runtime/rhino/KrollDate.java
  36. +0 −276 android/runtime/rhino/src/java/org/appcelerator/kroll/runtime/rhino/KrollGlobal.java
  37. +0 −159 android/runtime/rhino/src/java/org/appcelerator/kroll/runtime/rhino/KrollScriptRunner.java
  38. +0 −200 android/runtime/rhino/src/java/org/appcelerator/kroll/runtime/rhino/KrollScriptableDict.java
  39. +0 −169 android/runtime/rhino/src/java/org/appcelerator/kroll/runtime/rhino/KrollWith.java
  40. +0 −505 android/runtime/rhino/src/java/org/appcelerator/kroll/runtime/rhino/Proxy.java
  41. +0 −98 android/runtime/rhino/src/java/org/appcelerator/kroll/runtime/rhino/ProxyFactory.java
  42. +0 −141 android/runtime/rhino/src/java/org/appcelerator/kroll/runtime/rhino/RhinoFunction.java
  43. +0 −148 android/runtime/rhino/src/java/org/appcelerator/kroll/runtime/rhino/RhinoObject.java
  44. +0 −208 android/runtime/rhino/src/java/org/appcelerator/kroll/runtime/rhino/RhinoRuntime.java
  45. +0 −24 android/runtime/rhino/src/java/org/appcelerator/kroll/runtime/rhino/RhinoUtil.java
  46. +0 −546 android/runtime/rhino/src/java/org/appcelerator/kroll/runtime/rhino/TypeConverter.java
  47. +0 −154 android/runtime/rhino/src/java/org/appcelerator/kroll/runtime/rhino/modules/AssetsModule.java
  48. +0 −191 android/runtime/rhino/src/java/org/appcelerator/kroll/runtime/rhino/modules/ScriptsModule.java
  49. +0 −41 android/runtime/rhino/src/js/rhino.js
  50. +2 −3 android/runtime/v8/tools/genBootstrap.py
  51. +1 −27 android/titanium/src/java/org/appcelerator/titanium/util/TiPlatformHelper.java
  52. +1 −8 android/titanium/src/java/ti/modules/titanium/TitaniumModule.java
  53. +1 −5 site_scons/package.py
  54. +2 −10 support/android/android.py
  55. +5 −12 support/android/builder.py
  56. +1 −4 support/android/compiler.py
  57. +0 −30 support/android/templates/App.java
  58. +23 −34 support/module/android/bootstrap.py
  59. +5 −50 support/module/android/build.xml
  60. +5 −8 support/module/android/templates/src/___MODULE_ID_AS_FOLDER___/ExampleProxy.java
  61. +6 −9 support/module/android/templates/src/___MODULE_ID_AS_FOLDER___/___MODULE_NAME_CAMEL___Module.java
View
@@ -1,7 +1,7 @@
<!--
Appcelerator Titanium Mobile
-Copyright (c) 2010-2012 by Appcelerator, Inc. All Rights Reserved.
+Copyright (c) 2010-2013 by Appcelerator, Inc. All Rights Reserved.
Licensed under the terms of the Apache Public License
Please see the LICENSE included with this distribution for details.
@@ -35,7 +35,6 @@ Common ant tasks and macros for building Android-based Titanium modules and proj
<property name="kroll.apt.project.dir" location="${ti.android.root}/kroll-apt"/>
<property name="kroll.common.project.dir" location="${ti.android.root}/runtime/common"/>
<property name="kroll.v8.project.dir" location="${ti.android.root}/runtime/v8"/>
- <property name="kroll.rhino.project.dir" location="${ti.android.root}/runtime/rhino"/>
<property name="kroll.runtime" value="all"/>
<condition property="ndk.build" value="${kroll.v8.project.dir}/ndk-build.cmd" else="${kroll.v8.project.dir}/ndk-build.sh">
@@ -141,10 +140,6 @@ Common ant tasks and macros for building Android-based Titanium modules and proj
<pathelement path="${dist.classes.dir}/kroll-v8"/>
</path>
- <path id="kroll.rhino.path">
- <pathelement path="${dist.classes.dir}/kroll-rhino"/>
- </path>
-
<path id="titanium.path">
<pathelement path="${dist.classes.dir}/titanium"/>
<fileset dir="${titanium.project.dir}/lib" includes="**/*.jar"/>
@@ -358,32 +353,24 @@ Common ant tasks and macros for building Android-based Titanium modules and proj
</macrodef>
<macrodef name="generate.bindings">
- <attribute name="runtime"/>
<attribute name="dest"/>
<sequential>
<apply executable="java" parallel="true" failonerror="true">
<arg value="-classpath"/>
<arg value="${toString:kroll.apt.path}"/>
<arg value="org.appcelerator.kroll.annotations.generator.KrollBindingGenerator"/>
- <arg value="@{runtime}"/>
<arg file="@{dest}"/>
<!-- isModule -->
<arg value="false"/>
<!-- moduleId (Titanium for platform) -->
<arg value="titanium"/>
- <!-- bindingsClassName (empty for platform) -->
- <arg value=" "/>
<fileset dir="${dist.json.dir}" includes="**/*.json"/>
</apply>
</sequential>
</macrodef>
<target name="generate.kroll.v8.bindings" depends="build.kroll.apt">
- <generate.bindings runtime="v8" dest="${kroll.v8.project.dir}/generated"/>
- </target>
-
- <target name="generate.kroll.rhino.bindings" depends="build.kroll.apt">
- <generate.bindings runtime="rhino" dest="${kroll.rhino.project.dir}/generated"/>
+ <generate.bindings dest="${kroll.v8.project.dir}/generated"/>
</target>
<target name="build.kroll.v8.so" depends="generate.kroll.v8.bindings">
@@ -415,77 +402,6 @@ Common ant tasks and macros for building Android-based Titanium modules and proj
<jar destfile="${kroll.common.dest}" basedir="${kroll.common.classes.dir}"/>
</target>
- <import file="${kroll.rhino.project.dir}/build.xml"/>
- <macrodef name="compile.kroll.rhino.bindings">
- <sequential>
- <javac destdir="${kroll.rhino.gen.classes.dir}"
- debug="true" target="1.6" source="1.6"
- includeantruntime="false">
- <classpath refid="android"/>
- <classpath refid="rhino"/>
- <classpath>
- <fileset file="${dist.dir}/kroll-common.jar"/>
- <dirset dir="${kroll.rhino.classes.dir}"/>
- <fileset dir="${dist.dir}" includes="titanium-*.jar"/>
- </classpath>
- <classpath refid="titanium.path"/>
- <classpath refid="kroll.apt.path"/>
-
- <src path="${kroll.rhino.project.dir}/generated"/>
- </javac>
- </sequential>
- </macrodef>
-
- <target name="build.kroll.rhino.jar" depends="build.kroll.common.jar,generate.kroll.rhino.bindings,compile.kroll.rhino.js,generate.kroll.rhino.idswitch">
- <property name="kroll.rhino.classes.dir" location="${dist.classes.dir}/kroll-rhino"/>
- <property name="kroll.rhino.gen.classes.dir" location="${dist.classes.dir}/kroll-rhino-gen"/>
- <property name="kroll.rhino.dest" value="${dist.dir}/kroll-rhino.jar"/>
- <property name="kroll.rhino.bindings.dest" value="${dist.dir}/kroll-rhino-bindings.jar"/>
-
- <mkdir dir="${kroll.rhino.classes.dir}"/>
- <mkdir dir="${kroll.rhino.gen.classes.dir}"/>
-
- <javac destdir="${kroll.rhino.classes.dir}" debug="true"
- target="1.6" source="1.6" includeantruntime="false">
- <classpath refid="android"/>
- <classpath refid="rhino"/>
- <classpath>
- <fileset file="${dist.dir}/kroll-common.jar"/>
- </classpath>
- <classpath refid="kroll.rhino.js"/>
- <classpath refid="titanium.path"/>
- <classpath refid="kroll.apt.path"/>
- <classpath>
- <fileset dir="${dist.dir}" includes="titanium-*.jar"/>
- <fileset file="${kroll.rhino.bindings.dest}"/>
- </classpath>
-
- <src path="${kroll.rhino.project.dir}/src/java"/>
- <src path="${kroll.rhino.project.dir}/src/bindings"/>
- </javac>
-
- <!-- use the actual generated bindings -->
- <delete>
- <fileset dir="${kroll.rhino.classes.dir}" includes="**/KrollGeneratedBindings.class"/>
- </delete>
-
-
- <compile.kroll.rhino.bindings/>
-
- <antcall target="generate.kroll.rhino.serials"/>
- <compile.kroll.rhino.bindings/>
-
- <jar destfile="${kroll.rhino.bindings.dest}" basedir="${kroll.rhino.gen.classes.dir}"/>
-
- <jar destfile="${kroll.rhino.dest}">
- <fileset dir="${kroll.rhino.classes.dir}" includes="**/*"/>
- <fileset dir="${kroll.rhino.gen.classes.dir}" includes="**/*"/>
- <fileset dir="${kroll.rhino.project.dir}/jsbin" includes="**/*"/>
- </jar>
- </target>
-
- <target name="build.kroll.runtime.rhino" depends="build.kroll.rhino.jar"/>
-
<target name="build.kroll.v8.jar" depends="build.kroll.common.jar">
<property name="kroll.v8.classes.dir" location="${dist.classes.dir}/kroll-v8"/>
<mkdir dir="${kroll.v8.classes.dir}"/>
@@ -504,7 +420,7 @@ Common ant tasks and macros for building Android-based Titanium modules and proj
<target name="build.kroll.runtime.v8" depends="build.kroll.v8.jar,build.kroll.v8.so"/>
<target name="build.kroll.runtime.all"
- depends="build.kroll.runtime.rhino,build.kroll.runtime.v8"/>
+ depends="build.kroll.runtime.v8"/>
<target name="build.titanium" depends="build.kroll.common.jar">
<property name="build.dir" value="${dist.classes.dir}/titanium"/>
@@ -687,11 +603,6 @@ Common ant tasks and macros for building Android-based Titanium modules and proj
<fileset dir="${dist.dir}" includes="**/*" excludes="libv8/**/*" defaultexcludes="false"/>
</delete>
- <!-- Clean up the generated rhino files -->
- <delete includeemptydirs="true" failonerror="false">
- <fileset dir="${kroll.rhino.project.dir}/generated" includes="**/*" defaultexcludes="false"/>
- </delete>
-
<!-- V8 clean target requires we have libv8 for now -->
<build.ti.ant.tasks/>
<define.ti.ant.tasks/>
View
@@ -32,7 +32,6 @@
"runtimes":
{
"v8":["kroll-v8.jar"],
- "rhino":["kroll-rhino.jar","js.jar"],
"defaultRuntime":"v8"
}
}
@@ -1,7 +1,7 @@
package org.appcelerator.kroll.annotations;
/**
* Appcelerator Titanium Mobile
- * Copyright (c) 2010-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Copyright (c) 2010-2013 by Appcelerator, Inc. All Rights Reserved.
* Licensed under the terms of the Apache Public License
* Please see the LICENSE included with this distribution for details.
*/
@@ -328,7 +328,7 @@
/**
* Declares a Kroll proxy.<br>
- * <p>Proxies are the API interface between Javascript (Rhino) and Java.
+ * <p>Proxies are the API interface between Javascript and Java.
* Proxy classes must use this or {@link module the module annotation} to expose methods and properties,
* and must follow a few specific source patterns:
* <ul>
@@ -1,6 +1,6 @@
/**
* Appcelerator Titanium Mobile
- * Copyright (c) 2010 by Appcelerator, Inc. All Rights Reserved.
+ * Copyright (c) 2010-2013 by Appcelerator, Inc. All Rights Reserved.
* Licensed under the terms of the Apache Public License
* Please see the LICENSE included with this distribution for details.
*/
@@ -1,6 +1,6 @@
/**
* Appcelerator Titanium Mobile
- * Copyright (c) 2011 by Appcelerator, Inc. All Rights Reserved.
+ * Copyright (c) 2011-2013 by Appcelerator, Inc. All Rights Reserved.
* Licensed under the terms of the Apache Public License
* Please see the LICENSE included with this distribution for details.
*/
@@ -1,6 +1,6 @@
/**
* Appcelerator Titanium Mobile
- * Copyright (c) 2010-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Copyright (c) 2010-2013 by Appcelerator, Inc. All Rights Reserved.
* Licensed under the terms of the Apache Public License
* Please see the LICENSE included with this distribution for details.
*/
Oops, something went wrong.

0 comments on commit e0f351e

Please sign in to comment.