Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: wccrawford/Hello-Mirah--Android
base: master
...
head fork: larroy/Hello-Mirah--Android
compare: master
Checking mergeability… Don’t worry, you can still create the pull request.
  • 5 commits
  • 7 files changed
  • 0 commit comments
  • 1 contributor
View
138 LICENSE.txt
@@ -0,0 +1,138 @@
+Artistic License 2.0
+Copyright (c) 2000-2006, The Perl Foundation.
+
+Everyone is permitted to copy and distribute verbatim copies of this license document, but changing
+it is not allowed.
+
+Preamble
+This license establishes the terms under which a given free software Package may be copied,
+modified, distributed, and/or redistributed. The intent is that the Copyright Holder maintains some
+artistic control over the development of that Package while still keeping the Package available as
+open source and free software.
+
+You are always permitted to make arrangements wholly outside of this license directly with the
+Copyright Holder of a given Package. If the terms of this license do not permit the full use that
+you propose to make of the Package, you should contact the Copyright Holder and seek a different
+licensing arrangement.
+
+Definitions
+"Copyright Holder" means the individual(s) or organization(s) named in the copyright notice for the
+entire Package.
+
+"Contributor" means any party that has contributed code or other material to the Package, in
+accordance with the Copyright Holder's procedures.
+
+"You" and "your" means any person who would like to copy, distribute, or modify the Package.
+
+"Package" means the collection of files distributed by the Copyright Holder, and derivatives of that
+collection and/or of those files. A given Package may consist of either the Standard Version, or a
+Modified Version.
+
+"Distribute" means providing a copy of the Package or making it accessible to anyone else, or in the
+case of a company or organization, to others outside of your company or organization.
+
+"Distributor Fee" means any fee that you charge for Distributing this Package or providing support
+for this Package to another party. It does not mean licensing fees.
+
+"Standard Version" refers to the Package if it has not been modified, or has been modified only in
+ways explicitly requested by the Copyright Holder.
+
+"Modified Version" means the Package, if it has been changed, and such changes were not explicitly
+requested by the Copyright Holder.
+
+"Original License" means this Artistic License as Distributed with the Standard Version of the
+Package, in its current version or as it may be modified by The Perl Foundation in the future.
+
+"Source" form means the source code, documentation source, and configuration files for the Package.
+
+"Compiled" form means the compiled bytecode, object code, binary, or any other form resulting from
+mechanical transformation or translation of the Source form.
+
+Permission for Use and Modification Without Distribution
+(1) You are permitted to use the Standard Version and create and use Modified Versions for any
+purpose without restriction, provided that you do not Distribute the Modified Version.
+
+Permissions for Redistribution of the Standard Version
+(2) You may Distribute verbatim copies of the Source form of the Standard Version of this Package in
+any medium without restriction, either gratis or for a Distributor Fee, provided that you duplicate
+all of the original copyright notices and associated disclaimers. At your discretion, such verbatim
+copies may or may not include a Compiled form of the Package.
+
+(3) You may apply any bug fixes, portability changes, and other modifications made available from
+the Copyright Holder. The resulting Package will still be considered the Standard Version, and as
+such will be subject to the Original License.
+
+Distribution of Modified Versions of the Package as Source
+(4) You may Distribute your Modified Version as Source (either gratis or for a Distributor Fee, and
+with or without a Compiled form of the Modified Version) provided that you clearly document how it
+differs from the Standard Version, including, but not limited to, documenting any non-standard
+features, executables, or modules, and provided that you do at least ONE of the following:
+
+(a) make the Modified Version available to the Copyright Holder of the Standard Version, under the
+Original License, so that the Copyright Holder may include your modifications in the Standard
+Version.
+(b) ensure that installation of your Modified Version does not prevent the user installing or
+running the Standard Version. In addition, the Modified Version must bear a name that is different
+from the name of the Standard Version.
+(c) allow anyone who receives a copy of the Modified Version to make the Source form of the Modified
+Version available to others under
+(i) the Original License or
+(ii) a license that permits the licensee to freely copy, modify and redistribute the Modified
+Version using the same licensing terms that apply to the copy that the licensee received, and
+requires that the Source form of the Modified Version, and of any works derived from it, be made
+freely available in that license fees are prohibited but Distributor Fees are allowed.
+
+Distribution of Compiled Forms of the Standard Version or Modified Versions without the Source
+(5) You may Distribute Compiled forms of the Standard Version without the Source, provided that you
+include complete instructions on how to get the Source of the Standard Version. Such instructions
+must be valid at the time of your distribution. If these instructions, at any time while you are
+carrying out such distribution, become invalid, you must provide new instructions on demand or cease
+further distribution. If you provide valid instructions or cease distribution within thirty days
+after you become aware that the instructions are invalid, then you do not forfeit any of your rights
+under this license.
+
+(6) You may Distribute a Modified Version in Compiled form without the Source, provided that you
+comply with Section 4 with respect to the Source of the Modified Version.
+
+Aggregating or Linking the Package
+(7) You may aggregate the Package (either the Standard Version or Modified Version) with other
+packages and Distribute the resulting aggregation provided that you do not charge a licensing fee
+for the Package. Distributor Fees are permitted, and licensing fees for other components in the
+aggregation are permitted. The terms of this license apply to the use and Distribution of the
+Standard or Modified Versions as included in the aggregation.
+
+(8) You are permitted to link Modified and Standard Versions with other works, to embed the Package
+in a larger work of your own, or to build stand-alone binary or bytecode versions of applications
+that include the Package, and Distribute the result without restriction, provided the result does
+not expose a direct interface to the Package.
+
+Items That are Not Considered Part of a Modified Version
+(9) Works (including, but not limited to, modules and scripts) that merely extend or make use of the
+Package, do not, by themselves, cause the Package to be a Modified Version. In addition, such works
+are not considered parts of the Package itself, and are not subject to the terms of this license.
+
+General Provisions
+(10) Any use, modification, and distribution of the Standard or Modified Versions is governed by
+this Artistic License. By using, modifying or distributing the Package, you accept this license. Do
+not use, modify, or distribute the Package, if you do not accept this license.
+
+(11) If your Modified Version has been derived from a Modified Version made by someone other than
+you, you are nevertheless required to ensure that your Modified Version complies with the
+requirements of this license.
+
+(12) This license does not grant you the right to use any trademark, service mark, tradename, or
+logo of the Copyright Holder.
+
+(13) This license includes the non-exclusive, worldwide, free-of-charge patent license to make, have
+made, use, offer to sell, sell, import and otherwise transfer the Package with respect to any patent
+claims licensable by the Copyright Holder that are necessarily infringed by the Package. If you
+institute patent litigation (including a cross-claim or counterclaim) against any party alleging
+that the Package constitutes direct or contributory patent infringement, then this Artistic License
+to you shall terminate on the date that such litigation is filed.
+
+(14) Disclaimer of Warranty: THE PACKAGE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS "AS
+IS' AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES. THE IMPLIED WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT ARE DISCLAIMED TO THE EXTENT PERMITTED BY YOUR
+LOCAL LAW. UNLESS REQUIRED BY LAW, NO COPYRIGHT HOLDER OR CONTRIBUTOR WILL BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING IN ANY WAY OUT OF THE USE OF THE PACKAGE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
View
0  README
No changes.
View
24 README.md
@@ -1,8 +1,28 @@
# HelloAndroid
-Description goes here.
+Tested with jruby 1.7 and mirah 0.0.12
+
+Build
+-----
+Initialize android target platform with the following command:
+
+Make sure mirahc is on your path
+
+<pre>
+android update project --path . --target android-7
+</pre>
+
+Build the apk
+<pre>
+ant debug
+</pre>
+
+Install on device
+<pre>
+ant installd
+</pre>
## Copyright
-Copyright (c) 2011 Your Name. See LICENSE.txt for for futher details.
+Copyright (c) 2012 Pedro Larroy. See LICENSE.txt for for futher details.
View
17 build.properties
@@ -1,17 +0,0 @@
-# This file is used to override default values used by the Ant build system.
-#
-# This file must be checked in Version Control Systems, as it is
-# integral to the build system of your project.
-
-# This file is only used by the Ant script.
-
-# You can use this to override default values such as
-# 'source.dir' for the location of your java source folder and
-# 'out.dir' for the location of your output folder.
-
-# You can also use it define how the release builds are signed by declaring
-# the following properties:
-# 'key.store' for the location of your keystore and
-# 'key.alias' for the name of the key to use.
-# The password will be asked during the build when you use the 'release' target.
-
View
146 build.xml
@@ -2,85 +2,91 @@
<project name="HelloAndroid" default="help">
<!-- The local.properties file is created and updated by the 'android' tool.
- It contains the path to the SDK. It should *NOT* be checked in in Version
- Control Systems. -->
+ It contains the path to the SDK. It should *NOT* be checked into
+ Version Control Systems. -->
<property file="local.properties" />
- <!-- The build.properties file can be created by you and is never touched
- by the 'android' tool. This is the place to change some of the default property values
- used by the Ant rules.
+ <!-- The ant.properties file can be created by you. It is only edited by the
+ 'android' tool to add properties to it.
+ This is the place to change some Ant specific build properties.
Here are some properties you may want to change/update:
- application.package
- the name of your application package as defined in the manifest. Used by the
- 'uninstall' rule.
source.dir
- the name of the source directory. Default is 'src'.
+ The name of the source directory. Default is 'src'.
out.dir
- the name of the output directory. Default is 'bin'.
+ The name of the output directory. Default is 'bin'.
- Properties related to the SDK location or the project target should be updated
- using the 'android' tool with the 'update' action.
+ For other overridable properties, look at the beginning of the rules
+ files in the SDK, at tools/ant/build.xml
- This file is an integral part of the build system for your application and
- should be checked in in Version Control Systems.
+ Properties related to the SDK location or the project target should
+ be updated using the 'android' tool with the 'update' action.
+
+ This file is an integral part of the build system for your
+ application and should be checked into Version Control Systems.
-->
- <property file="build.properties" />
-
- <!-- The default.properties file is created and updated by the 'android' tool, as well
- as ADT.
- This file is an integral part of the build system for your application and
- should be checked in in Version Control Systems. -->
- <property file="default.properties" />
-
- <!-- Custom Android task to deal with the project target, and import the proper rules.
- This requires ant 1.6.0 or above. -->
- <path id="android.antlibs">
- <pathelement path="${sdk.dir}/tools/lib/anttasks.jar" />
- <pathelement path="${sdk.dir}/tools/lib/sdklib.jar" />
- <pathelement path="${sdk.dir}/tools/lib/androidprefs.jar" />
- <pathelement path="${sdk.dir}/tools/lib/apkbuilder.jar" />
- <pathelement path="${sdk.dir}/tools/lib/jarutils.jar" />
- </path>
-
- <taskdef name="setup"
- classname="com.android.ant.SetupTask"
- classpathref="android.antlibs" />
-
- <!-- Execute the Android Setup task that will setup some properties specific to the target,
- and import the build rules files.
-
- The rules file is imported from
- <SDK>/platforms/<target_platform>/templates/android_rules.xml
-
- To customize some build steps for your project:
- - copy the content of the main node <project> from android_rules.xml
- - paste it in this build.xml below the <setup /> task.
- - disable the import by changing the setup task below to <setup import="false" />
-
- This will ensure that the properties are setup correctly but that your customized
- build steps are used.
+ <property file="ant.properties" />
+
+ <!-- if sdk.dir was not set from one of the property file, then
+ get it from the ANDROID_HOME env var.
+ This must be done before we load project.properties since
+ the proguard config can use sdk.dir -->
+ <property environment="env" />
+ <condition property="sdk.dir" value="${env.ANDROID_HOME}">
+ <isset property="env.ANDROID_HOME" />
+ </condition>
+
+ <!-- The project.properties file is created and updated by the 'android'
+ tool, as well as ADT.
+
+ This contains project specific properties such as project target, and library
+ dependencies. Lower level build properties are stored in ant.properties
+ (or in .classpath for Eclipse projects).
+
+ This file is an integral part of the build system for your
+ application and should be checked into Version Control Systems. -->
+ <loadproperties srcFile="project.properties" />
+
+ <!-- quick check on sdk.dir -->
+ <fail
+ message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
+ unless="sdk.dir"
+ />
+
+ <!--
+ Import per project custom build rules if present at the root of the project.
+ This is the place to put custom intermediary targets such as:
+ -pre-build
+ -pre-compile
+ -post-compile (This is typically used for code obfuscation.
+ Compiled code location: ${out.classes.absolute.dir}
+ If this is not done in place, override ${out.dex.input.absolute.dir})
+ -post-package
+ -post-build
+ -pre-clean
+ -->
+ <import file="custom_rules.xml" optional="true" />
+
+ <!-- Import the actual build file.
+
+ To customize existing targets, there are two options:
+ - Customize only one target:
+ - copy/paste the target into this file, *before* the
+ <import> task.
+ - customize it to your needs.
+ - Customize the whole content of build.xml
+ - copy/paste the content of the rules files (minus the top node)
+ into this file, replacing the <import> task.
+ - customize to your needs.
+
+ ***********************
+ ****** IMPORTANT ******
+ ***********************
+ In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
+ in order to avoid having your file be overridden by tools such as "android update project"
-->
- <setup />
-
- <target name="compile" depends="-resource-src, -aidl"
- description="Compiles project's .mirah files into .class files">
-
- <exec executable="javac" dir="gen">
- <arg value="-d" />
- <arg value="../bin/classes"/>
- <arg value="../gen/com/kelahn/android/R.java"/>
- </exec>
-
- <exec executable="mirahc" dir="src">
- <env key="CLASSPATH" file="${android.jar}" />
- <arg value="-d" />
- <arg value="../bin/classes" />
- <arg value="-c"/>
- <arg value="../bin/classes:../gen" />
- <arg value="." />
- </exec>
- </target>
-
+ <!-- version-tag: 1 -->
+ <import file="${sdk.dir}/tools/ant/build.xml" />
+
</project>
View
15 custom_rules.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="imported">
+ <target name="mirah"
+ description="Compiles project's .mirah files into .class files">
+
+ <exec executable="mirahc" dir="src" failonerror="true">
+ <arg value="-d" />
+ <arg value="../bin/classes" />
+ <arg value="-c"/>
+ <arg value="${sdk.dir}/platforms/${target}/android.jar:../bin/classes:../gen" />
+ <arg value="." />
+ </exec>
+ </target>
+ <target name="-post-compile" depends="mirah" />
+</project>
View
12 default.properties
@@ -1,12 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system use,
-# "build.properties", and override values to adapt the script to your
-# project structure.
-
-# Project target.
-target=android-8
-target-version=android-2.2

No commit comments for this range

Something went wrong with that request. Please try again.