This new code only works if the button is loading.

[cydia.git] / makefile

diff --git a/makefile b/makefile
index bcd811c555bd03d48e91e0feb66824ed739559cc..30d1b292df1402386b31b116c9bf7aaf79946967 100644 (file)
--- a/makefile
+++ b/makefile
@@ -1,58 +1,55 @@
-dev := $(shell xcode-select --print-path)/Platforms/iPhoneOS.platform/Developer
-sdks := $(dev)/SDKs
-ioss := $(sort $(patsubst $(sdks)/iPhoneOS%.sdk,%,$(wildcard $(sdks)/iPhoneOS*.sdk)))
-ios := $(word $(words $(ioss)),$(ioss))
+.DELETE_ON_ERROR:
+.SECONDARY:

 
 

-# XXX: as of iOS 6.x armv6 is not supported :(
-ios := 5.1
-
-# if you can tolerate clang, set this to blank
-gcc := 4.2
-
-ifeq ($(gcc),)
-gxx := $(dev)/usr/bin/clang++
-else
-gxx := $(dev)/usr/bin/g++
-endif
+dpkg := dpkg-deb -Zlzma
+version := $(shell ./version.sh)

 
 

-flags := 
+flag := 
+plus :=

 link := 
 libs := 
 
 link := 
 libs := 
 

-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 := $(sdks)/iPhoneOS$(ios).sdk
-
-flags += -F$(sdk)/System/Library/PrivateFrameworks
-flags += -I. -isystem sysroot/usr/include
-flags += -fmessage-length=0
-flags += -g0 -O2
-flags += -fvisibility=hidden
-
-flags += -Wall
-
-ifeq ($(gcc),)
-flags += -Wno-unknown-warning-option
-flags += -Wno-logical-op-parentheses
-else
-flags += -fobjc-exceptions
-flags += -fno-guess-branch-probability
-endif
-
-flags += -Wno-deprecated-declarations
-
-xflags :=
-xflags += -fobjc-call-cxx-cdtors
-xflags += -fvisibility-inlines-hidden
+gxx := $(shell xcrun --sdk iphoneos -f g++)
+cycc := $(gxx)
+
+sdk := $(shell xcodebuild -sdk iphoneos -version Path)
+cycc += -isysroot $(sdk)
+cycc += -idirafter /usr/include
+cycc += -F$(sdk)/System/Library/PrivateFrameworks
+
+cycc += -arch arm64
+cycc += -Xarch_arm64 -miphoneos-version-min=7.0
+
+cycc += -fmessage-length=0
+cycc += -gfull -O2
+cycc += -fvisibility=hidden
+
+link += -Wl,-dead_strip
+link += -Wl,-no_dead_strip_inits_and_terms
+
+flag += -Xarch_arm64 -Iapt
+flag += -Xarch_arm64 -Iapt-contrib
+flag += -Xarch_arm64 -Iapt-deb
+flag += -Xarch_arm64 -Iapt-extra
+flag += -Xarch_arm64 -Iapt-tag
+
+flag += -I.
+flag += -isystem sysroot/usr/include
+
+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
 
 link += -Lsysroot/usr/lib
 link += -multiply_defined suppress


@@ -68,30 +65,20 @@ libs += -framework SystemConfiguration
 libs += -framework WebCore
 libs += -framework WebKit
 
 libs += -framework WebCore
 libs += -framework WebKit
 

-libs += -lapr-1
-libs += -lapt-pkg
-libs += -lpcre
+libs += -Xarch_armv6 -Wl,-lapt-pkg
+libs += -Xarch_arm64 -Wl,Objects/libapt64.a
+libs += -licucore

 
 uikit := 
 uikit += -framework UIKit
 
 
 uikit := 
 uikit += -framework UIKit
 

