diff options
| -rw-r--r-- | main/build.xml | 54 | ||||
| -rw-r--r-- | main/build_cgeo.xml | 105 |
2 files changed, 44 insertions, 115 deletions
diff --git a/main/build.xml b/main/build.xml index 502216d..febb4ae 100644 --- a/main/build.xml +++ b/main/build.xml @@ -38,27 +38,61 @@ 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" /> + + <!-- The private.properties file sets api-keys as well as keystore, + certificate and passwords (if you want). + See /templates/private.properties for more information. --> + <property file="private.properties" /> <!-- quick check on sdk.dir --> <fail message="sdk.dir is missing. Make sure to generate local.properties using 'android update project'" unless="sdk.dir" /> - - <import file="build_cgeo.xml"/> - - -<!-- extension targets. Uncomment the ones where you want to do custom work - in between standard targets --> -<!-- + + <!-- Custom targets --> + <target name="install_release" description="Install signed release application" depends="release"> + <exec executable="${sdk.dir}/platform-tools/adb"> + <arg line="install -r ./bin/${ant.project.name}-release.apk" /> + </exec> + </target> + + <target name="debugAPI" depends="-pre-build" + description="Changes API key to debug"> + </target> + + <!-- extension targets. Uncomment the ones where you want to do custom work + in between standard targets --> <target name="-pre-build"> + <condition property="build.mode.release" else="false"> + <equals arg1="${build.target}" arg2="release" /> + </condition> + + <if condition="${build.mode.release}"> + <then> + <filterset id="build-tokens"> + <filter token="maps.api.key" value="${maps.api.key.market}"/> + </filterset> + </then> + <else> + <filterset id="build-tokens"> + <filter token="maps.api.key" value="${maps.api.key}"/> + </filterset> + </else> + </if> + <copy file="./templates/mapsapikey.xml" todir="./res/values/" overwrite="true"> + <filterset refid="build-tokens" /> + </copy> </target> + +<!-- <target name="-pre-compile"> </target> - - /* This is typically used for code obfuscation. +--> + <!-- 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} */ + If this is not done in place, override ${out.dex.input.absolute.dir} --> +<!-- <target name="-post-compile"> </target> --> diff --git a/main/build_cgeo.xml b/main/build_cgeo.xml deleted file mode 100644 index b0736a1..0000000 --- a/main/build_cgeo.xml +++ /dev/null @@ -1,105 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project name="cgeo-include"> - -<!-- The local.properties file is created and updated by the 'android' - tool. - 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. - Here are some properties you may want to change/update: - - source.dir - The name of the source directory. Default is 'src'. - out.dir - 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. - - 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 into Version Control Systems. --> - <property file="default.properties" /> - - <!-- The private.properties file sets api-keys as well as keystore, - certificate and passwords (if you want). - See /templates/private.properties for more information. --> - <property file="private.properties" /> - - <target name="install_release" description="Install signed release application" depends="release"> - <exec executable="${sdk.dir}/platform-tools/adb"> - <arg line="install -r ./bin/${ant.project.name}-release.apk" /> - </exec> - </target> - -<!-- extension targets. Uncomment the ones where you want to do custom work - in between standard targets --> - - <target name="-pre-build"> - <condition property="build.mode.release" else="false"> - <equals arg1="${build.target}" arg2="release" /> - </condition> - - <if condition="${build.mode.release}"> - <then> - <filterset id="build-tokens"> - <filter token="maps.api.key" value="${maps.api.key.market}"/> - </filterset> - </then> - <else> - <filterset id="build-tokens"> - <filter token="maps.api.key" value="${maps.api.key}"/> - </filterset> - </else> - </if> - <copy file="./templates/mapsapikey.xml" todir="./res/values/" overwrite="true"> - <filterset refid="build-tokens" /> - </copy> - </target> - <target name="-pre-compile"> - </target> - - <!-- [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}] --> - <target name="-post-compile"> - </target> - - <target name="debugAPI" depends="-pre-build" - description="Changes API key to debug"> - </target> - <!-- 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>/tools/ant/ - Depending on the project type it can be either: - - main_rules.xml - - lib_rules.xml - - test_rules.xml - - To customize existing targets, there are two options: - - Customize only one target: - - copy/paste the target into this file, *before* the - <setup> task. - - customize it to your needs. - - Customize the whole script. - - copy/paste the content of the rules files (minus the top node) - into this file, *after* the <setup> task - - disable the import of the rules by changing the setup task - below to <setup import="false" />. - - customize to your needs. - --> - -</project> |