X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/c3c20102b2ff644ebf7831202d0544066dcf0765..48e3be8aedf3d63652b4d0c6167992164f2d0623:/makefile?ds=sidebyside

diff --git a/makefile b/makefile
index db6dfa5..7ed35d2 100644
--- a/makefile
+++ b/makefile
@@ -4,29 +4,35 @@ else
 target := $(PKG_TARG)-
 endif
 
-package:
+flags := -mthumb -g0 -O3 -Wall -Werror -I. -fno-common
+flags += -F${PKG_ROOT}/System/Library/PrivateFrameworks
 
-flags := -mthumb -g3 -O0 -Wall -Werror -I.
+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
 
-all: cycript libcycript.dylib libcycript.plist
+header := Cycript.tab.hh Parser.hpp Pooling.hpp Struct.hpp cycript.hpp
+
+$(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
+	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 >$@
+	{ \
+	    echo '({'; \
+	    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";/'; \
+	    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 '})'; \
+	} >$@
 
 Cycript.tab.cc Cycript.tab.hh location.hh position.hh: Cycript.y
-	bison --report=state $<
+	bison -v --report=state $<
 
 lex.cy.c: Cycript.l
 	flex $<
@@ -38,32 +44,47 @@ Struct.hpp:
 #	./Parser.py <Parser.dat >$@
 
 %.o: sig/%.cpp
-	$(target)g++ -c -o $@ $< $(flags)
+	$(target)g++ $(flags) -c -o $@ $<
 
 Cycript.tab.o: Cycript.tab.cc Cycript.tab.hh Parser.hpp Pooling.hpp
-	$(target)g++ -c -o $@ $< $(flags)
+	$(target)g++ $(flags) -c -o $@ $<
 
 lex.cy.o: lex.cy.c Cycript.tab.hh Parser.hpp Pooling.hpp
-	$(target)g++ -c -o $@ $< $(flags)
+	$(target)g++ $(flags) -c -o $@ $<
 
-Output.o: Output.cpp Parser.hpp Pooling.hpp
-	$(target)g++ -c -o $@ $< $(flags)
+%.o: %.cpp $(header)
+	$(target)g++ $(flags) -c -o $@ $<
 
-Library.o: Library.mm Cycript.tab.hh Parser.hpp Pooling.hpp Struct.hpp
-	$(target)g++ -c -o $@ $< $(flags)
+%.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++ -I. -dynamiclib -mthumb -g3 -O0 -Wall -Werror -o $@ $(filter %.o,$^) -lobjc -framework CFNetwork -framework JavaScriptCore -framework WebCore -install_name /usr/lib/libcycript.dylib -framework CoreFoundation -framework Foundation -F${PKG_ROOT}/System/Library/PrivateFrameworks -L$(menes)/mobilesubstrate -lsubstrate -lapr-1 -lffi
+	$(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.mm libcycript.dylib
-	$(target)g++ -g0 -O2 -Wall -Werror -o $@ $(filter %.mm,$^) -framework UIKit -framework Foundation -framework CoreFoundation -lobjc libcycript.dylib
+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
-	cp -a control package/DEBIAN
+	sed -e 's/#/$(svn)/' control >package/DEBIAN/control
 	mkdir -p package/Library/MobileSubstrate/DynamicLibraries
 	if [[ -e Settings.plist ]]; then \
 	    mkdir -p package/Library/PreferenceLoader/Preferences; \
@@ -71,16 +92,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
+	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 $(shell grep ^Package: control | cut -d ' ' -f 2-)_$(shell grep ^Version: control | cut -d ' ' -f 2)_iphoneos-arm.deb
+	dpkg-deb -b package $(deb)
+
+package: $(deb)
 
-test: package
-	dpkg -i $(shell grep ^Package: control | cut -d ' ' -f 2-)_$(shell grep ^Version: control | cut -d ' ' -f 2)_iphoneos-arm.deb
-	cycript
+test: $(deb)
+	dpkg -i $(deb)
+	cycript test.cy
 
 .PHONY: all clean extra package