X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/1ed2735b1c3ae6ff71a46577c8f82764cfd019e8..c9b965e40ad1ad73542865fb65990a8b59e3131b:/apple.mk

diff --git a/apple.mk b/apple.mk
index 215f4d5..1bffa46 100644
--- a/apple.mk
+++ b/apple.mk
@@ -1,5 +1,5 @@
-# Cycript - Optimizing JavaScript Compiler/Runtime
-# Copyright (C) 2009-2014  Jay Freeman (saurik)
+# Cycript - The Truly Universal Scripting Language
+# Copyright (C) 2009-2016  Jay Freeman (saurik)
 
 # GNU Affero General Public License, Version 3 {{{
 #
@@ -37,6 +37,9 @@ cycript += Cycript.lib/cycript0.9
 cycript += Cycript.lib/libcycript.dylib
 cycript += Cycript.lib/libcycript-sys.dylib
 cycript += Cycript.lib/libcycript-sim.dylib
+cycript += Cycript.lib/libcycript.cy
+cycript += Cycript.lib/libcycript.db
+cycript += Cycript.lib/libcycript.jar
 
 framework := 
 framework += Cycript
@@ -60,7 +63,7 @@ $(zip): $(all)
 zip: $(zip)
 	ln -sf $< cycript.zip
 
-$(deb): Cycript.lib/cycript Cycript.lib/libcycript.dylib
+$(deb): Cycript.lib/cycript Cycript.lib/libcycript.dylib Cycript.lib/libcycript.db
 	rm -rf package
 	mkdir -p package/DEBIAN
 	sed -e 's/#/$(version)/' control.in >package/DEBIAN/control
@@ -69,23 +72,44 @@ $(deb): Cycript.lib/cycript Cycript.lib/libcycript.dylib
 	$(lipo) -extract armv6 -output package/usr/bin/cycript Cycript.lib/cycript
 	$(lipo) -extract armv6 -extract arm64 -output package/usr/lib/libcycript.dylib Cycript.lib/libcycript.dylib
 	ln -s libcycript.dylib package/usr/lib/libcycript.0.dylib
-	dpkg-deb -Zlzma -b package $@
+	cp -a libcycript.cy package/usr/lib/libcycript.cy
+	cp -a Cycript.lib/libcycript.db package/usr/lib/libcycript.db
+	sqlite3 package/usr/lib/libcycript.db "delete from cache where system & $$(($$(cat build.ios-arm{v6,64}/Makefile | sed -e '/^CY_SYSTEM = \([0-9]*\)$$/{s//\1/;p;};d;' | tr $$'\n' '|') 0)) == 0; vacuum full;"
+	./dpkg-deb.sh -Zlzma -b package $@
 
 deb: $(deb)
 	ln -sf $< cycript.deb
 
-clean:
-	rm -rf cycript Cycript.lib libcycript*.o
+clean := 
+
+db := 
+
+library := libffi libuv
 
 # make stubbornly refuses to believe that these @'s are bugs
 # http://osdir.com/ml/help-make-gnu/2012-04/msg00008.html
 
+define build_lar
+Cycript.lib/$(1).a: $(1).$(2)/.libs/$(1).a
+endef
+
 define build_any
 .PHONY: build-$(1)-$(2)
 build-$(1)-$(2):
 	$$(MAKE) -C build.$(1)-$(2)
 build.$(1)-$(2)/.libs/libcycript.a: build-$(1)-$(2)
 	@
+clean-$(1)-$(2):
+	$$(MAKE) -C build.$(1)-$(2) clean
+clean += clean-$(1)-$(2)
+db += build.$(1)-$(2)/libcycript.db
+build.$(1)-$(2)/libcycript.db: build-$(1)-$(2)
+	@
+ifneq ($(1),sim)
+$(foreach lib,$(library),
+$(call build_lar,$(lib),$(2))
+)
+endif
 endef
 
 define build_lib
@@ -98,6 +122,8 @@ $(call build_any,osx,$(1))
 $(call build_lib,osx,$(1))
 build.osx-$(1)/.libs/cycript: build-osx-$(1)
 	@
