Actually committing the file that fixed the int to size_t for the lexer warning.

[cycript.git] / makefile

diff --git a/makefile b/makefile
index fbcc62fcbd3b620c0f5c68a42124c5db32365d83..190fbb49ea4fa37dfe29602922c5c0b8e4b6588a 100644 (file)
--- a/makefile
+++ b/makefile
@@ -6,93 +6,118 @@ else
 target := $(PKG_TARG)-
 endif
 
 target := $(PKG_TARG)-
 endif
 

-flags :=
+gcc := g++
+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.plist 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 := 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 := 

 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
+inject := 
+
+filters := #E4X

 ldid := true
 ldid := true

+entitle := $(ldid)
+lib := lib

 dll := so
 apr := $(shell apr-1-config --link-ld)
 dll := so
 apr := $(shell apr-1-config --link-ld)

-library := $(apr) -lffi -liconv
+library := $(apr)

 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)
+uname_m ?= $(shell uname -m)
+

 -include $(uname_s).mk
 -include $(uname_s)-$(uname_p).mk
 
 -include $(uname_s).mk
 -include $(uname_s)-$(uname_p).mk
 

+ifneq ($(shell pkg-config libffi --modversion 2>/dev/null),)
+flags += $(shell pkg-config --cflags libffi)
+endif
+
+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 += -Wall -Werror -Wno-parentheses #-Wno-unused

-flags += -fPIC -fno-common
-flags += -I. -I$(shell apr-1-config --includedir)
+flags += -fno-common
+flags += -I. -Iinclude -I$(shell apr-1-config --includedir)
+
+all += $(lib)cycript.$(dll)

 
 

-all += libcycript.$(dll)
+filters += $(shell bison <(echo '%code{}%%_:') -o/dev/null 2>/dev/null && echo Bison24 || echo Bison23)

 
 ifdef arch
 
 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:

 
 

-all: $(deb)
+extra::

 
 

-extra:
+ifeq ($(depends)$(dll),dylib)
+control.tmp: control.in cycript $(lib)cycript.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 $(lib)cycript.so
+       sed -e 's/&/'"$$(dpkg-query -S $$(ldd cycript $(lib)cycript.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 -pRf 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.plist package/usr/lib
+       $(restart) extra
+       cp -pR $(lib)cycript.$(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.plist Struct.hpp lex.cy.c Cycript.tab.cc Cycript.tab.hh location.hh position.hh stack.hh cyrver Cycript.y
-
-libcycript.plist: Bridge.def
-       { \
-           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
+       rm -f *.o $(lib)cycript.$(dll) $(all) Struct.hpp lex.cy.c Cycript.tab.cc Cycript.tab.hh location.hh position.hh stack.hh cyrver Cycript.yy Cycript.l control Bridge.hpp
+
+%.yy: %.yy.in
+       ./Filter.sh <$< >$@ $(filters)
+
+%.l: %.l.in

        ./Filter.sh <$< >$@ $(filters)
 
        ./Filter.sh <$< >$@ $(filters)
 

-Cycript.tab.cc Cycript.tab.hh location.hh position.hh: Cycript.y
+Cycript.tab.cc Cycript.tab.hh location.hh position.hh: Cycript.yy

        bison -v --report=state $<
 
 lex.cy.c: Cycript.l
        bison -v --report=state $<
 
 lex.cy.c: Cycript.l


@@ -101,34 +126,37 @@ lex.cy.c: Cycript.l
 #Parser.hpp: Parser.py Parser.dat
 #      ./Parser.py <Parser.dat >$@
 
 #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)
 Cycript.tab.o: Cycript.tab.cc $(header)

-       $(target)g++ $(flags) -c -o $@ $<
+       $(target)$(gcc) $(flags) -c -o $@ $<

 
 lex.cy.o: lex.cy.c $(header)
 
 lex.cy.o: lex.cy.c $(header)

-       $(target)g++ $(flags) -c -o $@ $<
+       $(target)$(gcc) $(flags) -c -o $@ $<

 
 %.o: %.cpp $(header)
 
 %.o: %.cpp $(header)

-       $(target)g++ $(flags) -c -o $@ $<
+       $(target)$(gcc) $(flags) -c -o $@ $<

 
 #objc := -x c++
 %.o: %.mm $(header)
 
 #objc := -x c++
 %.o: %.mm $(header)

-       $(target)g++ $(objc) $(flags) -c -o $@ $<
+       $(target)$(gcc) $(objc) $(flags) -c -o $@ $<

 
 

-libcycript.$(dll): $(code)
-       $(target)g++ $(flags) -shared -dynamiclib -o $@ $(filter %.o,$^) $(library) $(link)
+$(lib)cycript.$(dll): $(code)
+       $(target)$(gcc) $(flags) -shared -dynamiclib -o $@ $(filter %.o,$^) $(library) $(link)

        $(ldid) $@
 
        $(ldid) $@
 

-cycript: Console.o libcycript.$(dll)
-       $(target)g++ $(flags) -o $@ $(filter %.o,$^) -L. -lcycript $(console) $(link)
-       $(ldid) cycript
+cycript: Console.o $(lib)cycript.$(dll) $(inject)
+       $(target)$(gcc) $(flags) -o $@ $(filter %.o,$^) -L. -lcycript $(console) $(link)
+       $(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.{cyc,gcc,bak,mam,yui}.js.gz; fi
+       if [[ -e test.cy ]]; then cycript test.cy; fi
+
+install: cycript $(lib)cycript.$(dll)
+       cp -p cycript /usr/bin
+       cp -p $(lib)cycript.$(dll) /usr/lib

 
 

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