Insanely massive refactoring, bringing both exceptions and languages into near parity.

[cycript.git] / makefile

diff --git a/makefile b/makefile
index 8bc4301dc1b3c17730750075a6a66089be61ba4f..1e5d57a6f1e6202c0d656147282edba34469c1c3 100644 (file)
--- a/makefile
+++ b/makefile
@@ -1,19 +1,18 @@
+SHELL := $(shell which bash 2>/dev/null)
+

 ifndef PKG_TARG
 target :=
 else
 target := $(PKG_TARG)-
 endif
 
 ifndef PKG_TARG
 target :=
 else
 target := $(PKG_TARG)-
 endif
 

-flags := -g3 -O0 -DYYDEBUG=1
-#flags := -g0 -O3
-flags += -Wall -Werror -I. -fno-common
+flags :=
+objc :=

 
 svn := $(shell svnversion)
 
 
 svn := $(shell svnversion)
 

-filters := C
-

 all:
 all:

-all := libcycript.plist cycript
+all := libcycript.db cycript

 
 dpkg_architecture := $(shell which dpkg-architecture 2>/dev/null)
 ifneq ($(dpkg_architecture),)
 
 dpkg_architecture := $(shell which dpkg-architecture 2>/dev/null)
 ifneq ($(dpkg_architecture),)


@@ -21,15 +20,37 @@ arch := $(shell $(dpkg_architecture) -qDEB_HOST_ARCH 2>/dev/null)
 endif
 
 header := Cycript.tab.hh Parser.hpp Pooling.hpp cycript.hpp
 endif
 
 header := Cycript.tab.hh Parser.hpp Pooling.hpp cycript.hpp

-code := ffi_type.o parse.o Replace.o Output.o Cycript.tab.o lex.cy.o Network.o
-
+code := sig/ffi_type.o sig/parse.o sig/copy.o
+code += Replace.o Output.o
+code += Cycript.tab.o lex.cy.o
+code += Network.o Parser.o
+code += JavaScriptCore.o Library.o
+
+filters := C #E4X
+ldid := true

 dll := so
 dll := so

+apr := $(shell apr-1-config --link-ld)
+library := $(apr) -lffi -liconv -lsqlite3
+console := $(apr) -lreadline
+depends :=

 
 uname_s := $(shell uname -s)
 uname_p := $(shell uname -p)
 -include $(uname_s).mk
 -include $(uname_s)-$(uname_p).mk
 
 
 uname_s := $(shell uname -s)
 uname_p := $(shell uname -p)
 -include $(uname_s).mk
 -include $(uname_s)-$(uname_p).mk
 

+ifeq ($(filter ObjectiveC,$(filters)),)
+ifneq ($(shell which gnustep-config 2>/dev/null),)
+include GNUstep.mk
+endif
+endif
+
+#flags += -g3 -O0 -DYYDEBUG=1
+flags += -g0 -O3
+flags += -Wall -Werror -Wno-parentheses #-Wno-unused
+flags += -fPIC -fno-common
+flags += -I. -I$(shell apr-1-config --includedir)
+

 all += libcycript.$(dll)
 
 ifdef arch
 all += libcycript.$(dll)
 
 ifdef arch


