Improve isolation of ObjectiveC syntax filter code.

[cycript.git] / GNUmakefile.in

diff --git a/GNUmakefile.in b/GNUmakefile.in
index fb3037c724bc418ec391f855ca7bf06774d8da03..e2c6f7152c9a054f9350e174980b71db62694b79 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -60,17 +60,12 @@ CY_OBJECTIVEC := @CY_OBJECTIVEC@
 CY_OBJECTIVEC_MACH := @CY_OBJECTIVEC_MACH@
 CY_ATTACH_GROUP := @CY_ATTACH_GROUP@
 
-svn := @SVN@
-svnversion := @SVNVERSION@
+git := @GIT@
 
-ifneq ($(svnversion),)
-release := $(shell svnversion $(srcdir))
-
-ifneq ($(release),exported)
-gnutar := @GNUTAR@
-version := @PACKAGE_VERSION@.$(release)
-tarname := @PACKAGE_TARNAME@-$(version)
-endif
+ifneq ($(git),)
+version := $(shell $(git) describe --always --tags --dirty="+" --match="v*" | $(sed) -e 's@-\([^-]*\)-\([^-]*\)$$@+\1.\2@;s@^v@@')
+else
+version := @PACKAGE_VERSION@
 endif
 
 paths := $(foreach path,$(paths),$(wildcard $(path)))
@@ -88,6 +83,7 @@ header := Cycript.tab.hh Parser.hpp Pooling.hpp List.hpp Local.hpp cycript.hpp I
 
 code := 
 code += Replace.lo Output.lo
+code += Highlight.lo Display.lo
 code += Cycript.tab.lo lex.cy.lo
 code += Network.lo Parser.lo
 code += JavaScriptCore.lo Library.lo
@@ -113,7 +109,7 @@ filters += C
 header += JavaScript.hpp
 endif
 
-cflags += -Wall -Werror -Wno-parentheses #-Wno-unused
+cflags := -Wall -Werror -Wno-parentheses $(cflags)
 cflags += -fno-common
 ifneq ($(srcdir),.)
 cflags += -I.
@@ -138,7 +134,7 @@ control.tmp: control.in .libs/cycript .libs/$(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/#/$(version)/;s/%/$(arch)/' $< >$@
 else
 control.tmp: control.in
-       $(sed) -e 's/&/$(foreach depend,$(depends),$(depend),)/;s/,$$//;s/#/$(version)/;s/%/$(arch)/' $< >$@
+       $(sed) -e 's/&/$(depends)/;s/,$$//;s/#/$(version)/;s/%/$(arch)/' $< >$@
 endif
 endif
 
@@ -149,7 +145,6 @@ $(deb): $(all) control
        rm -rf package
        mkdir -p package/DEBIAN
        cp -pR control package/DEBIAN
-       #sed -i -e '/^Depends: / s/\<mobilesubstrate\>/mobilesubstrate (>= 0.9.3072)/g' package/DEBIAN/control
        mkdir -p package/usr/{bin,lib,sbin}
        cp -pR .libs/$(lib)cycript.0.$(dll) package/usr/lib
        cp -pR .libs/$(lib)cycript.$(dll) package/usr/lib
@@ -183,17 +178,17 @@ inject += Mach/Inject.lo
 Mach/Inject.lo: Trampoline.t.hpp Baton.hpp
 
 %.t.lo: %.t.cpp Baton.hpp Trampoline.hpp
-       $(libtool) --mode=compile $(cxx) $(cflags) -c -o $@ $< -fno-stack-protector -fno-exceptions
+       $(libtool) --mode=compile $(cxx) $(cflags) -c -o $@ $< -fno-stack-protector -fno-exceptions -O0
 
 %.t.hpp: %.t.lo trampoline.sh
-       $(srcdir)/trampoline.sh $@ .libs/lib$*.t.$(dll) $* $(sed) $(otool) $(lipo) $(nm) $(libtool) --mode=link $(cxx) $(ldflags) -o lib$*.t.la $< -rpath $(libdir)
+       $(srcdir)/trampoline.sh $@ .libs/lib$*.t.$(dll) $* $(sed) $(otool) $(lipo) $(nm) $(libtool) --mode=link $(cxx) $(ldflags) -o lib$*.t.la $< -rpath $(libdir) -Xcompiler -nostdlib
 endif
 endif
 
 all: $(all)
 
 clean::
-       rm -rf *.lo *.o *.d *.t.hpp .libs */*.d */*.lo */.libs lib*.la $(all) Struct.hpp lex.cy.c Cycript.tab.cc Cycript.tab.hh location.hh position.hh stack.hh Cycript.yy Cycript.l control Bridge.gperf Bridge.hpp Cycript.output
+       rm -rf *.lo *.o *.d *.t.hpp .libs */*.d */*.lo */.libs lib*.la $(all) Struct.hpp lex.cy.cpp Cycript.tab.cc Cycript.tab.hh location.hh position.hh stack.hh Cycript.yy Cycript.l control Bridge.gperf Bridge.hpp Cycript.output
 ifneq ($(srcdir),.)
        rm -rf Mach ObjectiveC sig
 endif
@@ -209,8 +204,10 @@ distclean: clean
 
 Cycript.tab.cc Cycript.tab.hh location.hh position.hh: Cycript.yy
        $(bison) -v --report=state $<
+       ! grep -n '^ *$$default  reduce using rule [0-9]* (Lex[A-Z][^)]*)$$' Cycript.output -B 2 | grep 'shift, and go to state [0-9]*$$'
+       ! grep -n '^ *$$default  reduce using rule [0-9]* (Lex[A-Z][^)]*)$$' Cycript.output -B 2 | grep -v '$$default' | grep 'reduce using rule [0-9]* ([^)]*)$$'
 
-lex.cy.c: Cycript.l
+lex.cy.cpp: Cycript.l
        $(flex) -t $< | $(sed) -e 's/int yyl;/yy_size_t yyl;/;s/int yyleng_r;/yy_size_t yyleng_r;/' >$@
 
 #Parser.hpp: Parser.py Parser.dat
@@ -219,7 +216,7 @@ lex.cy.c: Cycript.l
 Cycript.tab.lo: Cycript.tab.cc $(header)
        $(libtool) --mode=compile $(cxx) $(cflags) -c -o $@ $<
 
-lex.cy.lo: lex.cy.c $(header)
+lex.cy.lo: lex.cy.cpp $(header)
        $(libtool) --mode=compile $(cxx) $(cflags) -c -o $@ $<
 
 %.lo: %.cpp $(header)
@@ -243,12 +240,6 @@ test: cycript
        if [[ -e jquery.js ]]; then $(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
 
-ifneq ($(gnutar),:)
-dist:
-       echo -n >> $(tarname).tar.gz
-       $(gnutar) -cC $(srcdir) -f $(tarname).tar.gz -vX <($(svn) propget svn:ignore $(srcdir)) -z --exclude-vcs --show-transformed-names --transform='s#^\.#$(tarname)#' .
-endif
-
 install: cycript libcycript.la
        $(INSTALL) -d $(DESTDIR)$(bindir) $(DESTDIR)$(libdir)
        $(libtool) --mode=install $(INSTALL_PROGRAM) libcycript.la $(DESTDIR)$(libdir)/libcycript.la