X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/933d3a50b8b88a737bc3e6b68d962e0d9dd9d99e..8150077d0a10c34bcc4ffd1df89a21028b98a7c9:/GNUmakefile.in?ds=inline

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 301a386..941bb2d 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -15,12 +15,18 @@ flex := @FLEX@
 libtool := @LIBTOOL@
 cxx := @CXX@
 objcxx := @OBJCXX@
-cflags := @CPPFLAGS@ @CXXFLAGS@ -DYYDEBUG=1 @DEFS@
+cflags := @CPPFLAGS@ @CXXFLAGS@ -DYYDEBUG=1 $(filter -DHAVE_FFI% -DHAVE_READLINE% -DHAVE_HISTORY_H,@DEFS@)
 objcxxflags := @OBJCXXFLAGS@
 ldflags := @LDFLAGS@
+ltflags := @LTFLAGS@
 library := @LIBS@ @LTLIBAPR@ @LTLIBICONV@
-time := $(shell which @TIME@)
+sed := @SED@
+bison := @BISON@
+time := @TIME@
 gperf := @GPERF@
+otool := @_OTOOL@
+lipo := @_LIPO@
+nm := @_NM@
 
 INSTALL := @INSTALL@
 INSTALL_PROGRAM := @INSTALL_PROGRAM@
@@ -51,24 +57,33 @@ mandir := @mandir@
 
 CY_EXECUTE := @CY_EXECUTE@
 CY_OBJECTIVEC := @CY_OBJECTIVEC@
+CY_OBJECTIVEC_MACH := @CY_OBJECTIVEC_MACH@
+CY_ATTACH_GROUP := @CY_ATTACH_GROUP@
+
+git := @GIT@
+
+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
 
-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 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
@@ -77,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)
@@ -91,6 +106,7 @@ cflags += -DCY_EXECUTE
 code += sig/ffi_type.lo sig/parse.lo sig/copy.lo
 code += Execute.lo Bridge.lo
 filters += C
+header += JavaScript.hpp
 endif
 
 cflags += -Wall -Werror -Wno-parentheses #-Wno-unused
@@ -102,25 +118,23 @@ cflags += -I$(srcdir) -I$(srcdir)/include
 
 all += libcycript.la
 
-filters += $(shell bison <(echo '%code{}%%_:') -o/dev/null 2>/dev/null && echo Bison24 || echo Bison23)
+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
 
@@ -132,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
 
@@ -144,7 +157,7 @@ Bridge.gperf: Bridge.def Bridge.sh
 	$(srcdir)/Bridge.sh $< >$@
 
 Bridge.hpp: Bridge.gperf
-	$(gperf) $< | sed -e 's/defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__/0/' >$@
+	$(gperf) $< | $(sed) -e 's/defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__/0/' >$@
 
 Bridge.lo: Bridge.hpp
 endif
@@ -156,18 +169,32 @@ code += ObjectiveC/Output.lo ObjectiveC/Replace.lo ObjectiveC/Library.lo
 
 Struct.hpp:
 	$$($(objcxx) -print-prog-name=cc1obj) -print-objc-runtime-info </dev/null >$@
+
+ifeq ($(CY_OBJECTIVEC_MACH),1)
+code += Handler.lo
+cflags += -DCY_ATTACH -DCY_LIBRARY='"$(libdir)/libcycript.$(dll)"'
+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 -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 .libs */*.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.c 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 sig ObjectiveC
+	rm -rf Mach ObjectiveC sig
 endif
 
 distclean: clean
-	rm -f GNUmakefile config.log config.status libtool
+	rm -f GNUmakefile Makefile config.log config.status libtool
 
 %.yy: %.yy.in
 	$(srcdir)/Filter.sh <$< >$@ $(filters)
@@ -176,10 +203,10 @@ distclean: clean
 	$(srcdir)/Filter.sh <$< >$@ $(filters)
 
 Cycript.tab.cc Cycript.tab.hh location.hh position.hh: Cycript.yy
-	bison -v --report=state $<
+	$(bison) -v --report=state $<
 
 lex.cy.c: Cycript.l
-	$(flex) -t $< | sed -e 's/int yyl;/yy_size_t yyl;/;s/int yyleng_r;/yy_size_t yyleng_r;/' >$@
+	$(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
 #	./Parser.py <Parser.dat >$@
@@ -197,12 +224,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)
 
@@ -215,9 +242,13 @@ 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 install uninstall package test control.tmp
+.PHONY: all clean dist install uninstall package test control.tmp