Permalink
Browse files

updated to not build final product only contributions

removed generated jni and obj files
removed generated overlay.zip
removed OtpErlang.jar it is now referenced from erlang build
script updated to accomodate all libs being in overlay now
dist target removed as this is done by build.final now

Change-Id: I2d2244b5a9ca362dbc5616a0e8b6027b6bf6a8d5
Reviewed-on: http://review.couchbase.org/10213
Tested-by: Marty Schoch <marty.schoch@gmail.com>
Reviewed-by: Marty Schoch <marty.schoch@gmail.com>
  • Loading branch information...
1 parent db291a4 commit b3e5afde7b7b65d4d2bd5f23460f45617c095298 @mschoch mschoch committed Oct 19, 2011
View
@@ -92,51 +92,7 @@
</jar>
</target>
- <target name="dist" depends="couchbase-jar">
- <zip destfile="bin/Couchbase.zip">
-
- <fileset dir="${basedir}">
- <include name="overlay.zip"/>
- </fileset>
-
- <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>
-
- <zip destfile="bin/Android-Couchbase.zip">
- <fileset dir="bin">
- <include name="Couchbase.zip"/>
- </fileset>
- <fileset dir="script">
- <include name="couchbase.xml"/>
- </fileset>
- <fileset dir="doc">
- <include name="README.txt"/>
- </fileset>
- </zip>
- </target>
-
<target name="jni">
- <unzip src="${basedir}/overlay.zip" dest="${basedir}/jni">
- <patternset>
- <include name="libs/armeabi/libbeam.so"/>
- </patternset>
- <mapper type="flatten"/>
- </unzip>
<exec dir="${basedir}/jni" executable="sh">
<arg line="${ndk.dir}/ndk-build"/>
</exec>
View
@@ -4,6 +4,6 @@ include $(CLEAR_VARS)
LOCAL_MODULE := com_couchbase_android_ErlangThread
LOCAL_SRC_FILES := com_couchbase_android_ErlangThread.cpp android_jni_nif.cpp
-LOCAL_LDLIBS := -llog -ldl -L$(LOCAL_PATH) -lbeam
+LOCAL_LDLIBS := -llog -ldl -L$(LOCAL_PATH) -L$(ERL_HOME)/bin/arm-unknown-eabi/ -lbeam
include $(BUILD_SHARED_LIBRARY)
View
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1 +0,0 @@
-!<arch>
@@ -1,200 +0,0 @@
-/Users/daleharvey/Lib/libcouch-android/obj/local/armeabi/objs/com_google_ase_Exec/com_google_ase_Exec.o: \
- /Users/daleharvey/Lib/libcouch-android/jni/com_google_ase_Exec.cpp \
- /Users/daleharvey/Lib/libcouch-android/jni/com_google_ase_Exec.h \
- /Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/jni.h \
- /Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/errno.h \
- /Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/sys/cdefs.h \
- /Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/sys/cdefs_elf.h \
- /Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/linux/errno.h \
- /Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/asm/errno.h \
- /Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/asm-generic/errno.h \
- /Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/asm-generic/errno-base.h \
- /Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/fcntl.h \
- /Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/sys/types.h \
- /Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/stdint.h \
- /Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/sys/_types.h \
- /Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/machine/_types.h \
- /Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/linux/posix_types.h \
- /Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/linux/stddef.h \
- /Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/linux/compiler.h \
- /Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/asm/posix_types.h \
- /Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/asm/types.h \
- /Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/linux/types.h \
- /Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/machine/kernel.h \
- /Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/sys/sysmacros.h \
- /Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/linux/fcntl.h \
- /Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/asm/fcntl.h \
- /Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/asm-generic/fcntl.h \
- /Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/unistd.h \
- /Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/sys/select.h \
- /Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/sys/time.h \
- /Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/linux/time.h \
- /Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/signal.h \
- /Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/limits.h \
- /Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/sys/limits.h \
- /Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/linux/limits.h \
- /Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/machine/internal_types.h \
- /Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/machine/limits.h \
- /Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/sys/syslimits.h \
- /Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/string.h \
- /Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/malloc.h \
- /Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/asm/signal.h \
- /Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/asm-generic/signal.h \
- /Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/asm/siginfo.h \
- /Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/asm-generic/siginfo.h \
- /Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/sys/sysconf.h \
- /Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/linux/capability.h \
- /Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/pathconf.h \
- /Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/stdlib.h \
- /Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/alloca.h \
- /Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/strings.h \
- /Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/memory.h \
- /Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/sys/ioctl.h \
- /Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/linux/ioctl.h \
- /Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/asm/ioctl.h \
- /Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/asm-generic/ioctl.h \
- /Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/asm/ioctls.h \
- /Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/asm/termbits.h \
- /Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/sys/ioctl_compat.h \
- /Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/sys/wait.h \
- /Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/sys/resource.h \
- /Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/linux/resource.h \
- /Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/asm/resource.h \
- /Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/asm-generic/resource.h \
- /Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/linux/wait.h \
- /Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/termios.h \
- /Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/linux/termios.h \
- /Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/asm/termios.h \
- /Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/android/log.h
-
-/Users/daleharvey/Lib/libcouch-android/jni/com_google_ase_Exec.h:
-
-/Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/jni.h:
-
-/Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/errno.h:
-
-/Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/sys/cdefs.h:
-
-/Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/sys/cdefs_elf.h:
-
-/Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/linux/errno.h:
-
-/Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/asm/errno.h:
-
-/Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/asm-generic/errno.h:
-
-/Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/asm-generic/errno-base.h:
-
-/Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/fcntl.h:
-
-/Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/sys/types.h:
-
-/Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/stdint.h:
-
-/Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/sys/_types.h:
-
-/Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/machine/_types.h:
-
-/Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/linux/posix_types.h:
-
-/Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/linux/stddef.h:
-
-/Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/linux/compiler.h:
-
-/Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/asm/posix_types.h:
-
-/Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/asm/types.h:
-
-/Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/linux/types.h:
-
-/Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/machine/kernel.h:
-
-/Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/sys/sysmacros.h:
-
-/Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/linux/fcntl.h:
-
-/Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/asm/fcntl.h:
-
-/Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/asm-generic/fcntl.h:
-
-/Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/unistd.h:
-
-/Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/sys/select.h:
-
-/Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/sys/time.h:
-
-/Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/linux/time.h:
-
-/Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/signal.h:
-
-/Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/limits.h:
-
-/Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/sys/limits.h:
-
-/Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/linux/limits.h:
-
-/Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/machine/internal_types.h:
-
-/Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/machine/limits.h:
-
-/Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/sys/syslimits.h:
-
-/Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/string.h:
-
-/Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/malloc.h:
-
-/Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/asm/signal.h:
-
-/Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/asm-generic/signal.h:
-
-/Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/asm/siginfo.h:
-
-/Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/asm-generic/siginfo.h:
-
-/Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/sys/sysconf.h:
-
-/Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/linux/capability.h:
-
-/Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/pathconf.h:
-
-/Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/stdlib.h:
-
-/Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/alloca.h:
-
-/Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/strings.h:
-
-/Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/memory.h:
-
-/Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/sys/ioctl.h:
-
-/Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/linux/ioctl.h:
-
-/Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/asm/ioctl.h:
-
-/Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/asm-generic/ioctl.h:
-
-/Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/asm/ioctls.h:
-
-/Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/asm/termbits.h:
-
-/Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/sys/ioctl_compat.h:
-
-/Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/sys/wait.h:
-
-/Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/sys/resource.h:
-
-/Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/linux/resource.h:
-
-/Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/asm/resource.h:
-
-/Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/asm-generic/resource.h:
-
-/Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/linux/wait.h:
-
-/Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/termios.h:
-
-/Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/linux/termios.h:
-
-/Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/asm/termios.h:
-
-/Users/daleharvey/Downloads/android-ndk-r5c/platforms/android-5/arch-arm/usr/include/android/log.h:
View
Binary file not shown.
@@ -15,11 +15,6 @@
<target name="update-libaries">
<unzip dest="${project.path}" src="${couchbase.tmp.dir}/overlay.zip"/>
- <copy todir="${project.path}/libs">
- <fileset dir="${couchbase.tmp.dir}/Couchbase/libs">
- <include name="**/*"/>
- </fileset>
- </copy>
</target>
<target name="check-classpath-otp">

0 comments on commit b3e5afd

Please sign in to comment.