-backrow := 
-backrow += -FAppleTV -framework BackRow -framework AppleTV
-
-version := $(shell ./version.sh)
-
-cycc = $(gxx) -mthumb -arch armv6 -o $@ -miphoneos-version-min=2.0 -isysroot $(sdk) -idirafter /usr/include -F{sysroot,}/Library/Frameworks
-#cycc = cycc -r4.2 -i$(ios) -o$@
-
-ifneq ($(gcc),)
-cycc += -Xarch_armv6 -mcpu=arm1176jzf-s
-endif
+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))
 
 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

 
 source := $(filter %.m,$(code)) $(filter %.mm,$(code))
 source += $(filter %.c,$(code)) $(filter %.cpp,$(code))
 
 source := $(filter %.m,$(code)) $(filter %.mm,$(code))
 source += $(filter %.c,$(code)) $(filter %.cpp,$(code))


@@ -104,6 +91,37 @@ object := $(object:.m=.o)
 object := $(object:.mm=.o)
 object := $(object:%=Objects/%)
 
 object := $(object:.mm=.o)
 object := $(object:%=Objects/%)
 

+libapt := 
+libapt += $(wildcard apt/apt-pkg/*.cc)
+libapt += $(wildcard apt/apt-pkg/deb/*.cc)
+libapt += $(wildcard apt/apt-pkg/contrib/*.cc)
+libapt += apt-tag/apt-pkg/tagfile-keys.cc
+libapt += apt/methods/store.cc
+libapt := $(filter-out %/srvrec.cc,$(libapt))
+libapt := $(patsubst %.cc,Objects/%.o,$(libapt))
+
+link += -Xarch_arm64 -Wl,-lz,-liconv
+
+flag += -DAPT_PKG_EXPOSE_STRING_VIEW
+flag += -Dsighandler_t=sig_t
+
+aptc := $(cycc) $(flag)
+aptc += -include apt.h
+aptc += -Wno-deprecated-register
+aptc += -Wno-unused-private-field
+aptc += -Wno-unused-variable
+
+cycc += -arch armv6
+cycc += -Xarch_armv6 -miphoneos-version-min=2.0
+flag += -Xarch_armv6 -marm # @synchronized
+flag += -Xarch_armv6 -mcpu=arm1176jzf-s
+flag += -mllvm -arm-reserve-r9
+link += -Xarch_armv6 -Wl,-lgcc_s.1
+
+plus += -std=c++11
+#plus += -Wp,-stdlib=libc++
+#link += libcxx/lib/libc++.a
+

 images := $(shell find MobileCydia.app/ -type f -name '*.png')
 images := $(images:%=Images/%)
 
 images := $(shell find MobileCydia.app/ -type f -name '*.png')
 images := $(images:%=Images/%)
 


@@ -115,20 +133,30 @@ clean:
        rm -f MobileCydia postinst
        rm -rf Objects/ Images/
 
        rm -f MobileCydia postinst
        rm -rf Objects/ Images/
 

+Objects/%.o: %.cc $(header) apt.h apt-extra/*.h
+       @mkdir -p $(dir $@)
+       @echo "[cycc] $<"
+       @$(aptc) $(plus) -c -o $@ $< -Dmain=main_$(basename $(notdir $@))
+

 Objects/%.o: %.c $(header)
        @mkdir -p $(dir $@)
        @echo "[cycc] $<"
 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] $<"
 
 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] $<"
 
 Objects/%.o: %.mm $(header)
        @mkdir -p $(dir $@)
        @echo "[cycc] $<"

-       @$(cycc) -c $< $(flags) $(xflags)
+       @$(cycc) $(plus) -c -o $@ $< $(flag)

 
 Objects/Version.o: Version.h
 
 
 Objects/Version.o: Version.h
 


@@ -142,28 +170,39 @@ sysroot: sysroot.sh
        @echo 1>&2
        @exit 1
 
        @echo 1>&2
        @exit 1
 

-MobileCydia: sysroot $(object) entitlements.xml
-       @echo "[link] $(object:Objects/%=%)"
-       @$(cycc) $(filter %.o,$^) $(flags) $(link) $(libs) $(uikit)
+Objects/libapt64.a: $(libapt)
+       @echo "[arch] $@"
+       @ar -rc $@ $^
+
+MobileCydia: sysroot $(object) entitlements.xml Objects/libapt64.a
+       @echo "[link] $@"
+       @$(cycc) -o $@ $(filter %.o,$^) $(link) $(libs) $(uikit) -Wl,-sdk_version,8.0

        @mkdir -p bins
        @cp -a $@ bins/$@-$(version)
        @echo "[strp] $@"
        @mkdir -p bins
        @cp -a $@ bins/$@-$(version)
        @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; }
 
        @echo "[sign] $@"
        @ldid -T0 -Sentitlements.xml $@ || { rm -f $@ && false; }
 

-CydiaAppliance: CydiaAppliance.mm
-       $(cycc) $(filter %.mm,$^) $(flags) $(link) -bundle $(libs) $(backrow)
-

 cfversion: cfversion.mm
 cfversion: cfversion.mm

-       $(cycc) $(filter %.mm,$^) $(flags) -framework CoreFoundation
+       $(cycc) -o $@ $(filter %.mm,$^) $(flag) $(link) -framework CoreFoundation
+       @ldid -T0 -S $@
+
+setnsfpn: setnsfpn.cpp
+       $(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 $@
 
        @ldid -T0 -S $@
 

-postinst: postinst.mm Sources.mm Sources.h CyteKit/stringWithUTF8Bytes.mm CyteKit/stringWithUTF8Bytes.h CyteKit/UCPlatform.h
-       $(cycc) $(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 $@
 
        @ldid -T0 -S $@
 

-debs/cydia_$(version)_iphoneos-arm.deb: MobileCydia preinst postinst cfversion $(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
        
        sudo rm -rf _
        mkdir -p _/var/lib/cydia
        


@@ -175,14 +214,18 @@ debs/cydia_$(version)_iphoneos-arm.deb: MobileCydia preinst postinst cfversion $
        cp -a Library _/usr/libexec/cydia
        cp -a sysroot/usr/bin/du _/usr/libexec/cydia
        cp -a cfversion _/usr/libexec/cydia
        cp -a Library _/usr/libexec/cydia
        cp -a sysroot/usr/bin/du _/usr/libexec/cydia
        cp -a cfversion _/usr/libexec/cydia

+       cp -a setnsfpn _/usr/libexec/cydia
+       
+       cp -a cydo _/usr/libexec/cydia

        
        

-       mkdir -p _/System/Library
-       cp -a LaunchDaemons _/System/Library/LaunchDaemons
+       mkdir -p _/Library
+       cp -a LaunchDaemons _/Library/LaunchDaemons

        
        mkdir -p _/Applications
        cp -a MobileCydia.app _/Applications/Cydia.app
        rm -rf _/Applications/Cydia.app/*.lproj
        
        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
+       ln -s Cydia _/Applications/Cydia.app/store

        
        cd MobileCydia.app && find . -name '*.png' -exec cp -af ../Images/MobileCydia.app/{} ../_/Applications/Cydia.app/{} ';'
        
        
        cd MobileCydia.app && find . -name '*.png' -exec cp -af ../Images/MobileCydia.app/{} ../_/Applications/Cydia.app/{} ';'
        


@@ -190,13 +233,6 @@ debs/cydia_$(version)_iphoneos-arm.deb: MobileCydia preinst postinst cfversion $
        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"
        
        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/
        mkdir -p _/DEBIAN
        ./control.sh cydia.control _ >_/DEBIAN/control
        cp -a preinst postinst _/DEBIAN/


@@ -205,7 +241,7 @@ debs/cydia_$(version)_iphoneos-arm.deb: MobileCydia preinst postinst cfversion $
        
        sudo chown -R 0 _
        sudo chgrp -R 0 _
        
        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
        
        mkdir -p debs
        ln -sf debs/cydia_$(version)_iphoneos-arm.deb Cydia.deb