Started working on making the build environment more portable.

diff --git a/Console.cpp b/Console.cpp
index 9a60679ce5d2b3aab178307b026b5c872bd17694..0c5a13bed1211ce96e241986607734ad0bd9a252 100644 (file)
--- a/Console.cpp
+++ b/Console.cpp
@@ -39,7 +39,6 @@
 
 #define _GNU_SOURCE
 
-#include <substrate.h>
 #include "cycript.hpp"
 
 #include <cstdio>

diff --git a/Darwin-arm.mk b/Darwin-arm.mk
new file mode 100644 (file)
index 0000000..49139e1
--- /dev/null
+++ b/Darwin-arm.mk
@@ -0,0 +1,11 @@
+flags += -F${PKG_ROOT}/System/Library/PrivateFrameworks
+
+all += Cycript.$(dll) #cyrver
+
+arch := iphoneos-arm
+
+Cycript.$(dll): Connector.o
+       $(target)g++ $(flags) -dynamiclib -o $@ $(filter %.o,$^) \
+           -lobjc -lapr-1 -lsubstrate \
+           -framework CoreFoundation
+       ldid -S $@

diff --git a/Darwin.mk b/Darwin.mk
new file mode 100644 (file)
index 0000000..1a2a9db
--- /dev/null
+++ b/Darwin.mk
@@ -0,0 +1,6 @@
+dll := dylib
+
+header += Struct.hpp
+
+Struct.hpp:
+       $$($(target)gcc -print-prog-name=cc1obj) -print-objc-runtime-info </dev/null >$@

diff --git a/Library.mm b/Library.mm
index eb64e4567c46ca53f5daa7aa1165e655f607f22b..c5027c052ab77afcd70c9cbf7c652560de4cd12e 100644 (file)
--- a/Library.mm
+++ b/Library.mm
@@ -51,6 +51,7 @@
 #include <CoreFoundation/CoreFoundation.h>
 #include <CoreFoundation/CFLogUtilities.h>
 
+#include <JavaScriptCore/JSStringRefCF.h>
 #include <WebKit/WebScriptObject.h>
 
 #include <sys/mman.h>
@@ -98,6 +99,14 @@
 
 void CYThrow(JSContextRef context, JSValueRef value);
 
