X-Git-Url: https://git.saurik.com/cydia.git/blobdiff_plain/82e370b360798dcc8cdf41f68744788e503bb8a2..c935a078d356d00f98bb418b44feaaaccf780210:/makefile

diff --git a/makefile b/makefile
index bae04cec..a0d3732b 100644
--- a/makefile
+++ b/makefile
@@ -1,34 +1,59 @@
-gxx := $(shell xcrun --sdk iphoneos -f g++)
-sdk := $(shell xcodebuild -sdk iphoneos -version Path)
+.DELETE_ON_ERROR:
+.SECONDARY:
+
+dpkg := dpkg-deb -Zlzma
+version := $(shell ./version.sh)
 
-flags := 
+flag := 
+plus :=
 link := 
 libs := 
 
-dpkg := dpkg-deb -Zlzma
+gxx := $(shell xcrun --sdk iphoneos -f g++)
+cycc := $(gxx)
+
+sdk := $(shell xcodebuild -sdk iphoneos -version Path)
+mac := $(shell xcodebuild -sdk macosx -version Path)
+
+cycc += -isysroot $(sdk)
+cycc += -idirafter $(mac)/usr/include
+cycc += -F$(sdk)/System/Library/PrivateFrameworks
+
+cycc += -fmessage-length=0
+cycc += -gfull -O2
+cycc += -fvisibility=hidden
 
-flags += -F$(sdk)/System/Library/PrivateFrameworks
-flags += -I. -isystem sysroot/usr/include
-flags += -fmessage-length=0
-flags += -g0 -O2
-flags += -fvisibility=hidden
+link += -Wl,-dead_strip
+link += -Wl,-no_dead_strip_inits_and_terms
 
-flags += -idirafter icu/icuSources/common
-flags += -idirafter icu/icuSources/i18n
+iapt := 
+iapt += -Iapt32
+iapt += -Iapt32-contrib
+iapt += -Iapt32-deb
+iapt += -Iapt-extra
+iapt += -IObjects/apt32
 
-flags += -Wall
+flag += $(patsubst %,-Xarch_armv6 %,$(iapt))
+flag += $(patsubst %,-Xarch_arm64 %,$(subst apt32,apt64,$(iapt)))
 
-flags += -Wno-unknown-warning-option
-flags += -Wno-logical-op-parentheses
-flags += -Wno-dangling-else
-flags += -Wno-shift-op-parentheses
-flags += -Wno-deprecated-declarations
+flag += -I.
+flag += -isystem sysroot/usr/include
 
-xflags :=
-xflags += -fobjc-call-cxx-cdtors
-xflags += -fvisibility-inlines-hidden
+flag += -idirafter icu/icuSources/common
+flag += -idirafter icu/icuSources/i18n
+
+flag += -Wall
+flag += -Wno-dangling-else
+flag += -Wno-deprecated-declarations
+flag += -Wno-objc-protocol-method-implementation
+flag += -Wno-logical-op-parentheses
+flag += -Wno-shift-op-parentheses
+flag += -Wno-unknown-pragmas
+flag += -Wno-unknown-warning-option
+
+plus += -fobjc-call-cxx-cdtors
+plus += -fvisibility-inlines-hidden
 
-link += -Lsysroot/usr/lib
 link += -multiply_defined suppress
 
 libs += -framework CoreFoundation
@@ -42,43 +67,105 @@ libs += -framework SystemConfiguration
 libs += -framework WebCore
 libs += -framework WebKit
 
-libs += -lapr-1
-libs += -lapt-pkg
+libs += -framework CFNetwork
+libs += -llockdown
+
+libs += -Xarch_armv6 -Wl,-force_load,Objects/libapt32.a
+libs += -Xarch_arm64 -Wl,-force_load,Objects/libapt64.a
+
 libs += -licucore
-libs += -lpcre
 
 uikit := 
 uikit += -framework UIKit
 
-backrow := 
-backrow += -FAppleTV -framework BackRow -framework AppleTV
-
-version := $(shell ./version.sh)
-
-cycc = $(gxx) -arch armv6 -o $@ -miphoneos-version-min=2.0 -isysroot $(sdk) -idirafter /usr/include -F{sysroot,}/Library/Frameworks
-
-cycc += -marm # @synchronized
-cycc += -mcpu=arm1176jzf-s
-cycc += -mllvm -arm-reserve-r9
-link += -lgcc_s.1
+link += -Xarch_armv6 -Wl,-segalign,4000
 
 dirs := Menes CyteKit Cydia SDURLCache
 
 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 Version.mm iPhonePrivate.h Cytore.hpp lookup3.c Sources.h Sources.mm
