Factored out the execution engine from the compiler.

[cycript.git] / makefile

diff --git a/makefile b/makefile
index b7895326d1978bd1f14907f94de46a3243ff7cf9..8ea1d3da2c834e18521b92e089a92753e89042b0 100644 (file)
--- a/makefile
+++ b/makefile
@@ -15,7 +15,7 @@ objc :=
 svn := $(shell svnversion)
 
 all:
-all := libcycript.db cycript
+all := cycript
 
 dpkg_architecture := $(shell which dpkg-architecture 2>/dev/null)
 ifneq ($(dpkg_architecture),)
@@ -23,17 +23,21 @@ arch := $(shell $(dpkg_architecture) -qDEB_HOST_ARCH 2>/dev/null)
 endif
 
 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 := 
 code += Replace.o Output.o
 code += Cycript.tab.o lex.cy.o
 code += Network.o Parser.o
 code += JavaScriptCore.o Library.o
 
-filters := C #E4X
+inject := 
+
+filters := #E4X
 ldid := true
+entitle := $(ldid)
 dll := so
-apr := $(shell apr-1-config --link-ld)
-library := $(apr) -lffi -lsqlite3
+apr := -lapr-1
+library := 
 console := $(apr) -lreadline
 depends :=
 
@@ -44,51 +48,56 @@ uname_p ?= $(shell uname -p)
 -include $(uname_s).mk
 -include $(uname_s)-$(uname_p).mk
 
+ifdef CY_EXECUTE
 ifeq ($(filter ObjectiveC,$(filters)),)
 ifneq ($(shell which gnustep-config 2>/dev/null),)
-#include GNUstep.mk
+include GNUstep.mk
+endif
 endif
 endif
 
 flags += -Wall -Werror -Wno-parentheses #-Wno-unused
 flags += -fPIC -fno-common
-flags += -I. -I$(shell apr-1-config --includedir)
+flags += -I. -Iinclude -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:
+extra::
 
-$(deb): $(all)
+ifeq ($(depends)$(dll),dylib)
+control: control.in cycript libcycript.dylib
+       sed -e 's/&/'"$$(dpkg-query -S $$(otool -lah cycript *.dylib | grep dylib | grep -v ':$$' | sed -e 's/^ *name //;s/ (offset [0-9]*)$$//' | sort -u) 2>/dev/null | sed -e 's/:.*//; /^cycript$$/ d; s/$$/,/' | sort -u | tr '\n' ' ')"'/;s/, $$//;s/#/$(svn)/;s/%/$(arch)/' $< >$@
+else
+ifeq ($(depends)$(dll),so)
+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
+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
-       $(restart) extra
+       cp -pR control package/DEBIAN
        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.db package/usr/lib
+       $(restart) extra
+       cp -pR libcycript.$(dll) package/usr/lib
+       cp -pR cycript package/usr/bin
+       #cp -pR cyrver package/usr/sbin
        dpkg-deb -b package $(deb)
 endif
 
 all: $(all)
 
 clean:
-       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
-
-libcycript.db: Bridge.def
-       rm -f libcycript.db
-       { \
-           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
+       rm -f *.o libcycript.$(dll) $(all) Struct.hpp lex.cy.c Cycript.tab.cc Cycript.tab.hh location.hh position.hh stack.hh cyrver Cycript.y Cycript.l control
 
 %.y: %.y.in
        ./Filter.sh <$< >$@ $(filters)
@@ -122,9 +131,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)
 
@@ -132,4 +141,4 @@ test: $(deb)
        dpkg -i $(deb)
        cycript test.cy
 
-.PHONY: all clean extra package
+.PHONY: all clean extra package control