"Lazy" Java initialization resets signal handlers.

[cycript.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 0f567cbdf2b4c97959f46905ab0186477ccf9e40..f32b3bfe624c95a77efad1d39519de20379752f4 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
-# Cycript - Optimizing JavaScript Compiler/Runtime
-# Copyright (C) 2009-2015  Jay Freeman (saurik)
+# Cycript - The Truly Universal Scripting Language
+# Copyright (C) 2009-2016  Jay Freeman (saurik)

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


@@ -25,25 +25,39 @@ SUBDIRS =
 
 ACLOCAL_AMFLAGS = -I m4
 
 
 ACLOCAL_AMFLAGS = -I m4
 

-AM_CPPFLAGS = -DYYDEBUG=1
+AM_CPPFLAGS = -DYYDEBUG=1 -DCY_SYSTEM="\"$(CY_SYSTEM)\""

 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
+CY_FLAGS = 
+CY_FLAGS += -fvisibility=hidden
+
+if CY_ANDROID
+CY_FLAGS += -fPIE
+endif
+
+AM_CFLAGS = $(CY_FLAGS)
+AM_CXXFLAGS = $(CY_FLAGS)
+AM_OBJCXXFLAGS = $(CY_FLAGS)
+AM_LDFLAGS = $(CY_FLAGS)
+
+if CY_ANDROID
+AM_LDFLAGS += -rdynamic -fPIE -pie
+endif

 
 AM_OBJCXXFLAGS += -fobjc-exceptions
 
 CY_LDFLAGS = -no-undefined -avoid-version -export-dynamic
 
 
 AM_OBJCXXFLAGS += -fobjc-exceptions
 
 CY_LDFLAGS = -no-undefined -avoid-version -export-dynamic
 

+datdir = $(libdir)
+dat_DATA = 
+

 lib_LTLIBRARIES = 
 
 lib_LTLIBRARIES += libcycript.la
 libcycript_la_LDFLAGS = $(CY_LDFLAGS)
 lib_LTLIBRARIES = 
 
 lib_LTLIBRARIES += libcycript.la
 libcycript_la_LDFLAGS = $(CY_LDFLAGS)

-libcycript_la_LIBADD = $(LTLIBUV) $(LTLIBFFI) $(LTLIBGCC) -ldl
+libcycript_la_LIBADD = $(LTLIBUV) $(LTLIBFFI) $(LTLIBSQLITE3) $(LTLIBGCC) -ldl

 
 

-libcycript_la_SOURCES = ConvertUTF.c Decode.cpp Driver.cpp Highlight.cpp Library.cpp Network.cpp Output.cpp Replace.cpp Syntax.cpp
+libcycript_la_SOURCES = ConvertUTF.c Decode.cpp Driver.cpp Error.cpp Highlight.cpp Library.cpp Network.cpp Output.cpp Replace.cpp Syntax.cpp

 libcycript_la_SOURCES += Parser.cpp Scanner.cpp
 
 filters = 
 libcycript_la_SOURCES += Parser.cpp Scanner.cpp
 
 filters = 


@@ -53,34 +67,82 @@ bin_PROGRAMS = cycript
 cycript_SOURCES = Console.cpp
 cycript_LDADD = libcycript.la $(LTLIBREADLINE) $(LTLIBTERMCAP) $(LTLIBGCC) $(PTHREAD_CFLAGS) -ldl
 libcycript_la_SOURCES += Complete.cpp
 cycript_SOURCES = Console.cpp
 cycript_LDADD = libcycript.la $(LTLIBREADLINE) $(LTLIBTERMCAP) $(LTLIBGCC) $(PTHREAD_CFLAGS) -ldl
 libcycript_la_SOURCES += Complete.cpp

+
+if CY_ANDROID
+bin_PROGRAMS += cycript-pie
+cycript_pie_SOURCES = pie.c
+cycript_pie_LDFLAGS = -fno-PIE
+endif

 endif
 
 if CY_EXECUTE
 libcycript_la_SOURCES += sig/ffi_type.cpp sig/parse.cpp sig/copy.cpp
 endif
 
 if CY_EXECUTE
 libcycript_la_SOURCES += sig/ffi_type.cpp sig/parse.cpp sig/copy.cpp

-libcycript_la_SOURCES += Bridge.cpp Execute.cpp JavaScriptCore.cpp
+libcycript_la_SOURCES += Execute.cpp JavaScriptCore.cpp

 libcycript_la_LIBADD += $(LTJAVASCRIPTCORE)
 libcycript_la_LIBADD += $(LTJAVASCRIPTCORE)

+dat_DATA += libcycript.db

 
 AM_CPPFLAGS += -DCY_EXECUTE
 filters += C
 
 
 AM_CPPFLAGS += -DCY_EXECUTE
 filters += C
 

-Bridge.lo: Bridge.hpp
+CLEANFILES += libcycript.db
+libcycript.db: Bridge.def libcycript.py
+       $(srcdir)/libcycript.py $(CY_SYSTEM) $@ $(srcdir) <$<
+
+if CY_PRELINK
+CY_LANGFLAGS = -DCY_JAVA=$(CY_JAVA) -DCY_PYTHON=$(CY_PYTHON) -DCY_OBJECTIVEC=$(CY_OBJECTIVEC)

 
 

-CLEANFILES += Bridge.gperf
-Bridge.gperf: Bridge.def Bridge.sh
-       $(srcdir)/Bridge.sh $< >$@
+CLEANFILES += Analyze
+Analyze: Analyze.cpp Error.cpp Output.cpp Replace.cpp Syntax.cpp
+       $(CXX_FOR_BUILD) $(CXXFLAGS_FOR_BUILD) -std=c++11 $(LDFLAGS_FOR_BUILD) $(CY_LANGFLAGS) -I$(srcdir)/extra -o $@ $^ $(CY_LIBCLANG) -Wno-bitwise-op-parentheses -Wno-dangling-else -Wno-logical-op-parentheses

 
 

-CLEANFILES += Bridge.hpp
-Bridge.hpp: Bridge.gperf
-       $(GPERF) $< >$@
+CLEANFILES += Bridge.def
+Bridge.def: Analysis.cpp Analyze
+       ./Analyze $< $(OBJCXX) $(CPPFLAGS) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) $(CY_LANGFLAGS) >$@
+else
+CLEANFILES += Bridge.def
+Bridge.def: Bridge.def.in
+       cat $< >$@
+endif
+
+#CLEANFILES += Hasher.gperf
+#Hasher.gperf: Hasher.def Hasher.sh
+#      $(srcdir)/Hasher.sh <$< >$@
+
+#CLEANFILES += Hasher.hpp
+#Hasher.hpp: Hasher.gperf
+#      $(GPERF) $< >$@

 endif
 
 if CY_JAVA
 filters += Java
 libcycript_la_SOURCES += Java/Execute.cpp
 endif
 
 if CY_JAVA
 filters += Java
 libcycript_la_SOURCES += Java/Execute.cpp