+build.osx-$(1)/libcycript.jar: build-osx-$(1)
+	@
 endef
 
 $(foreach arch,i386 x86_64,$(eval $(call build_osx,$(arch))))
@@ -128,6 +154,13 @@ endef
 
 $(foreach arch,armv6 arm64,$(eval $(call build_arm,$(arch))))
 
+clean: $(clean)
+	rm -rf cycript Cycript.lib libcycript*.o
+
+$(patsubst %,Cycript.lib/%.a,$(library)):
+	@mkdir -p $(dir $@)
+	$(lipo) -create -output $@ $^
+
 Cycript.lib/libcycript.dylib: build.osx-i386/.libs/libcycript.dylib build.osx-x86_64/.libs/libcycript.dylib build.ios-armv6/.libs/libcycript.dylib build.ios-arm64/.libs/libcycript.dylib
 	@mkdir -p $(dir $@)
 	$(lipo) -create -output $@ $^
@@ -152,9 +185,9 @@ Cycript.lib/libcycript-sim.dylib: build.sim-i386/.libs/libcycript.dylib build.si
 	$(lipo) -create -output $@ $^
 	codesign -s $(codesign) $@
 
-libcycript-%.o: build.%/.libs/libcycript.a xcode.map
+libcycript-%.o: build.%/.libs/libcycript.a $(patsubst %,Cycript.lib/%.a,$(library)) xcode.map
 	@mkdir -p $(dir $@)
-	ld -r -arch $$($(lipo) -detailed_info $< | sed -e '/^Non-fat file: / ! d; s/.*: //') -o $@ -all_load -exported_symbols_list xcode.map $< libffi.a
+	ld -r -arch $$($(lipo) -detailed_info $< | sed -e '/^Non-fat file: / ! d; s/.*: //') -o $@ -all_load -exported_symbols_list xcode.map -x $(filter %.a,$^)
 
 libcycript-ios.o: libcycript-ios-armv6.o libcycript-ios-armv7.o libcycript-ios-armv7s.o libcycript-ios-arm64.o libcycript-sim-i386.o libcycript-sim-x86_64.o
 	$(lipo) -create -output $@ $^
@@ -170,6 +203,19 @@ Cycript.%/Cycript.framework/Headers/Cycript.h: Cycript.h
 	@mkdir -p $(dir $@)
 	cp -a $< $@
 
+Cycript.lib/libcycript.cy:
+	@mkdir -p $(dir $@)
+	ln -sf ../libcycript.cy $@
+
+Cycript.lib/libcycript.db: $(db)
+	@mkdir -p $(dir $@)
+	./libcycript.sh 0 $@
+	./libcycript.py $@ $^
+
+Cycript.lib/libcycript.jar: build.osx-x86_64/libcycript.jar
+	@mkdir -p $(dir $@)
+	cp -af $< $@
+
 Cycript.lib/cycript0.9:
 	@mkdir -p $(dir $@)
 	ln -s ../modules $@
@@ -178,7 +224,12 @@ cycript: cycript.in
 	cp -af $< $@
 	chmod 755 $@
 
-install: Cycript.lib/cycript Cycript.lib/libcycript.dylib Cycript.lib/libcycript-sys.dylib Cycript.lib/libcycript-sim.dylib
+local := Cycript.lib/cycript Cycript.lib/libcycript.dylib Cycript.lib/libcycript-sys.dylib Cycript.lib/libcycript-sim.dylib
+
+debug: $(local)
+	DYLD_LIBRARY_PATH=Cycript.lib lldb Cycript.lib/cycript
+
+install: $(local)
 	sudo cp -af $(filter-out %.dylib,$^) /usr/bin
 	sudo cp -af $(filter %.dylib,$^) /usr/lib
 
@@ -186,4 +237,4 @@ install: Cycript.lib/cycript Cycript.lib/libcycript.dylib Cycript.lib/libcycript
 cast: $(zip)
 	appcast.sh cycript/mac $(monotonic) $(version) $< "$(CYCRIPT_CHANGES)"
 
-.PHONY: all cast clean install zip
+.PHONY: all cast clean debug install zip