X-Git-Url: https://git.saurik.com/cydia.git/blobdiff_plain/35ee854810ce90c8418e3072cfb28e246fdba013..0d5393afa622b359207e9bb2f248ebd6489a330c:/makefile?ds=inline

diff --git a/makefile b/makefile
index 70fa990b..18dc376d 100644
--- a/makefile
+++ b/makefile
@@ -63,8 +63,6 @@ version := $(shell ./version.sh)
 gxx := /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/g++-$(gcc)
 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
 
 code := $(foreach dir,$(dirs),$(wildcard $(foreach ext,h hpp c cpp m mm,$(dir)/*.$(ext))))
@@ -82,9 +80,11 @@ object := $(object:.m=.o)
 object := $(object:.mm=.o)
 object := $(object:%=Objects/%)
 
-images := $(shell find MobileCydia.app -name '*.png')
+images := $(shell find BigBoss.png/ MobileCydia.app/ -type f -name '*.png')
 images := $(images:%=Images/%)
 
+lproj_deb := debs/cydia-lproj_$(version)_iphoneos-arm.deb
+
 all: MobileCydia
 
 clean:
@@ -106,13 +106,15 @@ Objects/%.o: %.mm $(header)
 	@echo "[cycc] $<"
 	@$(cycc) -c -o $@ $< $(flags) $(xflags)
 
+Objects/MobileCydia.o: version.h
+
 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
+sysroot: sysroot.sh
+	@echo "Your ./sysroot/ is either missing or out of date. Please read compiling.txt for help." 1>&2
 	@echo 1>&2
 	@exit 1
 
@@ -127,10 +129,14 @@ MobileCydia: sysroot $(object)
 CydiaAppliance: CydiaAppliance.mm
 	$(cycc) $(filter %.mm,$^) $(flags) -bundle $(link) $(backrow)
 
-debs/cydia_$(version)_iphoneos-arm.deb: MobileCydia $(images) $(shell find MobileCydia.app)
+debs/cydia_$(version)_iphoneos-arm.deb: MobileCydia $(images) $(shell find MobileCydia.app) cydia.control
 	sudo rm -rf _
 	mkdir -p _/var/lib/cydia
 	
+	mkdir -p _/etc/apt
+	cp -a Trusted.gpg _/etc/apt/trusted.gpg.d
+	cp -a Sources.list _/etc/apt/sources.list.d
+	
 	mkdir -p _/usr/libexec
 	cp -a Library _/usr/libexec/cydia
 	cp -a sysroot/usr/bin/du _/usr/libexec/cydia
@@ -140,10 +146,15 @@ debs/cydia_$(version)_iphoneos-arm.deb: MobileCydia $(images) $(shell find Mobil
 	
 	mkdir -p _/Applications
 	cp -a MobileCydia.app _/Applications/Cydia.app
+	rm -rf _/Applications/Cydia.app/*.lproj
 	cp -a MobileCydia _/Applications/Cydia.app/MobileCydia
 	
 	cd MobileCydia.app && find . -name '*.png' -exec cp -af ../Images/MobileCydia.app/{} ../_/Applications/Cydia.app/{} ';'
 	
+	mkdir -p _/usr/share/bigboss/icons
+	cd BigBoss.png && find . -name '*.png' -exec cp -af ../Images/BigBoss.png/{} ../_/usr/share/bigboss/icons/{} ';'
+	ln -s /usr/share/bigboss/icons/planetiphones.png _/Applications/Cydia.app/Sections/"Planet-iPhones Mods.png"
+	
 	#mkdir -p _/Applications/AppleTV.app/Appliances
 	#cp -a Cydia.frappliance _/Applications/AppleTV.app/Appliances
 	#cp -a CydiaAppliance _/Applications/AppleTV.app/Appliances/Cydia.frappliance
@@ -152,7 +163,7 @@ debs/cydia_$(version)_iphoneos-arm.deb: MobileCydia $(images) $(shell find Mobil
 	#ln -s {/Applications/AppleTV,_/Applications/Lowtide}.app/Appliances/Cydia.frappliance
 	
 	mkdir -p _/DEBIAN
-	./control.sh _ >_/DEBIAN/control
+	./control.sh cydia.control _ >_/DEBIAN/control
 	cp -a preinst _/DEBIAN/
 	
 	find _ -exec touch -t "$$(date -j -f "%s" +"%Y%m%d%H%M.%S" "$$(git show --format='format:%ct' | head -n 1)")" {} ';'
@@ -166,6 +177,24 @@ debs/cydia_$(version)_iphoneos-arm.deb: MobileCydia $(images) $(shell find Mobil
 	$(dpkg) -b _ Cydia.deb
 	@echo "$$(stat -L -f "%z" Cydia.deb) $$(stat -f "%Y" Cydia.deb)"
 
-package: debs/cydia_$(version)_iphoneos-arm.deb
+$(lproj_deb): $(shell find MobileCydia.app -name '*.strings') cydia-lproj.control
+	sudo rm -rf __
+	mkdir -p __/Applications/Cydia.app
+	
+	cp -a MobileCydia.app/*.lproj __/Applications/Cydia.app
+	
+	mkdir -p __/DEBIAN
+	./control.sh cydia-lproj.control __ >__/DEBIAN/control
+	cp -a preinst __/DEBIAN/
+	
+	sudo chown -R 0 __
+	sudo chgrp -R 0 __
+	
+	mkdir -p debs
+	ln -sf debs/cydia-lproj_$(version)_iphoneos-arm.deb Cydia_.deb
+	$(dpkg) -b __ Cydia_.deb
+	@echo "$$(stat -L -f "%z" Cydia_.deb) $$(stat -f "%Y" Cydia_.deb)"
+	
+package: debs/cydia_$(version)_iphoneos-arm.deb $(lproj_deb)
 
 .PHONY: all clean package sign