+code += MobileCydia.mm Version.mm iPhonePrivate.h Cytore.hpp lookup3.c Sources.h Sources.mm DiskUsage.cpp
+
+code += gpgv.cc
+code += http.cc
 
 source := $(filter %.m,$(code)) $(filter %.mm,$(code))
-source += $(filter %.c,$(code)) $(filter %.cpp,$(code))
-header := $(filter %.h,$(code)) $(filter %.hpp,$(code))
+source += $(filter %.c,$(code)) $(filter %.cpp,$(code)) $(filter %.cc,$(code))
+header := $(filter %.h,$(code)) $(filter %.hpp,$(code)) $(filter %.hh,$(code))
 
 object := $(source)
 object := $(object:.c=.o)
 object := $(object:.cpp=.o)
+object := $(object:.cc=.o)
 object := $(object:.m=.o)
 object := $(object:.mm=.o)
 object := $(object:%=Objects/%)
 
+methods := copy file rred
+
+libapt32 := 
+libapt32 += $(wildcard apt32/apt-pkg/*.cc)
+libapt32 += $(wildcard apt32/apt-pkg/deb/*.cc)
+libapt32 += $(wildcard apt32/apt-pkg/contrib/*.cc)
+libapt32 += apt32/methods/gzip.cc
+libapt32 += $(patsubst %,apt32/methods/%.cc,$(methods))
+libapt32 := $(patsubst %.cc,Objects/%.o,$(libapt32))
+
+libapt64 := 
+libapt64 += $(wildcard apt64/apt-pkg/*.cc)
+libapt64 += $(wildcard apt64/apt-pkg/deb/*.cc)
+libapt64 += $(wildcard apt64/apt-pkg/contrib/*.cc)
+libapt64 += apt64/apt-pkg/tagfile-keys.cc
+libapt64 += apt64/methods/store.cc
+libapt64 += $(patsubst %,apt64/methods/%.cc,$(methods))
+libapt64 := $(filter-out %/srvrec.cc,$(libapt64))
+libapt64 := $(patsubst %.cc,Objects/%.o,$(libapt64))
+
+link += -Wl,-liconv
+link += -Xarch_arm64 -Wl,-lz
+
+flag += -DAPT_PKG_EXPOSE_STRING_VIEW
+flag += -Dsighandler_t=sig_t
+
+flag32 := 
+flag32 += -arch armv6
+flag32 += -Xarch_armv6 -miphoneos-version-min=2.0
+flag32 += -Xarch_armv6 -marm # @synchronized
+flag32 += -Xarch_armv6 -mcpu=arm1176jzf-s
+flag32 += -mllvm -arm-reserve-r9
+link += -Xarch_armv6 -Wl,-lgcc_s.1
+
+flag64 := 
+flag64 += -arch arm64
+flag64 += -Xarch_arm64 -miphoneos-version-min=7.0
+
+apt32 := $(cycc) $(flag32) $(flag)
+apt32 += -Wno-deprecated-register
+apt32 += -Wno-format-security
+apt32 += -Wno-tautological-compare
+apt32 += -Wno-uninitialized
+apt32 += -Wno-unused-private-field
+apt32 += -Wno-unused-variable
+
+apt64 := $(cycc) $(flag64) $(flag)
+apt64 += -include apt.h
+apt64 += -Wno-deprecated-register
+apt64 += -Wno-unused-private-field
+apt64 += -Wno-unused-variable
+
+eapt := -include apt.h
+apt64 += $(eapt)
+eapt += -D'VERSION="0.7.25.3"'
+apt32 += $(eapt)
+eapt += -Wno-format
+eapt += -Wno-logical-op-parentheses
+iapt += $(eapt)
+
+cycc += $(flag32)
+cycc += $(flag64)
+
+plus += -std=c++11
+
 images := $(shell find MobileCydia.app/ -type f -name '*.png')
 images := $(images:%=Images/%)
 
@@ -90,20 +177,57 @@ clean:
 	rm -f MobileCydia postinst
 	rm -rf Objects/ Images/
 
+Objects/apt64/apt-pkg/tagfile.o: apt64/apt-pkg/tagfile-keys.cc
+Objects/apt64/apt-pkg/deb/deblistparser.o: apt64/apt-pkg/tagfile-keys.cc
+
+apt64/apt-pkg/tagfile-keys.cc:
+	mkdir -p apt64
+	mkdir -p Objects/apt64/apt-pkg
+	cd apt64 && ../apt64/triehash/triehash.pl \
+            --ignore-case \
+            --header ../Objects/apt64/apt-pkg/tagfile-keys.h \
+            --code apt-pkg/tagfile-keys.cc \
+            --enum-class \
+            --enum-name pkgTagSection::Key \
+            --function-name pkgTagHash \
+            --include "<apt-pkg/tagfile.h>" \
+            ../apt64/apt-pkg/tagfile-keys.list
+	sed -i -e 's@typedef char static_assert64@//\\0@' $@
+
+Objects/%.o: %.cc $(header)
+	@mkdir -p $(dir $@)
+	@echo "[cycc] $<"
+	@$(cycc) $(plus) -c -o $@ $< $(flag) -Wno-format -include apt.h -Dmain=main_$(basename $(notdir $@))
+
+Objects/apt32/%.o: apt32/%.cc $(header) apt.h apt-extra/*.h
+	@mkdir -p $(dir $@)
+	@echo "[cycc] $<"
+	@$(apt32) -c -o $@ $< -Dmain=main_$(basename $(notdir $@))
+
+Objects/apt64/%.o: apt64/%.cc $(header) apt.h apt-extra/*.h
+	@mkdir -p $(dir $@)
+	@echo "[cycc] $<"
+	@$(apt64) $(plus) -c -o $@ $< -Dmain=main_$(basename $(notdir $@))
+
 Objects/%.o: %.c $(header)
 	@mkdir -p $(dir $@)
 	@echo "[cycc] $<"
-	@$(cycc) -c -x c $<
+	@$(cycc) -c -o $@ -x c $< $(flag)
 
 Objects/%.o: %.m $(header)
 	@mkdir -p $(dir $@)
 	@echo "[cycc] $<"
-	@$(cycc) -c $< $(flags)
+	@$(cycc) -c -o $@ $< $(flag)
+
+Objects/%.o: %.cpp $(header)
+	@mkdir -p $(dir $@)
+	@echo "[cycc] $<"
+	@$(cycc) $(plus) -c -o $@ $< $(flag)
 
 Objects/%.o: %.mm $(header)
 	@mkdir -p $(dir $@)
 	@echo "[cycc] $<"
-	@$(cycc) -std=c++11 -c $< $(flags) $(xflags)
+	@$(cycc) $(plus) -c -o $@ $< $(flag)
 
 Objects/Version.o: Version.h
 
@@ -117,38 +241,49 @@ sysroot: sysroot.sh
 	@echo 1>&2
 	@exit 1
 
-MobileCydia: sysroot $(object) entitlements.xml
-	@echo "[link] $(object:Objects/%=%)"
-	@$(cycc) $(filter %.o,$^) $(flags) $(link) $(libs) $(uikit) -Wl,-sdk_version,7.0
+Objects/libapt32.a: $(libapt32)
+	@echo "[arch] $@"
+	@ar -rc $@ $^
+
+Objects/libapt64.a: $(libapt64)
+	@echo "[arch] $@"
+	@ar -rc $@ $^
+
+MobileCydia: $(object) entitlements.xml Objects/libapt32.a Objects/libapt64.a
+	@echo "[link] $@"
+	@$(cycc) -o $@ $(filter %.o,$^) $(link) $(libs) $(uikit) -Wl,-sdk_version,8.0
 	@mkdir -p bins
-	@cp -a $@ bins/$@-$(version)
+	@cp -a $@ bins/$@-$(version)_$(shell date +%s)
 	@echo "[strp] $@"
-	@strip -no_uuid $@
+	@grep '~' <<<"$(version)" >/dev/null && echo "skipping..." || strip $@
 	@echo "[uikt] $@"
 	@./uikit.sh $@
 	@echo "[sign] $@"
 	@ldid -T0 -Sentitlements.xml $@ || { rm -f $@ && false; }
 
-CydiaAppliance: CydiaAppliance.mm
-	$(cycc) $(filter %.mm,$^) $(flags) $(link) -bundle $(libs) $(backrow)
-
 cfversion: cfversion.mm
-	$(cycc) $(filter %.mm,$^) $(flags) $(link) -framework CoreFoundation
+	$(cycc) -o $@ $(filter %.mm,$^) $(flag) $(link) -framework CoreFoundation
 	@ldid -T0 -S $@
 
 setnsfpn: setnsfpn.cpp
-	$(cycc) $(filter %.cpp,$^) $(flags) $(link)
+	$(cycc) -o $@ $(filter %.cpp,$^) $(flag) $(link)
+	@ldid -T0 -S $@
+
+cydo: cydo.cpp
+	$(cycc) $(plus) -o $@ $(filter %.cpp,$^) $(flag) $(link) -Wno-deprecated-writable-strings
 	@ldid -T0 -S $@
 
-postinst: postinst.mm Sources.mm Sources.h CyteKit/stringWithUTF8Bytes.mm CyteKit/stringWithUTF8Bytes.h CyteKit/UCPlatform.h
-	$(cycc) -std=c++11 $(filter %.mm,$^) $(flags) $(link) -framework CoreFoundation -framework Foundation -framework UIKit -lpcre
+postinst: postinst.mm CyteKit/stringWithUTF8Bytes.mm CyteKit/stringWithUTF8Bytes.h CyteKit/UCPlatform.h
+	$(cycc) $(plus) -o $@ $(filter %.mm,$^) $(flag) $(link) -framework CoreFoundation -framework Foundation -framework UIKit
 	@ldid -T0 -S $@
 
-debs/cydia_$(version)_iphoneos-arm.deb: MobileCydia preinst postinst cfversion setnsfpn $(images) $(shell find MobileCydia.app) cydia.control Library/firmware.sh Library/startup
+debs/cydia_$(version)_iphoneos-arm.deb: MobileCydia preinst postinst cfversion setnsfpn cydo $(images) $(shell find MobileCydia.app) cydia.control Library/firmware.sh Library/move.sh Library/startup
 	sudo rm -rf _
 	mkdir -p _/var/lib/cydia
 	
 	mkdir -p _/etc/apt
+	mkdir _/etc/apt/apt.conf.d
+	mkdir _/etc/apt/preferences.d
 	cp -a Trusted.gpg _/etc/apt/trusted.gpg.d
 	cp -a Sources.list _/etc/apt/sources.list.d
 	
@@ -158,13 +293,17 @@ debs/cydia_$(version)_iphoneos-arm.deb: MobileCydia preinst postinst cfversion s
 	cp -a cfversion _/usr/libexec/cydia
 	cp -a setnsfpn _/usr/libexec/cydia
 	
+	cp -a cydo _/usr/libexec/cydia
+	
 	mkdir -p _/Library
 	cp -a LaunchDaemons _/Library/LaunchDaemons
 	
 	mkdir -p _/Applications
 	cp -a MobileCydia.app _/Applications/Cydia.app
 	rm -rf _/Applications/Cydia.app/*.lproj
-	cp -a MobileCydia _/Applications/Cydia.app/MobileCydia
+	cp -a MobileCydia _/Applications/Cydia.app/Cydia
+	
+	for meth in bzip2 gzip lzma gpgv http https store $(methods); do ln -s Cydia _/Applications/Cydia.app/"$${meth}"; done
 	
 	cd MobileCydia.app && find . -name '*.png' -exec cp -af ../Images/MobileCydia.app/{} ../_/Applications/Cydia.app/{} ';'
 	
@@ -172,13 +311,6 @@ debs/cydia_$(version)_iphoneos-arm.deb: MobileCydia preinst postinst cfversion s
 	ln -s /usr/share/bigboss/icons/bigboss.png _/Applications/Cydia.app/Sources/apt.bigboss.us.com.png
 	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
-	
-	#mkdir -p _/Applications/Lowtide.app/Appliances
-	#ln -s {/Applications/AppleTV,_/Applications/Lowtide}.app/Appliances/Cydia.frappliance
-	
 	mkdir -p _/DEBIAN
 	./control.sh cydia.control _ >_/DEBIAN/control
 	cp -a preinst postinst _/DEBIAN/
@@ -187,7 +319,7 @@ debs/cydia_$(version)_iphoneos-arm.deb: MobileCydia preinst postinst cfversion s
 	
 	sudo chown -R 0 _
 	sudo chgrp -R 0 _
-	sudo chmod 6755 _/Applications/Cydia.app/MobileCydia
+	sudo chmod 6755 _/usr/libexec/cydia/cydo
 	
 	mkdir -p debs
 	ln -sf debs/cydia_$(version)_iphoneos-arm.deb Cydia.deb