X-Git-Url: https://git.saurik.com/cydia.git/blobdiff_plain/4ca7971e7a884f7c8eca4a1e2632b4d2570195be..5c624298a1145bdcd7e279642f9155ab114b94c2:/makefile?ds=sidebyside

diff --git a/makefile b/makefile
index 3898b49c..1bfc33ca 100644
--- a/makefile
+++ b/makefile
@@ -1,25 +1,37 @@
-ifeq (o,O)
-ios := 2.0
-gcc := 4.0
-else
-ios := 3.2
+sdks := /Developer/Platforms/iPhoneOS.platform/Developer/SDKs
+ioss := $(sort $(patsubst $(sdks)/iPhoneOS%.sdk,%,$(wildcard $(sdks)/iPhoneOS*.sdk)))
+
+ios := $(word $(words $(ioss)),$(ioss))
 gcc := 4.2
-endif
 
 flags := 
 link := 
 
-#dpkg := /Library/Cydia/bin/dpkg-deb -Zlzma
+ifeq (o,O) # gzip is actually better
+dpkg := /Library/Cydia/bin/dpkg-deb
+ifeq ($(wildcard $(dpkg)),$(dpkg))
+dpkg := $(dpkg) -zlzma
+else
+dpkg := dpkg-deb -zbzip2
+endif
+else
 dpkg := dpkg-deb
+endif
 
-sdk := /Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS$(ios).sdk
+sdk := $(sdks)/iPhoneOS$(ios).sdk
 
 flags += -F$(sdk)/System/Library/PrivateFrameworks
 flags += -I. -isystem sysroot/usr/include -Lsysroot/usr/lib
 flags += -Wall -Werror -Wno-deprecated-declarations
 flags += -fmessage-length=0
 flags += -g0 -O2
-flags += -fobjc-call-cxx-cdtors -fobjc-exceptions
+flags += -fobjc-exceptions
+flags += -fno-guess-branch-probability
+flags += -fvisibility=hidden
+
+xflags :=
+xflags += -fobjc-call-cxx-cdtors
+xflags += -fvisibility-inlines-hidden
 
 link += -framework CoreFoundation
 link += -framework CoreGraphics
@@ -28,8 +40,8 @@ link += -framework GraphicsServices
 link += -framework IOKit
 link += -framework JavaScriptCore
 link += -framework QuartzCore
+link += -framework SpringBoardServices
 link += -framework SystemConfiguration
-link += -framework UIKit
 link += -framework WebCore
 link += -framework WebKit
 
@@ -39,20 +51,83 @@ link += -lpcre
 
 link += -multiply_defined suppress
 
+uikit := 
+uikit += -framework UIKit
+
+backrow := 
+backrow += -FAppleTV -framework BackRow -framework AppleTV
+
+version := $(shell ./version.sh)
+
 #cycc = cycc -r4.2 -i$(ios) -o$@
 gxx := /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/g++-$(gcc)
-cycc = $(gxx) -arch armv6 -o $@ -mcpu=arm1176jzf-s -miphoneos-version-min=$(ios) -isysroot $(sdk) -idirafter /usr/include -F/Library/Frameworks
+cycc = $(gxx) -mthumb -arch armv6 -o $@ -mcpu=arm1176jzf-s -miphoneos-version-min=2.0 -isysroot $(sdk) -idirafter /usr/include -F{sysroot,}/Library/Frameworks
+
+flags += -DCYDIA_VERSION='"$(version)"'
+
+dirs := Menes CyteKit Cydia SDURLCache
 
