Fix on Linux?!

[cycript.git] / makefile

diff --git a/makefile b/makefile
index 1e5d57a6f1e6202c0d656147282edba34469c1c3..372ea9825aae3691f666a5c5ecb00214d51795c2 100644 (file)
--- a/makefile
+++ b/makefile
@@ -6,86 +6,101 @@ else
 target := $(PKG_TARG)-
 endif
 
 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:
 objc :=
 
 svn := $(shell svnversion)
 
 all:

-all := libcycript.db cycript
+all := cycript

 
 dpkg_architecture := $(shell which dpkg-architecture 2>/dev/null)
 ifneq ($(dpkg_architecture),)
 arch := $(shell $(dpkg_architecture) -qDEB_HOST_ARCH 2>/dev/null)
 endif
 
 
 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 := sig/ffi_type.o sig/parse.o sig/copy.o
+header := Cycript.tab.hh Parser.hpp Pooling.hpp cycript.hpp Internal.hpp Error.hpp String.hpp Exception.hpp Standard.hpp Context.hpp
+
+code := 

 code += Replace.o Output.o
 code += Cycript.tab.o lex.cy.o
 code += Network.o Parser.o
 code += JavaScriptCore.o Library.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 #E4X
+inject := 
+
+filters := #E4X

 ldid := true
 ldid := true

+entitle := $(ldid)

 dll := so
 dll := so

-apr := $(shell apr-1-config --link-ld)
-library := $(apr) -lffi -liconv -lsqlite3
+apr := -lapr-1
+library := 

 console := $(apr) -lreadline
 depends :=
 
 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
 
 -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
 endif
 endif
 ifeq ($(filter ObjectiveC,$(filters)),)
 ifneq ($(shell which gnustep-config 2>/dev/null),)
 include GNUstep.mk
 endif
 endif

+endif

 
 

-#flags += -g3 -O0 -DYYDEBUG=1
-flags += -g0 -O3

 flags += -Wall -Werror -Wno-parentheses #-Wno-unused
 flags += -fPIC -fno-common
 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
 
 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)
 
 
 all: $(deb)
 

-extra:
+extra::
+
+ifeq ($(depends)$(dll),dylib)
+control.tmp: 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.tmp: 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.tmp: control.in
+       sed -e 's/&/$(foreach depend,$(depends),$(depend),)/;s/,$$//;s/#/$(svn)/;s/%/$(arch)/' $< >$@
+endif
+endif
+
+control: control.tmp
+       [[ -e control ]] && diff control control.tmp &>/dev/null || cp -af control.tmp control

 
 

-$(deb): $(all)
+$(deb): $(all) control

        rm -rf package
        mkdir -p package/DEBIAN
        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 -pR control package/DEBIAN

        mkdir -p package/usr/{bin,lib,sbin}
        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:
        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
-
-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)
 
 %.y: %.y.in
        ./Filter.sh <$< >$@ $(filters)


@@ -119,14 +134,16 @@ libcycript.$(dll): $(code)
        $(target)g++ $(flags) -shared -dynamiclib -o $@ $(filter %.o,$^) $(library) $(link)
        $(ldid) $@
 
        $(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)
        $(target)g++ $(flags) -o $@ $(filter %.o,$^) -L. -lcycript $(console) $(link)

-       $(ldid) cycript
+       $(entitle) cycript

 
 package: $(deb)
 
 test: $(deb)
        dpkg -i $(deb)
 
 package: $(deb)
 
 test: $(deb)
        dpkg -i $(deb)

-       cycript test.cy
+       if [[ -e target.cy ]]; then cycript -c target.cy && echo; fi
+       if [[ -e jquery.js ]]; then /usr/bin/time cycript -c jquery.js >jquery.cyc.js; gzip -9c jquery.cyc.js >jquery.cyc.js.gz; wc -c jquery.{mam,gcc,cyc,bak,yui}.js; wc -c jquery.{gcc,cyc,bak,mam,yui}.js.gz; fi
+       if [[ -e test.cy ]]; then cycript test.cy; fi

 
 

-.PHONY: all clean extra package
+.PHONY: all clean extra package control.tmp