+const char *CYPoolCCYON(apr_pool_t *pool, JSContextRef context, JSValueRef value, JSValueRef *exception);
+JSStringRef CYCopyJSString(const char *value);
+
+void CYSetProperty(JSContextRef context, JSObjectRef object, JSStringRef name, JSValueRef value);
+
+JSValueRef CYCallFunction(apr_pool_t *pool, JSContextRef context, size_t setups, void *setup[], size_t count, const JSValueRef arguments[], bool initialize, JSValueRef *exception, sig::Signature *signature, ffi_cif *cif, void (*function)());
+JSValueRef CYSendMessage(apr_pool_t *pool, JSContextRef context, id self, SEL _cmd, size_t count, const JSValueRef arguments[], bool initialize, JSValueRef *exception);
+
 /* JavaScript Properties {{{ */
 JSValueRef CYGetProperty(JSContextRef context, JSObjectRef object, size_t index) {
     JSValueRef exception(NULL);

diff --git a/cycript.hpp b/cycript.hpp
index f89d8ca9ae8820925b7fdde266104a8c1070a36c..0ff8377bdb96e52b2180cf18d96b94aac944ae6a 100644 (file)
--- a/cycript.hpp
+++ b/cycript.hpp
@@ -45,7 +45,6 @@
 #endif
 
 #include <JavaScriptCore/JavaScript.h>
-#include <JavaScriptCore/JSStringRefCF.h>
 
 #include <apr-1/apr_pools.h>
 #include <ffi.h>
@@ -73,12 +72,4 @@ const char *CYExecute(apr_pool_t *pool, const char *code);
 
 void CYSetArgs(int argc, const char *argv[]);
 
-const char *CYPoolCCYON(apr_pool_t *pool, JSContextRef context, JSValueRef value, JSValueRef *exception);
-JSStringRef CYCopyJSString(const char *value);
-
-void CYSetProperty(JSContextRef context, JSObjectRef object, JSStringRef name, JSValueRef value);
-
-JSValueRef CYCallFunction(apr_pool_t *pool, JSContextRef context, size_t setups, void *setup[], size_t count, const JSValueRef arguments[], bool initialize, JSValueRef *exception, sig::Signature *signature, ffi_cif *cif, void (*function)());
-JSValueRef CYSendMessage(apr_pool_t *pool, JSContextRef context, id self, SEL _cmd, size_t count, const JSValueRef arguments[], bool initialize, JSValueRef *exception);
-
 #endif/*CYCRIPT_HPP*/

diff --git a/makefile b/makefile
index 82b9c3aedf5b2a63508fc812bbc4f735c42123bc..c0c46dc5bdcb44ce6c3949c82e01d68b75cb173f 100644 (file)
--- a/makefile
+++ b/makefile
@@ -6,17 +6,55 @@ endif
 
 #flags := -g3 -O0 -DYYDEBUG=1
 flags := -g0 -O3
-
 flags += -Wall -Werror -I. -fno-common
-flags += -F${PKG_ROOT}/System/Library/PrivateFrameworks
 
 svn := $(shell svnversion)
-deb := $(shell grep ^Package: control | cut -d ' ' -f 2-)_$(shell grep ^Version: control | cut -d ' ' -f 2 | sed -e 's/\#/$(svn)/')_iphoneos-arm.deb
-all := cycript libcycript.dylib libcycript.plist Cycript.dylib #cyrver
 
-header := Cycript.tab.hh Parser.hpp Pooling.hpp Struct.hpp cycript.hpp
+all:
+all := libcycript.plist cycript
+
+dpkg_architecture := $(shell dpkg-architecture &>/dev/null)
+ifneq ($(dpkg_architecture),)
+arch := $(shell $(dpkg_architecture) -qDEB_HOST_ARCH)
+endif
+
+header := Cycript.tab.hh Parser.hpp Pooling.hpp cycript.hpp
+
+dll := so
+
+uname_s := $(shell uname -s)
+uname_p := $(shell uname -p)
+-include $(uname_s).mk
+-include $(uname_s)-$(uname_p).mk
+
+all += libcycript.$(dll)
 
-$(deb):
+ifdef arch
+deb := $(shell grep ^Package: control | cut -d ' ' -f 2-)_$(shell grep ^Version: control | cut -d ' ' -f 2 | sed -e 's/\#/$(svn)/')_$(arch).deb
+
+all: $(deb)
+
+$(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.dylib package/Library/MobileSubstrate/DynamicLibraries
+       mkdir -p package/usr/{bin,lib,sbin}
+       cp -a libcycript.dylib package/usr/lib
+       cp -a cycript package/usr/bin
+       #cp -a cyrver package/usr/sbin
+       cp -a libcycript.plist package/usr/lib
+       dpkg-deb -b package $(deb)
+endif
 
 all: $(all)
 
@@ -40,9 +78,6 @@ Cycript.tab.cc Cycript.tab.hh location.hh position.hh: Cycript.y
 lex.cy.c: Cycript.l
        flex $<
 
-Struct.hpp:
-       $$($(target)gcc -print-prog-name=cc1obj) -print-objc-runtime-info </dev/null >$@
-
 #Parser.hpp: Parser.py Parser.dat
 #      ./Parser.py <Parser.dat >$@
 
@@ -67,13 +102,7 @@ cyrver: Server.o
            -framework CoreFoundation -framework CFNetwork
        ldid -S $@
 
-Cycript.dylib: Connector.o
-       $(target)g++ $(flags) -dynamiclib -o $@ $(filter %.o,$^) \
-           -lobjc -lapr-1 -lsubstrate \
-           -framework CoreFoundation
-       ldid -S $@
-
-libcycript.dylib: ffi_type.o parse.o Replace.o Output.o Cycript.tab.o lex.cy.o Library.o
+libcycript.$(dll): ffi_type.o parse.o Replace.o Output.o Cycript.tab.o lex.cy.o Library.o
        $(target)g++ $(flags) -dynamiclib -o $@ $(filter %.o,$^) \
            -install_name /usr/lib/libcycript.dylib \
            -lobjc -lapr-1 -lffi -lsubstrate \
@@ -90,27 +119,6 @@ cycript: Console.o libcycript.dylib
            -framework JavaScriptCore -framework UIKit
        ldid -S cycript
 
-$(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.dylib package/Library/MobileSubstrate/DynamicLibraries
-       mkdir -p package/usr/{bin,lib,sbin}
-       cp -a libcycript.dylib package/usr/lib
-       cp -a cycript package/usr/bin
-       #cp -a cyrver package/usr/sbin
-       cp -a libcycript.plist package/usr/lib
-       dpkg-deb -b package $(deb)
-
 package: $(deb)
 
 test: $(deb)