Fixed packaging on Linux.

diff --git a/Darwin-arm.mk b/Darwin-arm.mk
index 974a5769ba29f64fc22e050e0bba6d2f72d3ac0a..0d150de982c0b0dcb68f282f57bcd5f98c7f8ad9 100644 (file)
--- a/Darwin-arm.mk
+++ b/Darwin-arm.mk
@@ -5,6 +5,7 @@ all += Cycript.$(dll) #cyrver
 arch := iphoneos-arm
 ldid := ldid -S
 console += -framework UIKit
+depends += readline libffi mobilesubstrate
 
 Cycript.$(dll): Connector.o
        $(target)g++ $(flags) -dynamiclib -o $@ $(filter %.o,$^) \
@@ -16,3 +17,16 @@ cyrver: Server.o
        $(target)g++ $(flags) -o $@ $(filter %.o,$^) \
            -lapr-1 -lsubstrate -framework CFNetwork
        $(ldid) $@
+
+extra:
+       mkdir -p package/System/Library/LaunchDaemons
+       #cp -a com.saurik.Cyrver.plist package/System/Library/LaunchDaemons
+       mkdir -p package/Library/MobileSubstrate/DynamicLibraries
+       if [[ -e Settings.plist ]]; then \
+           mkdir -p package/Library/PreferenceLoader/Preferences; \
+           cp -a Settings.png package/Library/PreferenceLoader/Preferences/CycriptIcon.png; \
+           cp -a Settings.plist package/Library/PreferenceLoader/Preferences/Cycript.plist; \
+       fi
+       if [[ -e Tweak.plist ]]; then cp -a Tweak.plist package/Library/MobileSubstrate/DynamicLibraries/Cycript.plist; fi
+       cp -a Cycript.$(dll) package/Library/MobileSubstrate/DynamicLibraries
+

diff --git a/Linux.mk b/Linux.mk
index 6c1906bcf10a85c6cb6bf04089d0dd1c083d6724..26b27ed57f88692c18a75bb46bd6d8ae80832665 100644 (file)
--- a/Linux.mk
+++ b/Linux.mk
@@ -1,2 +1,3 @@
 export PATH := /usr/local/bin:$(PATH)
 flags += -I/usr/include/webkit-1.0
+depends += libffi4 libreadline5

diff --git a/control b/control
index a072e6a15f7e65cb395978050a50bc389ff0550d..fbea69eb942ddf321c3ef6d868ef5ae7a6848faa 100644 (file)
--- a/control
+++ b/control
@@ -2,11 +2,11 @@ Package: cycript
 Priority: optional
 Section: Development
 Maintainer: Jay Freeman (saurik) <saurik@saurik.com>
-Architecture: iphoneos-arm
+Architecture: %
 Version: 0.9.#-1
 Description: runtime execution server and disassembler
 Name: Cycript
-Depends: mobilesubstrate (>= 0.9.3005-1), readline, libffi
+Depends: &
 Author: Jay Freeman (saurik) <saurik@saurik.com>
 Depiction: http://cydia.saurik.com/info/cycript/
 Tag: purpose::daemon, role::developer

diff --git a/makefile b/makefile
index ce70b5559424b2143183ee395fd32c0b5ede7890..2cd6880d5c503be2fea5784427379a1e85028c02 100644 (file)
--- a/makefile
+++ b/makefile
@@ -1,4 +1,4 @@
-SHELL :=$(shell which bash 2>/dev/null)
+SHELL := $(shell which bash 2>/dev/null)
 
 ifndef PKG_TARG
 target :=
@@ -6,8 +6,8 @@ else
 target := $(PKG_TARG)-
 endif
 
-#flags := -g3 -O0 -DYYDEBUG=1
-flags := -g0 -O3
+flags := -g3 -O0 -DYYDEBUG=1
+#flags := -g0 -O3
 flags += -Wall -Werror -Wno-parentheses
 flags += -fPIC -fno-common
 flags += -I. -I$(shell apr-1-config --includedir)
@@ -34,6 +34,7 @@ dll := so
 apr := $(shell apr-1-config --link-ld)
 library := $(apr) -lffi
 console := $(apr) -lreadline
+depends :=
 
 uname_s := $(shell uname -s)
 uname_p := $(shell uname -p)
@@ -47,20 +48,13 @@ deb := $(shell grep ^Package: control | cut -d ' ' -f 2-)_$(shell grep ^Version:
 
 all: $(deb)
 
+extra:
+
 $(deb): $(all)
        rm -rf package
        mkdir -p package/DEBIAN
-       sed -e 's/#/$(svn)/' control >package/DEBIAN/control
-       mkdir -p package/System/Library/LaunchDaemons
-       #cp -a com.saurik.Cyrver.plist package/System/Library/LaunchDaemons
-       mkdir -p package/Library/MobileSubstrate/DynamicLibraries
-       if [[ -e Settings.plist ]]; then \
-           mkdir -p package/Library/PreferenceLoader/Preferences; \
-           cp -a Settings.png package/Library/PreferenceLoader/Preferences/CycriptIcon.png; \
-           cp -a Settings.plist package/Library/PreferenceLoader/Preferences/Cycript.plist; \
-       fi
-       if [[ -e Tweak.plist ]]; then cp -a Tweak.plist package/Library/MobileSubstrate/DynamicLibraries/Cycript.plist; fi
-       cp -a Cycript.$(dll) package/Library/MobileSubstrate/DynamicLibraries
+       sed -e 's/&/$(foreach depend,$(depends),$(depend),)/;s/,$$//;s/#/$(svn)/;s/%/$(arch)/' control >package/DEBIAN/control
+       $(MAKE) extra
        mkdir -p package/usr/{bin,lib,sbin}
        cp -a libcycript.$(dll) package/usr/lib
        cp -a cycript package/usr/bin