Slightly reorganized code, fixed @class to work with NoBF principal, integrated the...

[cycript.git] / makefile

diff --git a/makefile b/makefile
index 69a8c158402e3b2f8c2835c6c9ca1431dea01872..b153d52123f32700423732b137b7879631a42be4 100644 (file)
--- a/makefile
+++ b/makefile
@@ -4,15 +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 #cyrver
+
+header := Cycript.tab.hh Parser.hpp Pooling.hpp Struct.hpp cycript.hpp
+
+$(deb):
 
-all: cycript libcycript.dylib libcycript.plist
+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
@@ -20,18 +23,11 @@ clean:
 libcycript.plist: Bridge.def
        { \
            echo '({'; \
-           sed -e 's/^C/0/;s/^F/1/;s/^V/2/' Bridge.def | while read -r line; do \
-               if [[ $$line == '' ]]; then \
-                   continue; \
-               fi; \
-               set $$line; \
-               if [[ $$1 =~ [#fl:] ]]; then \
-                   continue; \
-               fi; \
-               echo "$$2 = ($$1, \"$${3//\"/\\\"}\");";  \
-           done; \
+           grep '^[CFV]' Bridge.def | sed -e 's/^C/0/;s/^F/1/;s/^V/2/' | sed -e 's/"/\\"/g;s/^\([^ ]*\) \([^ ]*\) \(.*\)$$/\2 = (\1, \"\3\");/'; \
            echo '},{'; \
-           grep ^: Bridge.def | sed -e 's/^: \([^ ]*\) \(.*\)/"\1" = "\2";/'; \
+           grep '^:' Bridge.def | sed -e 's/^: \([^ ]*\) \(.*\)/"\1" = "\2";/'; \
+           echo '},{'; \
+           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 '})'; \
        } >$@
 
@@ -56,27 +52,47 @@ Cycript.tab.o: Cycript.tab.cc Cycript.tab.hh Parser.hpp Pooling.hpp
 lex.cy.o: lex.cy.c Cycript.tab.hh Parser.hpp Pooling.hpp
        $(target)g++ $(flags) -c -o $@ $<
 
-Output.o: Output.cpp Parser.hpp Pooling.hpp
+%.o: %.cpp $(header)
        $(target)g++ $(flags) -c -o $@ $<
 
-Library.o: Library.mm Cycript.tab.hh Parser.hpp Pooling.hpp Struct.hpp cycript.hpp
+%.o: %.mm $(header)
        $(target)g++ $(flags) -c -o $@ $<
 
-Application.o: Application.mm Cycript.tab.hh Parser.hpp Pooling.hpp cycript.hpp
-       $(target)g++ $(flags) -c -o $@ $<
+cyrver: Server.o
+       $(target)g++ $(flags) -o $@ $(filter %.o,$^) \
+           -lobjc -lapr-1 -lsubstrate \
+           -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 Output.o Cycript.tab.o lex.cy.o Library.o
-       $(target)g++ $(flags) -dynamiclib -o $@ $(filter %.o,$^) -lobjc -framework CFNetwork -framework JavaScriptCore -framework WebCore -install_name /usr/lib/libcycript.dylib -framework CoreFoundation -framework Foundation -L$(menes)/mobilesubstrate -lsubstrate -lapr-1 -lffi -framework UIKit
+       $(target)g++ $(flags) -dynamiclib -o $@ $(filter %.o,$^) \
+           -install_name /usr/lib/libcycript.dylib \
+           -lobjc -lapr-1 -lffi -lsubstrate \
+           -framework CoreFoundation -framework Foundation \
+           -framework CFNetwork \
+           -framework JavaScriptCore -framework WebCore
        ldid -S $@
 
-cycript: Application.o libcycript.dylib
-       $(target)g++ $(flags) -o $@ $(filter %.o,$^) -framework UIKit -framework Foundation -framework CoreFoundation -lobjc libcycript.dylib -lreadline -framework JavaScriptCore -lapr-1
+cycript: Console.o libcycript.dylib
+       $(target)g++ $(flags) -o $@ $(filter %.o,$^) \
+           -lobjc -lapr-1 -lreadline \
+           -L. -lcycript \
+           -framework Foundation -framework CoreFoundation \
+           -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
+       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; \
@@ -84,15 +100,17 @@ 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
-       mkdir -p package/usr/{bin,lib}
+       cp -a Cycript.dylib package/Library/MobileSubstrate/DynamicLibraries
+       mkdir -p package/usr/{bin,lib,sbin}
        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 cyrver package/usr/sbin
        cp -a libcycript.plist package/usr/lib
        dpkg-deb -b package $(deb)
 
-test: package
+package: $(deb)
+
+test: $(deb)
        dpkg -i $(deb)
        cycript test.cy