X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/eed4f17489f121ce232ce88b6127b6d4288f867f..39ed6a515508c195281495054579ab82f30545e8:/GNUmakefile.in

diff --git a/GNUmakefile.in b/GNUmakefile.in
index e6d2ee3..e2c6f71 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -18,12 +18,15 @@ objcxx := @OBJCXX@
 cflags := @CPPFLAGS@ @CXXFLAGS@ -DYYDEBUG=1 $(filter -DHAVE_FFI% -DHAVE_READLINE% -DHAVE_HISTORY_H,@DEFS@)
 objcxxflags := @OBJCXXFLAGS@
 ldflags := @LDFLAGS@
+ltflags := @LTFLAGS@
 library := @LIBS@ @LTLIBAPR@ @LTLIBICONV@
 sed := @SED@
 bison := @BISON@
 time := @TIME@
 gperf := @GPERF@
-otool := @OTOOL@
+otool := @_OTOOL@
+lipo := @_LIPO@
+nm := @_NM@
 
 INSTALL := @INSTALL@
 INSTALL_PROGRAM := @INSTALL_PROGRAM@
@@ -55,25 +58,19 @@ mandir := @mandir@
 CY_EXECUTE := @CY_EXECUTE@
 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)))
 cflags += $(foreach path,$(paths),-I$(path) -L$(path))
 
-#svn := $(shell svnversion $(srcdir))
-
 all:
 all := cycript
 
@@ -82,10 +79,11 @@ all := cycript
 #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
+header := Cycript.tab.hh Parser.hpp Pooling.hpp List.hpp Local.hpp cycript.hpp Internal.hpp Error.hpp String.hpp Exception.hpp Standard.hpp
 
 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
@@ -94,10 +92,10 @@ inject :=
 
 filters := #E4X
 ldid := true
-entitle := $(ldid)
+entitle = $(ldid) -Scycript.xml
 lib := lib
-dll := so
-depends :=
+dll := @SO@
+depends ?=
 
 restart ?= $(MAKE)
 uname_s ?= $(shell uname -s)
@@ -111,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.
@@ -123,22 +121,20 @@ all += libcycript.la
 filters += $(shell $(bison) <(echo '%code{}%%_:') -o/dev/null 2>/dev/null && echo Bison24 || echo Bison23)
 
 ifdef arch
-deb := $(shell grep ^Package: $(srcdir)/control.in | cut -d ' ' -f 2-)_$(shell grep ^Version: $(srcdir)/control.in | cut -d ' ' -f 2 | $(sed) -e 's/\#/$(svn)/')_$(arch).deb
+deb := $(shell grep ^Package: $(srcdir)/control.in | cut -d ' ' -f 2-)_$(shell grep ^Version: $(srcdir)/control.in | cut -d ' ' -f 2 | $(sed) -e 's/\#/$(version)/')_$(arch).deb
 
 all:
 
-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)/' $< >$@
+control.tmp: control.in .libs/cycript .libs/$(lib)cycript.dylib
+	$(sed) -e 's/&/'"$$(dpkg-query -S $$(otool -lah .libs/cycript .libs/*.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/#/$(version)/;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)/' $< >$@
+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/#/$(svn)/;s/%/$(arch)/' $< >$@
+	$(sed) -e 's/&/$(depends)/;s/,$$//;s/#/$(version)/;s/%/$(arch)/' $< >$@
 endif
 endif
 
@@ -150,10 +146,9 @@ $(deb): $(all) control
 	mkdir -p package/DEBIAN
 	cp -pR control package/DEBIAN
 	mkdir -p package/usr/{bin,lib,sbin}
-	$(restart) extra
-	cp -pR $(lib)cycript.$(dll) package/usr/lib
-	cp -pR cycript package/usr/bin
-	#cp -pR cyrver package/usr/sbin
+	cp -pR .libs/$(lib)cycript.0.$(dll) package/usr/lib
+	cp -pR .libs/$(lib)cycript.$(dll) package/usr/lib
+	cp -pR .libs/cycript package/usr/bin
 	dpkg-deb -b package $(deb)
 endif
 
@@ -177,21 +172,23 @@ Struct.hpp:
 
 ifeq ($(CY_OBJECTIVEC_MACH),1)
 code += Handler.lo
-cflags += -DCY_ATTACH
+cflags += -DCY_ATTACH -DCY_LIBRARY='"$(libdir)/libcycript.$(dll)"'
 inject += Mach/Inject.lo
 
 Mach/Inject.lo: Trampoline.t.hpp Baton.hpp
 
-%.t.hpp: %.t.cpp trampoline.sh Baton.hpp Trampoline.hpp
-	# DOUG: abstract "lipo" and "nm" with configure?
-	./trampoline.sh $@ .libs/lib$*.t.dylib $* $(sed) $(otool) lipo nm $(libtool) --mode=compile $(cxx) -dynamiclib -fno-stack-protector -fno-exceptions -I$(srcdir)/include -o lib$*.t.la $< $(cflags)
+%.t.lo: %.t.cpp Baton.hpp Trampoline.hpp
+	$(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) -Xcompiler -nostdlib
 endif
 endif
 
 all: $(all)
 
 clean::
-	rm -rf *.lo *.o *.d *.t.hpp .libs */*.d */*.lo */.libs libcycript.la $(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.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
@@ -207,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
@@ -217,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)
@@ -227,12 +226,12 @@ lex.cy.lo: lex.cy.c $(header)
 	$(libtool) --mode=compile $(objcxx) $(objcxxflags) $(cflags) -c -o $@ $<
 
 libcycript.la: $(code)
-	$(libtool) --mode=link $(cxx) $(ldflags) -o $@ $(filter %.lo,$^) $(library) $(link) -rpath $(libdir)
-	$(ldid) $@
+	$(libtool) --mode=link $(cxx) $(ltflags) $(ldflags) -o $@ $(filter %.lo,$^) $(library) $(link) -rpath $(libdir)
+	$(ldid) .libs/$(lib)cycript.$(dll)
 
 cycript: Console.lo libcycript.la $(inject)
-	$(libtool) --mode=link $(cxx) $(ldflags) -o $@ $(filter %.lo,$^) libcycript.la $(link) -rpath $(libdir)
-	$(entitle) cycript
+	$(libtool) --mode=link $(cxx) $(ltflags) $(ldflags) -o $@ $(filter %.lo,$^) libcycript.la $(link) -rpath $(libdir)
+	$(entitle) .libs/cycript
 
 package: $(deb)
 
@@ -241,19 +240,17 @@ 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
 	$(libtool) --mode=install $(INSTALL_PROGRAM) cycript $(DESTDIR)$(bindir)/cycript
+ifneq ($(CY_ATTACH_GROUP),)
+	chgrp $(CY_ATTACH_GROUP) $(DESTDIR)$(bindir)/cycript
+	chmod g+s $(DESTDIR)$(bindir)/cycript
+endif
 
 uninstall:
 	$(libtool) --mode=uninstall rm -f $(DESTDIR)$(bindir)/cycript
 	$(libtool) --mode=uninstall rm -f $(DESTDIR)$(libdir)/libcycript.la
 
-.PHONY: all clean extra dist install uninstall package test control.tmp
+.PHONY: all clean dist install uninstall package test control.tmp