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
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
filters := #E4X
ldid := true
-entitle := $(ldid)
+entitle = $(ldid) -Scycript.xml
lib := lib
dll := @SO@
-depends :=
+depends ?=
restart ?= $(MAKE)
uname_s ?= $(shell uname -s)
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
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
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 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 Mach ObjectiveC sig
endif
libcycript.la: $(code)
$(libtool) --mode=link $(cxx) $(ltflags) $(ldflags) -o $@ $(filter %.lo,$^) $(library) $(link) -rpath $(libdir)
- $(ldid) $@
+ $(ldid) .libs/$(lib)cycript.$(dll)
cycript: Console.lo libcycript.la $(inject)
$(libtool) --mode=link $(cxx) $(ltflags) $(ldflags) -o $@ $(filter %.lo,$^) libcycript.la $(link) -rpath $(libdir)
- $(entitle) cycript
+ $(entitle) .libs/cycript
package: $(deb)
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=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
projects / cycript.git / blobdiff