-all: Cydia
+code := $(foreach dir,$(dirs),$(wildcard $(foreach ext,h hpp c cpp m mm,$(dir)/*.$(ext))))
+code := $(filter-out SDURLCache/SDURLCacheTests.m,$(code))
+code += MobileCydia.mm iPhonePrivate.h Cytore.hpp lookup3.c
+
+source := $(filter %.m,$(code)) $(filter %.mm,$(code))
+source += $(filter %.c,$(code)) $(filter %.cpp,$(code))
+header := $(filter %.h,$(code)) $(filter %.hpp,$(code))
+
+object := $(source)
+object := $(object:.c=.o)
+object := $(object:.cpp=.o)
+object := $(object:.m=.o)
+object := $(object:.mm=.o)
+object := $(object:%=Objects/%)
+
+images := $(shell find MobileCydia.app -name '*.png')
+images := $(images:%=Images/%)
+
+all: MobileCydia
 
 clean:
-	rm -f Cydia
+	rm -f MobileCydia
+	rm -rf Objects/ Images/
+
+Objects/%.o: %.c $(header)
+	@mkdir -p $(dir $@)
+	@echo "[cycc] $<"
+	@$(cycc) -c -o $@ -x c $<
+
+Objects/%.o: %.m $(header)
+	@mkdir -p $(dir $@)
+	@echo "[cycc] $<"
+	@$(cycc) -c -o $@ $< $(flags)
 
-Cydia: Cydia.mm UICaboodle/*.mm iPhonePrivate.h
-	$(cycc) $(filter %.mm,$^) $(flags) $(link)
-	ldid -Slaunch.xml $@
+Objects/%.o: %.mm $(header)
+	@mkdir -p $(dir $@)
+	@echo "[cycc] $<"
+	@$(cycc) -c -o $@ $< $(flags) $(xflags)
 
-package: Cydia
+Images/%.png: %.png
+	@mkdir -p $(dir $@)
+	@echo "[pngc] $<"
+	@./pngcrush.sh $< $@
+
+sysroot:
+	@echo "Please read compiling.txt: you do not have a ./sysroot/ folder with the on-device requirements." 1>&2
+	@echo 1>&2
+	@exit 1
+
+MobileCydia: sysroot $(object)
+	@echo "[link] $(object:Objects/%=%)"
+	@$(cycc) $(filter %.o,$^) $(flags) $(link) $(uikit)
+	@echo "[strp] $@"
+	@strip -no_uuid $@
+	@echo "[sign] $@"
+	@ldid -T0 -Slaunch.xml $@ || { rm -f $@ && false; }
+
+CydiaAppliance: CydiaAppliance.mm
+	$(cycc) $(filter %.mm,$^) $(flags) -bundle $(link) $(backrow)
+
+package: MobileCydia $(images)
 	sudo rm -rf _
 	mkdir -p _/var/lib/cydia
 	
@@ -64,19 +139,27 @@ package: Cydia
 	cp -a LaunchDaemons _/System/Library/LaunchDaemons
 	
 	mkdir -p _/Applications
-	cp -a Cydia.app _/Applications/Cydia.app
-	cp -a Cydia _/Applications/Cydia.app/Cydia_
+	cp -a MobileCydia.app _/Applications/Cydia.app
+	cp -a MobileCydia _/Applications/Cydia.app/MobileCydia
+	
+	cd MobileCydia.app && find . -name '*.png' -exec cp -af ../Images/MobileCydia.app/{} ../_/Applications/Cydia.app/{} ';'
 	
-	mkdir -p _/System/Library/PreferenceBundles
-	cp -a CydiaSettings.bundle _/System/Library/PreferenceBundles/CydiaSettings.bundle
+	#mkdir -p _/Applications/Lowtide.app/Appliances
+	#cp -a Cydia.frappliance _/Applications/Lowtide.app/Appliances
+	#cp -a CydiaAppliance _/Applications/Lowtide.app/Appliances/Cydia.frappliance
 	
 	mkdir -p _/DEBIAN
-	echo "$$(cat control)"$$'\nInstalled-Size: '"$$(du -s _ | cut -f 1)" > _/DEBIAN/control
+	./control.sh _ >_/DEBIAN/control
+	
+	find _ -exec touch -t "$$(date -j -f "%s" +"%Y%m%d%H%M.%S" "$$(git show --format='format:%ct' | head -n 1)")" {} ';'
 	
 	sudo chown -R 0 _
 	sudo chgrp -R 0 _
-	sudo chmod 6755 _/Applications/Cydia.app/Cydia_
+	sudo chmod 6755 _/Applications/Cydia.app/MobileCydia
 	
-	$(dpkg) -b _ $(shell grep ^Package: control | cut -d ' ' -f 2-)_$(shell grep ^Version: control | cut -d ' ' -f 2)_iphoneos-arm.deb
+	mkdir -p debs
+	ln -sf debs/cydia_$(version)_iphoneos-arm.deb Cydia.deb
+	$(dpkg) -b _ Cydia.deb
+	@echo "$$(stat -L -f "%z" Cydia.deb) $$(stat -f "%Y" Cydia.deb)"
 
 .PHONY: all clean sign