-libcycript_la_LIBADD += $(LTJAVA)
+dat_DATA += libcycript.jar
+
+CLEANFILES += Class
+Class/Cycript.class: Java/Cycript.java
+       rm -rf Class; mkdir Class; javac -g -Xlint:unchecked -source 1.5 -target 1.5 -d Class -sourcepath $(srcdir)/Java $<
+Class/classes.dex: Class/Cycript.class
+       cd Class; dx --dex --output=../$@ *.class
+
+CLEANFILES += libcycript.jar
+libcycript.jar: Class/classes.dex Class/Cycript.class
+       cd Class; jar cf ../$@ *
+endif
+
+if CY_RUBY
+filters += Ruby
+libcycript_la_SOURCES += Ruby/Execute.cpp
+libcycript_la_LIBADD += $(LTRUBY)
+endif
+
+if CY_PYTHON
+filters += Python
+libcycript_la_SOURCES += Python/Execute.cpp
+libcycript_la_LIBADD += $(LTPYTHON)

 endif
 
 if CY_OBJECTIVEC
 endif
 
 if CY_OBJECTIVEC

+AM_CPPFLAGS += -DCY_OBJECTIVEC

 filters += ObjectiveC
 libcycript_la_SOURCES += ObjectiveC/Output.cpp ObjectiveC/Replace.cpp ObjectiveC/Library.mm
 libcycript_la_LIBADD += $(LTOBJECTIVEC)
 filters += ObjectiveC
 libcycript_la_SOURCES += ObjectiveC/Output.cpp ObjectiveC/Replace.cpp ObjectiveC/Library.mm
 libcycript_la_LIBADD += $(LTOBJECTIVEC)


@@ -111,11 +173,14 @@ Scanner.cpp: Scanner.lpp
        ! grep -F ': warning, ' Scanner.output || true
 
 Scanner.lo: Parser.hpp IdentifierStart.h IdentifierContinue.h
        ! grep -F ': warning, ' Scanner.output || true
 
 Scanner.lo: Parser.hpp IdentifierStart.h IdentifierContinue.h

+Parser.lo: Parser.hpp
+Parser.cpp: Parser.hpp

 
 CLEANFILES += Parser.cpp Parser.hpp stack.hh Parser.output
 
 CLEANFILES += Parser.cpp Parser.hpp stack.hh Parser.output

-Parser.cpp Parser.hpp stack.hh Parser.output: Parser.ypp
+Parser.hpp: Parser.ypp

        $(BISON) -v --report=state -Werror -o Parser.cpp $<
        ! grep -n '^State [0-9]* conflicts:' Parser.output
        ! grep -n '^ *.* *reduce using rule [0-9]* (Lex[A-Z][^)]*)$$' Parser.output | grep -v '$$default'
        ! grep -n '^ *$$default *reduce using rule [0-9]* (Lex[A-Z][^)]*)$$' Parser.output -B 2 | grep 'shift, and go to state [0-9]*$$'
        ! grep -n '^ *$$default *reduce using rule [0-9]* (Lex[A-Z][^)]*)$$' Parser.output -B 2 | grep -v '$$default' | grep 'reduce using rule [0-9]* ([^)]*)$$'
        $(BISON) -v --report=state -Werror -o Parser.cpp $<
        ! grep -n '^State [0-9]* conflicts:' Parser.output
        ! grep -n '^ *.* *reduce using rule [0-9]* (Lex[A-Z][^)]*)$$' Parser.output | grep -v '$$default'
        ! grep -n '^ *$$default *reduce using rule [0-9]* (Lex[A-Z][^)]*)$$' Parser.output -B 2 | grep 'shift, and go to state [0-9]*$$'
        ! grep -n '^ *$$default *reduce using rule [0-9]* (Lex[A-Z][^)]*)$$' Parser.output -B 2 | grep -v '$$default' | grep 'reduce using rule [0-9]* ([^)]*)$$'

+       perl -pi -e 's/yytranslate_ \(yylex \(/(yylex_ (/g' Parser.cpp