@@ -37,45 +58,39 @@ deb := $(shell grep ^Package: control | cut -d ' ' -f 2-)_$(shell grep ^Version:
 
 all: $(deb)
 
 
 all: $(deb)
 

+extra:
+

 $(deb): $(all)
        rm -rf package
        mkdir -p package/DEBIAN
 $(deb): $(all)
        rm -rf package
        mkdir -p package/DEBIAN

-       sed -e 's/#/$(svn)/' control >package/DEBIAN/control
-       mkdir -p package/System/Library/LaunchDaemons
-       #cp -a com.saurik.Cyrver.plist package/System/Library/LaunchDaemons
-       mkdir -p package/Library/MobileSubstrate/DynamicLibraries
-       if [[ -e Settings.plist ]]; then \
-           mkdir -p package/Library/PreferenceLoader/Preferences; \
-           cp -a Settings.png package/Library/PreferenceLoader/Preferences/CycriptIcon.png; \
-           cp -a Settings.plist package/Library/PreferenceLoader/Preferences/Cycript.plist; \
-       fi
-       if [[ -e Tweak.plist ]]; then cp -a Tweak.plist package/Library/MobileSubstrate/DynamicLibraries/Cycript.plist; fi
-       cp -a Cycript.$(dll) package/Library/MobileSubstrate/DynamicLibraries
+       sed -e 's/&/$(foreach depend,$(depends),$(depend),)/;s/,$$//;s/#/$(svn)/;s/%/$(arch)/' control >package/DEBIAN/control
+       $(MAKE) extra

        mkdir -p package/usr/{bin,lib,sbin}
        cp -a libcycript.$(dll) package/usr/lib
        cp -a cycript package/usr/bin
        #cp -a cyrver package/usr/sbin
        mkdir -p package/usr/{bin,lib,sbin}
        cp -a libcycript.$(dll) package/usr/lib
        cp -a cycript package/usr/bin
        #cp -a cyrver package/usr/sbin

-       cp -a libcycript.plist package/usr/lib
+       cp -a libcycript.db package/usr/lib

        dpkg-deb -b package $(deb)
 endif
 
 all: $(all)
 
 clean:
        dpkg-deb -b package $(deb)
 endif
 
 all: $(all)
 
 clean:

-       rm -f *.o libcycript.$(dll) cycript libcycript.plist Struct.hpp lex.cy.c Cycript.tab.cc Cycript.tab.hh location.hh position.hh stack.hh cyrver Cycript.y
+       rm -f *.o libcycript.$(dll) cycript libcycript.db Struct.hpp lex.cy.c Cycript.tab.cc Cycript.tab.hh location.hh position.hh stack.hh cyrver Cycript.y

 
 

-libcycript.plist: Bridge.def
+libcycript.db: Bridge.def
+       rm -f libcycript.db

        { \
        { \

-           echo '({'; \
-           grep '^[CFV]' Bridge.def | sed -e 's/^C/0/;s/^F/1/;s/^V/2/' | sed -e 's/"/\\"/g;s/^\([^ ]*\) \([^ ]*\) \(.*\)$$/\2 = (\1, \"\3\");/'; \
-           echo '},{'; \
-           grep '^:' Bridge.def | sed -e 's/^: \([^ ]*\) \(.*\)/"\1" = "\2";/'; \
-           echo '},{'; \
-           grep '^[EST]' Bridge.def | sed -e 's/^S/0/;s/^T/1/;s/^E/2/' | sed -e 's/^2\(.*\)$$/1\1 i/' | sed -e 's/"/\\"/g;s/^\([^ ]*\) \([^ ]*\) \(.*\)$$/\2 = (\1, \"\3\");/'; \
-           echo '})'; \
-       } >$@
-
-Cycript.y: Cycript.y.in
+           echo 'create table "bridge" ("mode" int not null, "name" text not null, "value" text null);'; \
+           grep '^[CFV]' Bridge.def | sed -e 's/^C/0/;s/^F/1/;s/^V/2/' | sed -e 's/"/\\"/g;s/^\([^ ]*\) \([^ ]*\) \(.*\)$$/insert into "bridge" ("mode", "name", "value") values (\1, '"'"'\2'"'"', '"'"'\3'"'"');/'; \
+           grep '^:' Bridge.def | sed -e 's/^: \([^ ]*\) \(.*\)/insert into "bridge" ("mode", "name", "value") values (-1, '"'"'\1'"'"', '"'"'\2'"'"');/'; \
+           grep '^[EST]' Bridge.def | sed -e 's/^S/3/;s/^T/4/;s/^E/5/' | sed -e 's/^5\(.*\)$$/4\1 i/' | sed -e 's/^\([^ ]*\) \([^ ]*\) \(.*\)$$/insert into "bridge" ("mode", "name", "value") values (\1, '"'"'\2'"'"', '"'"'\3'"'"');/'; \
+       } | sqlite3 libcycript.db
+
+%.y: %.y.in
+       ./Filter.sh <$< >$@ $(filters)
+
+%.l: %.l.in

        ./Filter.sh <$< >$@ $(filters)
 
 Cycript.tab.cc Cycript.tab.hh location.hh position.hh: Cycript.y
        ./Filter.sh <$< >$@ $(filters)
 
 Cycript.tab.cc Cycript.tab.hh location.hh position.hh: Cycript.y


@@ -87,43 +102,26 @@ lex.cy.c: Cycript.l
 #Parser.hpp: Parser.py Parser.dat
 #      ./Parser.py <Parser.dat >$@
 
 #Parser.hpp: Parser.py Parser.dat
 #      ./Parser.py <Parser.dat >$@
 

-%.o: sig/%.cpp
+Cycript.tab.o: Cycript.tab.cc $(header)

        $(target)g++ $(flags) -c -o $@ $<
 
        $(target)g++ $(flags) -c -o $@ $<
 

-Cycript.tab.o: Cycript.tab.cc Cycript.tab.hh Parser.hpp Pooling.hpp
-       $(target)g++ $(flags) -c -o $@ $<
-
-lex.cy.o: lex.cy.c Cycript.tab.hh Parser.hpp Pooling.hpp
+lex.cy.o: lex.cy.c $(header)

        $(target)g++ $(flags) -c -o $@ $<
 
 %.o: %.cpp $(header)
        $(target)g++ $(flags) -c -o $@ $<
 
        $(target)g++ $(flags) -c -o $@ $<
 
 %.o: %.cpp $(header)
        $(target)g++ $(flags) -c -o $@ $<
 

+#objc := -x c++

 %.o: %.mm $(header)
 %.o: %.mm $(header)

-       $(target)g++ $(flags) -c -o $@ $<
-
-cyrver: Server.o
-       $(target)g++ $(flags) -o $@ $(filter %.o,$^) \
-           -lobjc -lapr-1 -lsubstrate \
-           -framework CoreFoundation -framework CFNetwork
-       ldid -S $@
+       $(target)g++ $(objc) $(flags) -c -o $@ $<

 
 libcycript.$(dll): $(code)
 
 libcycript.$(dll): $(code)

-       $(target)g++ $(flags) -dynamiclib -o $@ $(filter %.o,$^) \
-           -install_name /usr/lib/libcycript.$(dll) \
-           -lobjc -lapr-1 -lffi -lsubstrate \
-           -framework CoreFoundation -framework Foundation \
-           -framework CFNetwork \
-           -framework JavaScriptCore -framework WebCore
-       ldid -S $@
+       $(target)g++ $(flags) -shared -dynamiclib -o $@ $(filter %.o,$^) $(library) $(link)
+       $(ldid) $@

 
 cycript: Console.o libcycript.$(dll)
 
 cycript: Console.o libcycript.$(dll)

-       $(target)g++ $(flags) -o $@ $(filter %.o,$^) \
-           -lobjc -lapr-1 -lreadline \
-           -L. -lcycript \
-           -framework Foundation -framework CoreFoundation \
-           -framework JavaScriptCore -framework UIKit
-       ldid -S cycript
+       $(target)g++ $(flags) -o $@ $(filter %.o,$^) -L. -lcycript $(console) $(link)
+       $(ldid) cycript

 
 package: $(deb)
 
 
 package: $(deb)