Changeset 423cbe

Timestamp:

02/05/12 00:36:15 (4 months ago)

Author:

Erik Ekman <erik@…>

Branches:

master

Children:

24f195

Parents:

85be9b

git-author:

Erik Ekman <erik@…> (02/05/12 00:36:15)

git-committer:

Erik Ekman <erik@…> (02/05/12 00:36:15)

Message:

Added android specific readme file, along with new make targets

Also updated changelog.

Files:

• CHANGELOG (modified) (1 diff)
• Makefile (modified) (3 diffs)
• README-android.txt (added)
• src/Makefile (modified) (1 diff)

CHANGELOG

@@ -36 +36 @@
         - Add -R option to set OpenBSD routing domain for the DNS socket.
                 Patch by laurent at gouloum fr, fixes #95.
+        - Add android patches and makefile, from Marcel Bokhorst, fixes #105.
+        - Added missing break in iodine.c, by Pavel Pergamenshchik, #108.
 
 2009-06-01: 0.5.2 "WifiFree"

Makefile

@@ -20 +20 @@
         @(cd src; $(MAKE) TARGETOS=$(TARGETOS) all)
 
+cross-android:
+        @(cd src; $(MAKE) base64u.c base64u.h)
+        @(cd src; ndk-build NDK_PROJECT_PATH=. APP_BUILD_SCRIPT=Android.mk)
+
+cross-android-dist:
+        @rm -rf iodine-latest-android*
+        @mkdir -p iodine-latest-android/armeabi iodine-latest-android/x86
+        @$(MAKE) cross-android TARGET_ARCH_ABI=armeabi
+        @cp src/libs/armeabi/* iodine-latest-android/armeabi
+        @$(MAKE) cross-android TARGET_ARCH_ABI=x86
+        @cp src/libs/x86/* iodine-latest-android/x86
+        @cp README README-android.txt CH* TO* iodine-latest-android
+        @echo "Create date: " > iodine-latest-android/VERSION
+        @date >> iodine-latest-android/VERSION
+        @echo "Git version: " >> iodine-latest-android/VERSION
+        @git rev-parse HEAD >> iodine-latest-android/VERSION
+        @zip -r iodine-latest-android.zip iodine-latest-android
+
 cross-mingw: 
         @(cd src; $(MAKE) TARGETOS=windows32 CC=i686-mingw32-gcc all)
@@ -28 +46 @@
         @for i in `ls bin`; do cp bin/$$i iodine-latest-win32/bin/$$i.exe; done
         @cp /usr/i686-mingw32/usr/bin/zlib1.dll iodine-latest-win32/bin
-        @cp README* CH* TO* iodine-latest-win32
+        @cp README README-win32.txt CH* TO* iodine-latest-win32
         @echo "Create date: " > iodine-latest-win32/VERSION
         @date >> iodine-latest-win32/VERSION
-        @echo "SVN version: " >> iodine-latest-win32/VERSION
-        @svnversion >> iodine-latest-win32/VERSION
+        @echo "Git version: " >> iodine-latest-win32/VERSION
+        @git rev-parse HEAD >> iodine-latest-win32/VERSION
         @zip -r iodine-latest-win32.zip iodine-latest-win32
 
@@ -59 +77 @@
         @(cd src; $(MAKE) clean)
         @(cd tests; $(MAKE) clean)
-        @rm -rf bin iodine-latest-win32*
+        @rm -rf bin iodine-latest-win32* iodine-latest-android*
 

src/Makefile

@@ -44 +44 @@
         @echo "Cleaning src/"
         @rm -f $(CLIENT){,.exe} $(SERVER){,.exe} *~ *.o *.core base64u.*
+        @rm -rf obj libs #android stuff