Improved lexical syntax errors and added not-isatty detection for selecting the parse...

[cycript.git] / makefile

diff --git a/makefile b/makefile
index 20c4123aa2b614ebfcfb8987bd9d5b7f5a8aef08..7ed35d28151ae31fe531dd3f392ee139b6e91c36 100644 (file)
--- a/makefile
+++ b/makefile
@@ -4,17 +4,18 @@ else
 target := $(PKG_TARG)-
 endif
 
-package:
-
-flags := -mthumb -g3 -O0 -Wall -Werror -I. -fno-common
+flags := -mthumb -g0 -O3 -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
 
 header := Cycript.tab.hh Parser.hpp Pooling.hpp Struct.hpp cycript.hpp
 
-all: cycript libcycript.dylib libcycript.plist
+$(deb):
+
+all: $(all)
 
 clean:
        rm -f *.o libcycript.dylib cycript libcycript.plist Struct.hpp lex.cy.c Cycript.tab.cc Cycript.tab.hh location.hh position.hh stack.hh
@@ -26,7 +27,7 @@ libcycript.plist: Bridge.def
            echo '},{'; \
            grep '^:' Bridge.def | sed -e 's/^: \([^ ]*\) \(.*\)/"\1" = "\2";/'; \
            echo '},{'; \
-           grep '^S' Bridge.def | sed -e 's/^S/0/' | sed -e 's/"/\\"/g;s/^\([^ ]*\) \([^ ]*\) \(.*\)$$/\2 = (\1, \"\3\");/'; \
+           grep '^[EST]' Bridge.def | sed -e 's/^S/0/;s/^T/1/;s/^E/2/' | sed -e 's/^2\(.*\)$$/1\1 i/' | sed -e 's/"/\\"/g;s/^\([^ ]*\) \([^ ]*\) \(.*\)$$/\2 = (\1, \"\3\");/'; \
            echo '})'; \
        } >$@
 
@@ -57,16 +58,22 @@ lex.cy.o: lex.cy.c Cycript.tab.hh Parser.hpp Pooling.hpp
 %.o: %.mm $(header)
        $(target)g++ $(flags) -c -o $@ $<
 
+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 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 \
+           -lobjc -lapr-1 -lffi -lsubstrate \
            -framework CoreFoundation -framework Foundation \
            -framework CFNetwork \
            -framework JavaScriptCore -framework WebCore
        ldid -S $@
 
-cycript: Application.o libcycript.dylib
+cycript: Console.o libcycript.dylib
        $(target)g++ $(flags) -o $@ $(filter %.o,$^) \
            -lobjc -lapr-1 -lreadline \
            -L. -lcycript \
@@ -74,7 +81,7 @@ cycript: Application.o libcycript.dylib
            -framework JavaScriptCore -framework UIKit
        ldid -S cycript
 
-package: all
+$(deb): $(all)
        rm -rf package
        mkdir -p package/DEBIAN
        sed -e 's/#/$(svn)/' control >package/DEBIAN/control
@@ -85,15 +92,16 @@ package: all
            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
+       cp -a Cycript.dylib package/Library/MobileSubstrate/DynamicLibraries
        mkdir -p package/usr/{bin,lib}
        cp -a libcycript.dylib package/usr/lib
-       #ln -s /usr/lib/libcycript.dylib package/Library/MobileSubstrate/DynamicLibraries/Cycript.dylib
        cp -a cycript package/usr/bin
        cp -a libcycript.plist package/usr/lib
        dpkg-deb -b package $(deb)
 
-test: package
+package: $(deb)
+
+test: $(deb)
        dpkg -i $(deb)
        cycript test.cy