Permalink
Browse files

Initial commit of Android support for head

  • Loading branch information...
1 parent ec59eba commit 25edd4a860ea245fff58e8d946421b36d66c75fb @sattvik committed Dec 4, 2011
Showing 339 changed files with 74,193 additions and 26 deletions.
View
@@ -209,4 +209,13 @@
</build>
</profile>
</profiles>
+
+ <dependencies>
+ <dependency>
+ <groupId>com.google.android</groupId>
+ <artifactId>android</artifactId>
+ <version>2.1.2</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
</project>
View
@@ -62,3 +62,197 @@ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
THE POSSIBILITY OF SUCH DAMAGE.
+
+
+--------------------------------------------------------------------------
+This program uses source code from the Dalvik eXchange from the Android Open
+Source Project which is distributed under the following terms:
+
+Copyright (c) 2005-2008, The Android Open Source Project
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
View
@@ -221,7 +221,12 @@
default: repl-caught"
[& options]
(let [cl (.getContextClassLoader (Thread/currentThread))]
- (.setContextClassLoader (Thread/currentThread) (clojure.lang.DynamicClassLoader. cl)))
+ (.setContextClassLoader (Thread/currentThread)
+ (if (= vm-type :dalvik-vm)
+ (let [cl-class (Class/forName "clojure.lang.DalvikDynamicClassLoader")
+ cl-constructor (.getConstructor cl-class (into-array [ClassLoader]))]
+ (.newInstance cl-constructor cl))
+ (clojure.lang.JvmDynamicClassLoader. cl))))
(let [{:keys [init need-prompt prompt flush read eval print caught]
:or {init #()
need-prompt (if (instance? LineNumberingPushbackReader *in*)
@@ -0,0 +1,114 @@
+/* Copyright © 2011 Sattvik Software & Technology Resources, Ltd. Co.
+ * All rights reserved.
+ *
+ * The use and distribution terms for this software are covered by the Eclipse
+ * Public License 1.0 (http://opensource.org/licenses/eclipse-1.0.php) which
+ * can be found in the file epl-v10.html at the root of this distribution. By
+ * using this software in any fashion, you are agreeing to be bound by the
+ * terms of this license. You must not remove this notice, or any other, from
+ * this software.
+ */
+package clojure.lang;
+
+import android.util.Log;
+import com.android.dx.dex.cf.CfOptions;
+import com.android.dx.dex.cf.CfTranslator;
+import com.android.dx.dex.DexOptions;
+import dalvik.system.DexFile;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+
+/**
+ * Dynamic class loader for the Dalvik VM.
+ *
+ * @since 1.2.0
+ * @author Daniel Solano Gómez
+ */
+public class DalvikDynamicClassLoader extends DynamicClassLoader {
+ /** Options for translation. */
+ private static final CfOptions OPTIONS = new CfOptions();
+ /** Reference to compile path var, used for generated jar files. */
+ private static final Var COMPILE_PATH =
+ RT.var("clojure.core", "*compile-path*");
+ /** Configure whether or not to use extended op codes. */
+ private static final DexOptions DEX_OPTIONS = new DexOptions();
+
+ static {
+ // disable name checks
+ OPTIONS.strictNameCheck = false;
+ // ensure generation of compatible DEX files
+ DEX_OPTIONS.targetApiLevel = android.os.Build.VERSION.SDK_INT;
+ }
+
+ /** Tag used for logging. */
+ private static final String TAG = "DalvikClojureCompiler";
+
+ public DalvikDynamicClassLoader() {
+ super();
+ }
+
+ public DalvikDynamicClassLoader(final ClassLoader parent) {
+ super(parent);
+ }
+
+ /**
+ * Dalvik-specific method for dynamically loading a class from JVM byte
+ * codes. As there is no easy way to translate a class from the JVM to
+ * Dalvik in-memory, this method takes a slow route through disk. This
+ * involves using a DexFile from the dx tool to translate the JVM class
+ * into a Dalvik executable. The contents of the executable must be
+ * written to disk as an entry in a zip file. This zip file is then loaded
+ * and the requested class is instantiated using the Android runtime's
+ * DexFile.
+ *
+ * @param name the name of the class to define
+ * @param bytes the JVM bytecodes for the class
+ * @param srcForm the Clojure form for the class
+ */
+ @Override
+ protected Class<?> defineMissingClass(final String name, final byte[] bytes,
+ final Object srcForm) {
+ // create dx DexFile and add translated class into it
+ final com.android.dx.dex.file.DexFile outDexFile =
+ new com.android.dx.dex.file.DexFile(DEX_OPTIONS);
+ outDexFile.add(CfTranslator.translate("", bytes, OPTIONS, DEX_OPTIONS));
+
+ // get compile directory
+ final File compileDir = new File((String) COMPILE_PATH.deref());
+ try {
+ // write Dalvik executable into a temporary jar
+ final File jarFile =
+ File.createTempFile("repl-", ".jar", compileDir);
+ jarFile.deleteOnExit();
+ final ZipOutputStream jarOut =
+ new ZipOutputStream(new FileOutputStream(jarFile));
+ jarOut.putNextEntry(new ZipEntry("classes.dex"));
+ outDexFile.writeTo(jarOut, null, false);
+ jarOut.close();
+
+ // open the jar and create an optimized dex file
+ final String jarPath = jarFile.getAbsolutePath();
+ final String dexPath =
+ jarPath.substring(0, jarPath.lastIndexOf('.'))
+ .concat(".dex");
+ final DexFile inDexFile = DexFile.loadDex(jarPath, dexPath, 0);
+
+ // load the class
+ Class<?> clazz = inDexFile.loadClass(name.replace(".", "/"), this);
+ if (clazz == null) {
+ Log.e(TAG,"Failed to load generated class: "+name);
+ throw new RuntimeException(
+ "Failed to load generated class " + name + ".");
+ }
+ return clazz;
+ } catch (IOException e) {
+ Log.e(TAG,"Failed to define class due to I/O exception.",e);
+ throw new RuntimeException(e);
+ }
+ }
+}
@@ -21,7 +21,7 @@
import java.lang.ref.ReferenceQueue;
import java.lang.ref.SoftReference;
-public class DynamicClassLoader extends URLClassLoader{
+public abstract class DynamicClassLoader extends URLClassLoader {
HashMap<Integer, Object[]> constantVals = new HashMap<Integer, Object[]>();
static ConcurrentHashMap<String, Reference<Class>>classCache =
new ConcurrentHashMap<String, Reference<Class> >();
@@ -41,13 +41,17 @@ public DynamicClassLoader(ClassLoader parent){
super(EMPTY_URLS,parent);
}
-public Class defineClass(String name, byte[] bytes, Object srcForm){
+public final Class defineClass(String name, byte[] bytes, Object srcForm){
Util.clearCache(rq, classCache);
- Class c = defineClass(name, bytes, 0, bytes.length);
+ Class c = defineMissingClass(name, bytes, srcForm);
classCache.put(name, new SoftReference(c,rq));
return c;
}
+protected abstract Class<?> defineMissingClass(final String name,
+ final byte[] bytes, final Object srcForm);
+
+@Override
protected Class<?> findClass(String name) throws ClassNotFoundException{
Reference<Class> cr = classCache.get(name);
if(cr != null)
@@ -61,15 +65,16 @@ public Class defineClass(String name, byte[] bytes, Object srcForm){
return super.findClass(name);
}
-public void registerConstants(int id, Object[] val){
+public final void registerConstants(int id, Object[] val) {
constantVals.put(id, val);
}
-public Object[] getConstants(int id){
+public final Object[] getConstants(int id) {
return constantVals.get(id);
}
-public void addURL(URL url){
+@Override
+public final void addURL(URL url) {
super.addURL(url);
}
Oops, something went wrong.

0 comments on commit 25edd4a

Please sign in to comment.