CYPool::str*dup was leaking memory via global new.

[cycript.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 351fef38ac47758b0e1bc45670409596c21c1d29..2cc8b2a7c0ac0e73b72a2bed08ca40bb43d42286 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 # Cycript - Optimizing JavaScript Compiler/Runtime
 # Cycript - Optimizing JavaScript Compiler/Runtime

-# Copyright (C) 2009-2014  Jay Freeman (saurik)
+# Copyright (C) 2009-2015  Jay Freeman (saurik)

 
 # GNU Affero General Public License, Version 3 {{{
 #
 
 # GNU Affero General Public License, Version 3 {{{
 #


@@ -25,9 +25,16 @@ SUBDIRS =
 
 ACLOCAL_AMFLAGS = -I m4
 
 
 ACLOCAL_AMFLAGS = -I m4
 

-AM_CPPFLAGS = -I$(srcdir)/include -DYYDEBUG=1
+AM_CPPFLAGS = -DYYDEBUG=1

 AM_CPPFLAGS += -include config.h -include $(srcdir)/unconfig.h
 
 AM_CPPFLAGS += -include config.h -include $(srcdir)/unconfig.h
 

+AM_CFLAGS = -fvisibility=hidden
+AM_CXXFLAGS = -fvisibility=hidden
+AM_OBJCXXFLAGS = -fvisibility=hidden
+AM_LDFLAGS = -fvisibility=hidden
+
+AM_OBJCXXFLAGS += -fobjc-exceptions
+

 CY_LDFLAGS = -no-undefined -avoid-version -export-dynamic
 
 lib_LTLIBRARIES = 
 CY_LDFLAGS = -no-undefined -avoid-version -export-dynamic
 
 lib_LTLIBRARIES = 


@@ -39,15 +46,13 @@ libcycript_la_LIBADD = $(LTLIBFFI) $(LTLIBGCC) -ldl
 libcycript_la_SOURCES = ConvertUTF.c Decode.cpp Driver.cpp Highlight.cpp Library.cpp Network.cpp Output.cpp Parser.cpp Replace.cpp
 libcycript_la_SOURCES += Cycript.tab.cc lex.cy.cpp
 
 libcycript_la_SOURCES = ConvertUTF.c Decode.cpp Driver.cpp Highlight.cpp Library.cpp Network.cpp Output.cpp Parser.cpp Replace.cpp
 libcycript_la_SOURCES += Cycript.tab.cc lex.cy.cpp
 

-filters = $(CY_FILTERS)
+filters = 

 
 if CY_CONSOLE
 bin_PROGRAMS = cycript
 cycript_SOURCES = Console.cpp Display.cpp
 
 if CY_CONSOLE
 bin_PROGRAMS = cycript
 cycript_SOURCES = Console.cpp Display.cpp

-cycript_LDADD = libcycript.la $(LTLIBREADLINE) $(LTLIBTERMCAP) $(LTLIBGCC) -ldl
-
-ldid = true
-entitle = $(ldid) -S$(srcdir)/cycript.xml
+cycript_LDADD = libcycript.la $(LTLIBREADLINE) $(LTLIBTERMCAP) $(LTLIBGCC) $(PTHREAD_CFLAGS) -ldl
+libcycript_la_SOURCES += Complete.cpp

 endif
 
 if CY_EXECUTE
 endif
 
 if CY_EXECUTE


@@ -81,48 +86,33 @@ libcycript_la_SOURCES += ObjectiveC/Output.cpp ObjectiveC/Replace.cpp ObjectiveC
 libcycript_la_LIBADD += $(LTOBJECTIVEC)
 endif
 
 libcycript_la_LIBADD += $(LTOBJECTIVEC)
 endif
 

-if CY_MACH
-libcycript_la_SOURCES += Handler.mm
+if CY_ATTACH
+libcycript_la_SOURCES += Handler.cpp

 
 if CY_CONSOLE
 
 if CY_CONSOLE

-cycript_SOURCES += Mach/Inject.cpp
-
+cycript_SOURCES += Inject.cpp

 AM_CPPFLAGS += -DCY_ATTACH
 AM_CPPFLAGS += -DCY_ATTACH

-
-Mach/Inject.$(OBJEXT): Trampoline.t.hpp
-
-CLEANFILES += Trampoline.t.lo
-Trampoline.t.lo: Trampoline.t.cpp Trampoline.hpp Baton.hpp Standard.hpp
-       $(LTCXXCOMPILE) $(CY_ARCH) -c -o $@ $< -fno-stack-protector -O0
-
-CLEANFILES += libTrampoline.t.la
-libTrampoline.t.la: Trampoline.t.lo
-       $(CXXLINK) $(CY_ARCH) -rpath $(libdir) $^
-
-CLEANFILES += Trampoline.t.hpp
-Trampoline.t.hpp: libTrampoline.t.la trampoline.sh
-       $(srcdir)/trampoline.sh $@ .libs/libTrampoline.t.dylib Trampoline $(SED) $(LIPO) $(NM) $(OTOOL)
-       ! grep '## symbol stub for:' $@

 endif
 endif
 
 CLEANFILES += Cycript.yy
 Cycript.yy: Cycript.yy.in
 endif
 endif
 
 CLEANFILES += Cycript.yy
 Cycript.yy: Cycript.yy.in

-       $(srcdir)/Filter.sh <$< >$@ $(filters)
+       $(srcdir)/Filter.sh $< >$@ $(filters)

 
 CLEANFILES += Cycript.l
 
 CLEANFILES += Cycript.l

-Cycript.l: Cycript.l.in
-       $(srcdir)/Filter.sh <$< >$@ $(filters)
+Cycript.l: Cycript.l.in UnicodeIDStart.l UnicodeIDContinue.l
+       $(srcdir)/Filter.sh $< >$@ $(filters)

 
 CLEANFILES += lex.cy.cpp
 lex.cy.cpp: Cycript.l
 
 CLEANFILES += lex.cy.cpp
 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;/' >$@
+       $(FLEX) -b -t $< | $(SED) -e 's/int yyl;/yy_size_t yyl;/;s/int yyleng_r;/yy_size_t yyleng_r;/;s/yyg =/yyg __attribute__((__unused__)) =/' >$@
+       grep -F 'No backing up.' lex.backup >/dev/null

 
 Console.$(OBJEXT) Cycript.tab.lo Driver.lo Handler.lo Highlight.lo Library.lo lex.cy.lo: Cycript.tab.hh
 
 
 Console.$(OBJEXT) Cycript.tab.lo Driver.lo Handler.lo Highlight.lo Library.lo lex.cy.lo: Cycript.tab.hh
 

-CLEANFILES += Cycript.tab.cc Cycript.tab.hh location.hh position.hh stack.hh Cycript.output
-Cycript.tab.cc Cycript.tab.hh location.hh position.hh stack.hh Cycript.output: Cycript.yy
-       $(BISON) -v --report=state $<
+CLEANFILES += Cycript.tab.cc Cycript.tab.hh stack.hh Cycript.output
+Cycript.tab.cc Cycript.tab.hh stack.hh Cycript.output: Cycript.yy
+       $(BISON) -v --report=state -Werror $<

        ! grep -n '^State [0-9]* conflicts:' Cycript.output
        ! 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]* ([^)]*)$$'
        ! grep -n '^State [0-9]* conflicts:' Cycript.output
        ! 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]* ([^)]*)$$'