X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/eacba955d0c7337521a8985868f86d525b8cc99c..3c1c3635db4635a7aef0a5f625678378f48b6696:/makefile?ds=sidebyside

diff --git a/makefile b/makefile
index a77d330..1e5d57a 100644
--- a/makefile
+++ b/makefile
@@ -12,7 +12,7 @@ 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),)
@@ -20,17 +20,17 @@ 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 
+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
-ldid := echo
+filters := C #E4X
+ldid := true
 dll := so
 apr := $(shell apr-1-config --link-ld)
-library := $(apr) -lffi
+library := $(apr) -lffi -liconv -lsqlite3
 console := $(apr) -lreadline
 depends :=
 
@@ -39,9 +39,15 @@ uname_p := $(shell uname -p)
 -include $(uname_s).mk
 -include $(uname_s)-$(uname_p).mk
 
-flags += -g3 -O0 -DYYDEBUG=1
-#flags += -g0 -O3
-flags += -Wall -Werror -Wno-parentheses
+ifeq ($(filter ObjectiveC,$(filters)),)
+ifneq ($(shell which gnustep-config 2>/dev/null),)
+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)
 
@@ -63,27 +69,28 @@ $(deb): $(all)
 	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
 
-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
@@ -95,28 +102,26 @@ 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 Cycript.tab.hh Parser.hpp Pooling.hpp
+Cycript.tab.o: Cycript.tab.cc $(header)
 	$(target)g++ $(flags) -c -o $@ $<
 
-lex.cy.o: lex.cy.c Cycript.tab.hh Parser.hpp Pooling.hpp
+lex.cy.o: lex.cy.c $(header)
 	$(target)g++ $(flags) -c -o $@ $<
 
 %.o: %.cpp $(header)
 	$(target)g++ $(flags) -c -o $@ $<
 
+#objc := -x c++
 %.o: %.mm $(header)
-	$(target)g++ $(flags) -c -o $@ $< $(objc)
+	$(target)g++ $(objc) $(flags) -c -o $@ $<
 
 libcycript.$(dll): $(code)
 	$(target)g++ $(flags) -shared -dynamiclib -o $@ $(filter %.o,$^) $(library) $(link)
-	$(ldid) -S $@
+	$(ldid) $@
 
 cycript: Console.o libcycript.$(dll)
 	$(target)g++ $(flags) -o $@ $(filter %.o,$^) -L. -lcycript $(console) $(link)
-	$(ldid) -S cycript
+	$(ldid) cycript
 
 package: $(deb)