X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/82149e4b02351e37499d65e3e2aa5942b556d8a7..b6961e537b5468dc0458808fdacba4a3291e1d48:/makefile

diff --git a/makefile b/makefile
index fbcc62f..b4cf765 100644
--- a/makefile
+++ b/makefile
@@ -6,47 +6,53 @@ else
 target := $(PKG_TARG)-
 endif
 
-flags :=
+flags ?= -g3 -O0 -DYYDEBUG=1
+
+paths := $(foreach path,$(paths),$(wildcard $(path)))
+flags += $(foreach path,$(paths),-I$(path) -L$(path))
 objc :=
 
 svn := $(shell svnversion)
 
 all:
-all := libcycript.plist cycript
+all := libcycript.db cycript
 
 dpkg_architecture := $(shell which dpkg-architecture 2>/dev/null)
 ifneq ($(dpkg_architecture),)
 arch := $(shell $(dpkg_architecture) -qDEB_HOST_ARCH 2>/dev/null)
 endif
 
-header := Cycript.tab.hh Parser.hpp Pooling.hpp cycript.hpp
-code := ffi_type.o parse.o 
+header := Cycript.tab.hh Parser.hpp Pooling.hpp cycript.hpp Internal.hpp Error.hpp String.hpp Exception.hpp Standard.hpp
+code := sig/ffi_type.o sig/parse.o sig/copy.o
 code += Replace.o Output.o
 code += Cycript.tab.o lex.cy.o
 code += Network.o Parser.o
 code += JavaScriptCore.o Library.o
 
-filters := C
+inject := 
+
+filters := C #E4X
 ldid := true
+entitle := $(ldid)
 dll := so
 apr := $(shell apr-1-config --link-ld)
-library := $(apr) -lffi -liconv
+library := $(apr) -lffi -lsqlite3
 console := $(apr) -lreadline
 depends :=
 
-uname_s := $(shell uname -s)
-uname_p := $(shell uname -p)
+restart ?= $(MAKE)
+uname_s ?= $(shell uname -s)
+uname_p ?= $(shell uname -p)
+
 -include $(uname_s).mk
 -include $(uname_s)-$(uname_p).mk
 
 ifeq ($(filter ObjectiveC,$(filters)),)
 ifneq ($(shell which gnustep-config 2>/dev/null),)
-include GNUstep.mk
+#include GNUstep.mk
 endif
 endif
 
-#flags += -g3 -O0 -DYYDEBUG=1
-flags += -g0 -O3
 flags += -Wall -Werror -Wno-parentheses #-Wno-unused
 flags += -fPIC -fno-common
 flags += -I. -I$(shell apr-1-config --includedir)
@@ -54,42 +60,51 @@ flags += -I. -I$(shell apr-1-config --includedir)
 all += libcycript.$(dll)
 
 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
+deb := $(shell grep ^Package: control.in | cut -d ' ' -f 2-)_$(shell grep ^Version: control.in | cut -d ' ' -f 2 | sed -e 's/\#/$(svn)/')_$(arch).deb
 
 all: $(deb)
 
 extra:
 
-$(deb): $(all)
+ifeq ($(depends),)
+control: control.in cycript libcycript.so
+	sed -e 's/&/'"$$(dpkg-query -S $$(ldd cycript libcycript.so | sed -e '/:$$/ d; s/^[ \t]*\([^ ]* => \)\?\([^ ]*\) .*/\2/' | sort -u) 2>/dev/null | sed -e 's/:.*//; /^cycript$$/ d; s/$$/,/' | sort -u | tr '\n' ' ')"'/;s/, $$//;s/#/$(svn)/;s/%/$(arch)/' $< >$@
+else
+control: control.in
+	sed -e 's/&/$(foreach depend,$(depends),$(depend),)/;s/,$$//;s/#/$(svn)/;s/%/$(arch)/' $< >$@
+endif
+
+$(deb): $(all) control
 	rm -rf package
 	mkdir -p package/DEBIAN
-	sed -e 's/&/$(foreach depend,$(depends),$(depend),)/;s/,$$//;s/#/$(svn)/;s/%/$(arch)/' control >package/DEBIAN/control
-	$(MAKE) extra
+	cp -a control package/DEBIAN
+	$(restart) extra
 	mkdir -p package/usr/{bin,lib,sbin}
 	cp -a libcycript.$(dll) package/usr/lib
 	cp -a cycript package/usr/bin
 	#cp -a cyrver package/usr/sbin
-	cp -a libcycript.plist package/usr/lib
+	cp -a libcycript.db package/usr/lib
 	dpkg-deb -b package $(deb)
 endif
 
 all: $(all)
 
 clean:
-	rm -f *.o libcycript.$(dll) cycript libcycript.plist Struct.hpp lex.cy.c Cycript.tab.cc Cycript.tab.hh location.hh position.hh stack.hh cyrver Cycript.y
+	rm -f *.o libcycript.$(dll) cycript libcycript.db Struct.hpp lex.cy.c Cycript.tab.cc Cycript.tab.hh location.hh position.hh stack.hh cyrver Cycript.y Cycript.l control
 
-libcycript.plist: Bridge.def
+libcycript.db: Bridge.def
+	rm -f libcycript.db
 	{ \
-	    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.y: Cycript.y.in
+	    echo 'create table "bridge" ("mode" int not null, "name" text not null, "value" text null);'; \
+	    grep '^[CFV]' Bridge.def | sed -e 's/^C/0/;s/^F/1/;s/^V/2/' | sed -e 's/"/\\"/g;s/^\([^ ]*\) \([^ ]*\) \(.*\)$$/insert into "bridge" ("mode", "name", "value") values (\1, '"'"'\2'"'"', '"'"'\3'"'"');/'; \
+	    grep '^:' Bridge.def | sed -e 's/^: \([^ ]*\) \(.*\)/insert into "bridge" ("mode", "name", "value") values (-1, '"'"'\1'"'"', '"'"'\2'"'"');/'; \
+	    grep '^[EST]' Bridge.def | sed -e 's/^S/3/;s/^T/4/;s/^E/5/' | sed -e 's/^5\(.*\)$$/4\1 i/' | sed -e 's/^\([^ ]*\) \([^ ]*\) \(.*\)$$/insert into "bridge" ("mode", "name", "value") values (\1, '"'"'\2'"'"', '"'"'\3'"'"');/'; \
+	} | sqlite3 libcycript.db
+
+%.y: %.y.in
+	./Filter.sh <$< >$@ $(filters)
+
+%.l: %.l.in
 	./Filter.sh <$< >$@ $(filters)
 
 Cycript.tab.cc Cycript.tab.hh location.hh position.hh: Cycript.y
@@ -101,9 +116,6 @@ lex.cy.c: Cycript.l
 #Parser.hpp: Parser.py Parser.dat
 #	./Parser.py <Parser.dat >$@
 
-%.o: sig/%.cpp
-	$(target)g++ $(flags) -c -o $@ $<
-
 Cycript.tab.o: Cycript.tab.cc $(header)
 	$(target)g++ $(flags) -c -o $@ $<
 
@@ -121,9 +133,9 @@ libcycript.$(dll): $(code)
 	$(target)g++ $(flags) -shared -dynamiclib -o $@ $(filter %.o,$^) $(library) $(link)
 	$(ldid) $@
 
-cycript: Console.o libcycript.$(dll)
+cycript: Console.o libcycript.$(dll) $(inject)
 	$(target)g++ $(flags) -o $@ $(filter %.o,$^) -L. -lcycript $(console) $(link)
-	$(ldid) cycript
+	$(entitle) cycript
 
 package: $(deb)