Always name signed binary .libs copies cycript_.

diff --git a/cycript.in b/cycript.in
index ebbc739607dbffc117bc44a1edbbee4ea0be9e1d..08bc5bc9ec08d32a85e9fc9531d3c40120f07c5f 100644 (file)
--- a/cycript.in
+++ b/cycript.in
@@ -19,4 +19,4 @@
 # along with Cycript.  If not, see <http://www.gnu.org/licenses/>.
 # }}}
 
 # along with Cycript.  If not, see <http://www.gnu.org/licenses/>.
 # }}}
 

-DYLD_LIBRARY_PATH=.libs exec .libs/cycript "$@"
+DYLD_LIBRARY_PATH=.libs exec .libs/cycript_ "$@"

diff --git a/xcode.mk b/xcode.mk
index c42bb93c38b133f47780251dfe1e3c6f87616592..aacbaaf703ba48adae01f81430e07e75d68efef3 100644 (file)
--- a/xcode.mk
+++ b/xcode.mk
@@ -28,7 +28,7 @@ version := $(shell git describe --always --tags --dirty="+" --match="v*" | sed -
 deb := cycript_$(version)_iphoneos-arm.deb
 
 cycript := 
 deb := cycript_$(version)_iphoneos-arm.deb
 
 cycript := 

-cycript += Cycript_/cycript
+cycript += Cycript_/cycript_

 cycript += Cycript_/libcycript.dylib
 cycript += Cycript_/libcycript-any.dylib
 cycript += Cycript_/libcycript-sys.dylib
 cycript += Cycript_/libcycript.dylib
 cycript += Cycript_/libcycript-any.dylib
 cycript += Cycript_/libcycript-sys.dylib


@@ -46,12 +46,12 @@ cycript.zip: all
 
 package: cycript.zip
 
 
 package: cycript.zip
 

-$(deb): Cycript_/cycript Cycript_/libcycript.dylib
+$(deb): Cycript_/cycript_ Cycript_/libcycript.dylib

        rm -rf package
        mkdir -p package/DEBIAN
        sed -e 's/#/$(version)/' control.in >package/DEBIAN/control
        mkdir -p package/usr/{bin,lib}
        rm -rf package
        mkdir -p package/DEBIAN
        sed -e 's/#/$(version)/' control.in >package/DEBIAN/control
        mkdir -p package/usr/{bin,lib}

-       $(lipo) -extract armv6 -output package/usr/bin/cycript Cycript_/cycript
+       $(lipo) -extract armv6 -output package/usr/bin/cycript Cycript_/cycript_

        $(lipo) -extract armv6 -extract arm64 -output package/usr/lib/libcycript.dylib Cycript_/libcycript.dylib
        ln -s libcycript.dylib package/usr/lib/libcycript.0.dylib
        dpkg-deb -Zlzma -b package $@
        $(lipo) -extract armv6 -extract arm64 -output package/usr/lib/libcycript.dylib Cycript_/libcycript.dylib
        ln -s libcycript.dylib package/usr/lib/libcycript.0.dylib
        dpkg-deb -Zlzma -b package $@


@@ -126,7 +126,7 @@ Cycript_/%.dylib: build.mac-i386/.libs/%.dylib build.mac-x86_64/.libs/%.dylib bu
        install_name_tool -change /System/Library/{,Private}Frameworks/JavaScriptCore.framework/JavaScriptCore $@
        codesign -s $(codesign) --entitlement cycript-$(word 2,$(subst ., ,$(subst -, ,$*))).xml $@
 
        install_name_tool -change /System/Library/{,Private}Frameworks/JavaScriptCore.framework/JavaScriptCore $@
        codesign -s $(codesign) --entitlement cycript-$(word 2,$(subst ., ,$(subst -, ,$*))).xml $@
 

-Cycript_/%: build.mac-i386/.libs/%_ build.mac-x86_64/.libs/%_ build.ios-armv6/.libs/%_
+Cycript_/%_: build.mac-i386/.libs/%_ build.mac-x86_64/.libs/%_ build.ios-armv6/.libs/%_

        @mkdir -p $(dir $@)
        $(lipo) -create -output $@ $^
 
        @mkdir -p $(dir $@)
        $(lipo) -create -output $@ $^