Do not lock the dpkg status database (this is OK).

[cydia.git] / makefile

diff --git a/makefile b/makefile
index bae04cecfe824b291509ecc24fbf2cc8c360b2b3..0d5506b5b962f1213f7df8c6195af1f727657e3c 100644 (file)
--- a/makefile
+++ b/makefile
@@ -42,17 +42,12 @@ libs += -framework SystemConfiguration
 libs += -framework WebCore
 libs += -framework WebKit
 
-libs += -lapr-1
 libs += -lapt-pkg
 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
@@ -66,7 +61,7 @@ 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))
@@ -100,6 +95,11 @@ Objects/%.o: %.m $(header)
        @echo "[cycc] $<"
        @$(cycc) -c $< $(flags)
 
+Objects/%.o: %.cpp $(header)
+       @mkdir -p $(dir $@)
+       @echo "[cycc] $<"
+       @$(cycc) -std=c++11 -c $< $(flags) $(xflags)
+
 Objects/%.o: %.mm $(header)
        @mkdir -p $(dir $@)
        @echo "[cycc] $<"
@@ -119,19 +119,16 @@ sysroot: sysroot.sh
 
 MobileCydia: sysroot $(object) entitlements.xml
        @echo "[link] $(object:Objects/%=%)"
-       @$(cycc) $(filter %.o,$^) $(flags) $(link) $(libs) $(uikit) -Wl,-sdk_version,7.0
+       @$(cycc) $(filter %.o,$^) $(flags) $(link) $(libs) $(uikit) -Wl,-sdk_version,8.0
        @mkdir -p bins
        @cp -a $@ bins/$@-$(version)
        @echo "[strp] $@"
-       @strip -no_uuid $@
+       @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
        @ldid -T0 -S $@
@@ -140,11 +137,15 @@ setnsfpn: setnsfpn.cpp
        $(cycc) $(filter %.cpp,$^) $(flags) $(link)
        @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
+cydo: cydo.cpp
+       $(cycc) -std=c++11 $(filter %.cpp,$^) $(flags) $(link) -Wno-deprecated-writable-strings
        @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
+postinst: postinst.mm CyteKit/stringWithUTF8Bytes.mm CyteKit/stringWithUTF8Bytes.h CyteKit/UCPlatform.h
+       $(cycc) -std=c++11 $(filter %.mm,$^) $(flags) $(link) -framework CoreFoundation -framework Foundation -framework UIKit
+       @ldid -T0 -S $@
+
+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
        
@@ -154,10 +155,12 @@ debs/cydia_$(version)_iphoneos-arm.deb: MobileCydia preinst postinst cfversion s
        
        mkdir -p _/usr/libexec
        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
+       sudo chmod 6755 _/usr/libexec/cydia/cydo
+       
        mkdir -p _/Library
        cp -a LaunchDaemons _/Library/LaunchDaemons
        
@@ -172,13 +175,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/