Further memory management improvements, fixed some weird vtable bugs with CYThis...

[cycript.git] / makefile

diff --git a/makefile b/makefile
index 024cd30cd85ec2646326f056a0d62a7e69f40835..c89396704997039b4aee9423ccc3c37d70a9d33c 100644 (file)
--- a/makefile
+++ b/makefile
@@ -6,36 +6,67 @@ endif
 
 package:
 
 
 package:
 

-name := Cyrver
-flags := -framework CFNetwork -framework JavaScriptCore -framework WebCore -install_name /usr/lib/libcyrver.dylib -I.
-menes := $(shell cd ~; pwd)/menes
+flags := -mthumb -g3 -O0 -Wall -Werror -I. -fno-common
+flags += -F${PKG_ROOT}/System/Library/PrivateFrameworks

 
 

-link := -framework CoreFoundation -framework Foundation -F${PKG_ROOT}/System/Library/PrivateFrameworks -L$(menes)/mobilesubstrate -lsubstrate -lapr-1 -lffi
-
-all: cyrver $(name).dylib libcyrver.plist
+all: cycript libcycript.dylib libcycript.plist

 
 clean:
 
 clean:

-       rm -f $(name).dylib
-
-libcyrver.plist: Bridge.def makefile
-       sed -e 's/^F/0/;s/^V/1/;s/^C/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 >$@
+       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
+
+libcycript.plist: Bridge.def
+       { \
+           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 ^: Bridge.def | sed -e 's/^: \([^ ]*\) \(.*\)/":\1" = "\2";/'; \
+       } >$@
+
+Cycript.tab.cc Cycript.tab.hh location.hh position.hh: Cycript.y
+       bison -v --report=state $<
+
+lex.cy.c: Cycript.l
+       flex $<

 
 Struct.hpp:
        $$($(target)gcc -print-prog-name=cc1obj) -print-objc-runtime-info </dev/null >$@
 
 
 Struct.hpp:
        $$($(target)gcc -print-prog-name=cc1obj) -print-objc-runtime-info </dev/null >$@
 

-$(name).dylib: Tweak.mm makefile $(menes)/mobilesubstrate/substrate.h sig/*.[ch]pp Struct.hpp
-       $(target)g++ -save-temps -dynamiclib -mthumb -g0 -O2 -Wall -Werror -o $@ $(filter %.cpp,$^) $(filter %.mm,$^) -lobjc -I$(menes)/mobilesubstrate $(link) $(flags)
+#Parser.hpp: Parser.py Parser.dat
+#      ./Parser.py <Parser.dat >$@
+
+%.o: sig/%.cpp
+       $(target)g++ $(flags) -c -o $@ $<
+
+Cycript.tab.o: Cycript.tab.cc Cycript.tab.hh Parser.hpp Pooling.hpp
+       $(target)g++ $(flags) -c -o $@ $<
+
+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
+       $(target)g++ $(flags) -c -o $@ $<
+
+Library.o: Library.mm Cycript.tab.hh Parser.hpp Pooling.hpp Struct.hpp cycript.hpp
+       $(target)g++ $(flags) -c -o $@ $<
+
+Application.o: Application.cpp Cycript.tab.hh Parser.hpp Pooling.hpp cycript.hpp
+       $(target)g++ $(flags) -c -o $@ $<
+
+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

        ldid -S $@
 
        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
+       ldid -S cycript
+

 package: all
        rm -rf package
        mkdir -p package/DEBIAN
 package: all
        rm -rf package
        mkdir -p package/DEBIAN


@@ -43,20 +74,20 @@ package: all
        mkdir -p package/Library/MobileSubstrate/DynamicLibraries
        if [[ -e Settings.plist ]]; then \
            mkdir -p package/Library/PreferenceLoader/Preferences; \
        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/$(name)Icon.png; \
-           cp -a Settings.plist package/Library/PreferenceLoader/Preferences/$(name).plist; \
+           cp -a Settings.png package/Library/PreferenceLoader/Preferences/CycriptIcon.png; \
+           cp -a Settings.plist package/Library/PreferenceLoader/Preferences/Cycript.plist; \

        fi
        fi

-       if [[ -e Tweak.plist ]]; then cp -a Tweak.plist package/Library/MobileSubstrate/DynamicLibraries/$(name).plist; fi
-       cp -a $(name).dylib package/Library/MobileSubstrate/DynamicLibraries
+       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}
        mkdir -p package/usr/{bin,lib}

-       mv package/Library/MobileSubstrate/DynamicLibraries/Cyrver.dylib package/usr/lib/libcyrver.dylib
-       ln -s /usr/lib/libcyrver.dylib package/Library/MobileSubstrate/DynamicLibraries/Cyrver.dylib
-       cp -a cyrver package/usr/bin
-       cp -a libcyrver.plist package/usr/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 $(shell grep ^Package: control | cut -d ' ' -f 2-)_$(shell grep ^Version: control | cut -d ' ' -f 2)_iphoneos-arm.deb
 
        dpkg-deb -b package $(shell grep ^Package: control | cut -d ' ' -f 2-)_$(shell grep ^Version: control | cut -d ' ' -f 2)_iphoneos-arm.deb
 

-.PHONY: all clean extra package
+test: package
+       dpkg -i $(shell grep ^Package: control | cut -d ' ' -f 2-)_$(shell grep ^Version: control | cut -d ' ' -f 2)_iphoneos-arm.deb
+       cycript /Applications/HelloCycript.app/HelloCycript

 
 

-cyrver: Application.mm Cyrver.dylib
-       $(target)g++ -g0 -O2 -Wall -Werror -o $@ $(filter %.mm,$^) -framework UIKit -framework Foundation -framework CoreFoundation -lobjc Cyrver.dylib -framework JavaScriptCore -F${PKG_ROOT}/System/Library/PrivateFrameworks
-       ldid -S cyrver
+.PHONY: all clean extra package