Skip to content
This repository has been archived by the owner on Mar 9, 2022. It is now read-only.

Commit

Permalink
add support for building with ant
Browse files Browse the repository at this point in the history
moved commons-compress from lib/ to libs/
removed scripts no longer needed by new install process
Couchbase.zip is generated by running 'ant dist'

Change-Id: If89ef94781444d05d3133a602c846e1b53f735d2
Reviewed-on: http://review.couchbase.org/9279
Reviewed-by: Marty Schoch <marty.schoch@gmail.com>
Reviewed-by: Chris Anderson <jchris@couchbase.com>
Tested-by: Chris Anderson <jchris@couchbase.com>
  • Loading branch information
mschoch authored and Chris Anderson committed Aug 30, 2011
1 parent b7a5579 commit bb98bde
Show file tree
Hide file tree
Showing 14 changed files with 343 additions and 294 deletions.
2 changes: 1 addition & 1 deletion .classpath
Expand Up @@ -3,6 +3,6 @@
<classpathentry kind="src" path="src"/> <classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="gen"/> <classpathentry kind="src" path="gen"/>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/> <classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
<classpathentry kind="lib" path="lib/commons-compress-1.0.jar"/> <classpathentry kind="lib" path="libs/commons-compress-1.0.jar"/>
<classpathentry kind="output" path="bin"/> <classpathentry kind="output" path="bin"/>
</classpath> </classpath>
4 changes: 3 additions & 1 deletion .gitignore
@@ -1,2 +1,4 @@
bin bin
gen gen
local.properties
.DS_Store
109 changes: 109 additions & 0 deletions build.xml
@@ -0,0 +1,109 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="." 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 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" />


<!-- Required pre-setup import -->
<import file="${sdk.dir}/tools/ant/pre_setup.xml" />


<!-- extension targets. Uncomment the ones where you want to do custom work
in between standard targets -->
<!--
<target name="-pre-build">
</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>
-->

<!-- 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.
-->
<setup />

<!-- added by marty, per this discussion http://code.google.com/p/android/issues/detail?id=13024 -->
<path id="android.libraries.src"><path refid="project.libraries.src" /></path>
<path id="android.libraries.jars"><path refid="project.libraries.jars" /></path>

<target name="couchbase-jar" depends="compile">
<jar destfile="bin/couchbase.jar" basedir="bin/classes" excludes="**/R*"/>
</target>

<target name="dist" depends="couchbase-jar">
<zip destfile="bin/Couchbase.zip">

<mappedresources>
<fileset dir="${basedir}">
<include name="assets/**/*"/>
<include name="libs/**/*"/>
<include name="script/**/*"/>
</fileset>
<globmapper from="*" to="Couchbase/*"/>
</mappedresources>

<mappedresources>
<fileset dir="${basedir}/bin">
<include name="couchbase.jar"/>
</fileset>
<globmapper from="*" to="Couchbase/libs/*"/>
</mappedresources>

</zip>
</target>

</project>
File renamed without changes.
40 changes: 40 additions & 0 deletions proguard.cfg
@@ -0,0 +1,40 @@
-optimizationpasses 5
-dontusemixedcaseclassnames
-dontskipnonpubliclibraryclasses
-dontpreverify
-verbose
-optimizations !code/simplification/arithmetic,!field/*,!class/merging/*

-keep public class * extends android.app.Activity
-keep public class * extends android.app.Application
-keep public class * extends android.app.Service
-keep public class * extends android.content.BroadcastReceiver
-keep public class * extends android.content.ContentProvider
-keep public class * extends android.app.backup.BackupAgentHelper
-keep public class * extends android.preference.Preference
-keep public class com.android.vending.licensing.ILicensingService

-keepclasseswithmembernames class * {
native <methods>;
}

-keepclasseswithmembers class * {
public <init>(android.content.Context, android.util.AttributeSet);
}

-keepclasseswithmembers class * {
public <init>(android.content.Context, android.util.AttributeSet, int);
}

-keepclassmembers class * extends android.app.Activity {
public void *(android.view.View);
}

-keepclassmembers enum * {
public static **[] values();
public static ** valueOf(java.lang.String);
}

-keep class * implements android.os.Parcelable {
public static final android.os.Parcelable$Creator *;
}
135 changes: 0 additions & 135 deletions script/add-couchbase-to-project.xml

This file was deleted.

2 changes: 0 additions & 2 deletions script/build.properties.template

This file was deleted.

2 changes: 1 addition & 1 deletion script/classpath.xsl → script/classpath.compress.xsl
Expand Up @@ -11,7 +11,7 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:template match="classpath"> <xsl:template match="classpath">
<xsl:copy> <xsl:copy>
<xsl:apply-templates select="@*|node()"/> <xsl:apply-templates select="@*|node()"/>
<classpathentry kind="lib" path="/Android-Couchbase/lib/commons-compress-1.0.jar"/> <classpathentry kind="lib" path="libs/commons-compress-1.0.jar"/>
</xsl:copy> </xsl:copy>
</xsl:template> </xsl:template>


Expand Down
18 changes: 18 additions & 0 deletions script/classpath.couchbase.xsl
@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform">

<xsl:template match="@*|node()">
<xsl:copy>
<xsl:apply-templates select="@*|node()"/>
</xsl:copy>
</xsl:template>

<xsl:template match="classpath">
<xsl:copy>
<xsl:apply-templates select="@*|node()"/>
<classpathentry kind="lib" path="libs/couchbase.jar"/>
</xsl:copy>
</xsl:template>

</xsl:stylesheet>

0 comments on commit bb98bde

Please sign in to comment.