Packages with corrupt Info.plist throw exceptions.

[cydia.git] / makefile

diff --git a/makefile b/makefile
index fbca76be5416663fe46f62fcda67dd14a17059f2..86b4784a12a8753650cfc7572f1d5dd1eca49bf9 100644 (file)
--- a/makefile
+++ b/makefile
@@ -61,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))
@@ -95,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] $<"
@@ -132,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
+cydo: cydo.cpp
+       $(cycc) -std=c++11 $(filter %.cpp,$^) $(flags) $(link) -Wno-deprecated-writable-strings
+       @ldid -T0 -S $@
+
+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 $(images) $(shell find MobileCydia.app) cydia.control Library/firmware.sh Library/move.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
        
@@ -146,17 +155,19 @@ 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
        
        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
        
        cd MobileCydia.app && find . -name '*.png' -exec cp -af ../Images/MobileCydia.app/{} ../_/Applications/Cydia.app/{} ';'
        
@@ -172,7 +183,6 @@ 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
        
        mkdir -p debs
        ln -sf debs/cydia_$(version)_iphoneos-arm.deb Cydia.deb