Compile Java support for armv6 where we use JamVM.

[cycript.git] / build.mk

diff --git a/build.mk b/build.mk
index 4190112efb50985f106aed3dc2ebf14b38633dfa..7f0d8903fbd5bd036a495ccb4c9c88b669e12b3a 100644 (file)
--- a/build.mk
+++ b/build.mk
@@ -70,6 +70,7 @@ local += Cycript.lib/libcycript-sim.dylib
 
 android := $(data)
 android += Cycript.lib/cycript-a32
+android += Cycript.lib/cycript-pie
 android += Cycript.lib/libcycript.so
 android += Cycript.lib/libJavaScriptCore.so
 android += Cycript.lib/l/linux
@@ -91,11 +92,12 @@ $(deb): Cycript.lib/cycript-apl Cycript.lib/libcycript.dylib Cycript.lib/libcycr
        mkdir -p package/DEBIAN
        sed -e 's/#/$(version)/' control.in >package/DEBIAN/control
        mkdir -p package/usr/{bin,lib}
-       cp -a modules package/usr/lib/cycript0.9
+       cp -a cycript0.9 package/usr/lib/cycript0.9
        $(lipo) -extract armv6 -output package/usr/bin/cycript Cycript.lib/cycript-apl
        $(lipo) -extract armv6 -extract arm64 -output package/usr/lib/libcycript.dylib Cycript.lib/libcycript.dylib
        ln -s libcycript.dylib package/usr/lib/libcycript.0.dylib
        cp -a libcycript.cy package/usr/lib/libcycript.cy
+       cp -a Cycript.lib/libcycript.jar package/usr/lib/libcycript.jar
        cp -a Cycript.lib/libcycript.db package/usr/lib/libcycript.db
        sqlite3 package/usr/lib/libcycript.db "delete from cache where system & $$(($$(cat build.ios-arm{v6,64}/Makefile | sed -e '/^CY_SYSTEM = \([0-9]*\)$$/{s//\1/;p;};d;' | tr $$'\n' '|') 0)) == 0; vacuum full;"
        ./dpkg-deb.sh -Zlzma -b package $@
@@ -187,6 +189,8 @@ clean += clean-and-$(1)
 db += build.and-$(1)/libcycript.db
 build.and-$(1)/.libs/cycript: build-and-$(1)
        @
+build.and-$(1)/cycript-pie: build-and-$(1)
+       @
 build.and-$(1)/.libs/libcycript.so: build-and-$(1)
        @
 build.and-$(1)/libcycript.db: build-and-$(1)
@@ -220,6 +224,10 @@ Cycript.lib/%: terminfo/%
        @mkdir -p $(dir $@)
        cp -af $< $@
 
+Cycript.lib/cycript-pie: build.and-armeabi/cycript-pie
+       @mkdir -p $(dir $@)
+       cp -af $< $@
+
 %_: %
        @cp -af $< $@
        install_name_tool -change /System/Library/{,Private}Frameworks/JavaScriptCore.framework/JavaScriptCore $@
@@ -270,8 +278,7 @@ Cycript.lib/libcycript.cy:
 
 Cycript.lib/libcycript.db: $(db)
        @mkdir -p $(dir $@)
-       ./libcycript.sh 0 $@
-       ./libcycript.py $@ $^
+       ./libcycript.py 0 $@ $(dir $(abspath $(lastword $(MAKEFILE_LIST)))) $^ </dev/null
 
 Cycript.lib/libcycript.jar: build.osx-x86_64/libcycript.jar
        @mkdir -p $(dir $@)
@@ -279,7 +286,7 @@ Cycript.lib/libcycript.jar: build.osx-x86_64/libcycript.jar
 
 Cycript.lib/cycript0.9:
        @mkdir -p $(dir $@)
-       ln -s ../modules $@
+       ln -sf ../cycript0.9 $@
 
 cycript: cycript.in
        cp -af $< $@