OMG the mechanism for allocating CYNavigationControllers was both incorrect and insane.

[cydia.git] / makefile

diff --git a/makefile b/makefile
index ddb9024a8fdba0d4f4468921ea8b76e57cb0c32f..9236ff6f14e1ebae1d745c4996e61238c30728cf 100644 (file)
--- a/makefile
+++ b/makefile
@@ -36,17 +36,16 @@ all: Cydia
 clean:
        rm -f Cydia
 
 clean:
        rm -f Cydia
 

-Cydia: Cydia.mm Reachability.mm UICaboodle/*.mm
+Cydia: Cydia.mm Reachability.mm UICaboodle/*.mm iPhonePrivate.h

        cycc -r4.2 -i$(ios) -o$@ -- $(filter %.mm,$^) $(flags) $(link)
 
 package: Cydia
        cycc -r4.2 -i$(ios) -o$@ -- $(filter %.mm,$^) $(flags) $(link)
 
 package: Cydia

-       rm -rf _
+       sudo rm -rf _

        mkdir -p _/var/lib/cydia
        
        mkdir -p _/usr/libexec
        cp -a Library _/usr/libexec/cydia
        mkdir -p _/var/lib/cydia
        
        mkdir -p _/usr/libexec
        cp -a Library _/usr/libexec/cydia

-       # XXX: fix du
-       #cp -a /apl/tel/dest/iphoneos-arm/coreutils/usr/bin/du _/usr/libexec/cydia
+       cp -a sysroot/usr/bin/du _/usr/libexec/cydia

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


@@ -54,7 +53,6 @@ package: Cydia
        mkdir -p _/Applications
        cp -a Cydia.app _/Applications/Cydia.app
        cp -a Cydia _/Applications/Cydia.app/Cydia_
        mkdir -p _/Applications
        cp -a Cydia.app _/Applications/Cydia.app
        cp -a Cydia _/Applications/Cydia.app/Cydia_

-       chmod 6755 _/Applications/Cydia.app/Cydia_

        
        mkdir -p _/System/Library/PreferenceBundles
        cp -a CydiaSettings.bundle _/System/Library/PreferenceBundles/CydiaSettings.bundle
        
        mkdir -p _/System/Library/PreferenceBundles
        cp -a CydiaSettings.bundle _/System/Library/PreferenceBundles/CydiaSettings.bundle


@@ -62,6 +60,10 @@ package: Cydia
        mkdir -p _/DEBIAN
        echo "$$(cat control)"$$'\nInstalled-Size: '"$$(du -s _ | cut -f 1)" > _/DEBIAN/control
        
        mkdir -p _/DEBIAN
        echo "$$(cat control)"$$'\nInstalled-Size: '"$$(du -s _ | cut -f 1)" > _/DEBIAN/control
        

+       sudo chown -R 0 _
+       sudo chgrp -R 0 _
+       sudo chmod 6755 _/Applications/Cydia.app/Cydia_
+       

        $(dpkg) -b _ $(shell grep ^Package: control | cut -d ' ' -f 2-)_$(shell grep ^Version: control | cut -d ' ' -f 2)_iphoneos-arm.deb
 
 .PHONY: all clean sign
        $(dpkg) -b _ $(shell grep ^Package: control | cut -d ' ' -f 2-)_$(shell grep ^Version: control | cut -d ' ' -f 2)_iphoneos-arm.deb
 
 .PHONY: all clean sign