Use a better URL scheme for /ui/ios*/ *and* (frowny) fix a multiple reload issue...

[cydia.git] / makefile

diff --git a/makefile b/makefile
index 52bb5db50fc89d11c08f982a9df7747f32af0ab3..9a1145dcf42b5ccd2466cf6f8457c7af8af4ba9f 100644 (file)
--- a/makefile
+++ b/makefile
@@ -1,18 +1,29 @@
-ifeq (o,O)
-ios := 2.0
+sdks := /Developer/Platforms/iPhoneOS.platform/Developer/SDKs
+
+ios := 3.2
+#ios := 2.0
+
+ifeq ($(patsubst 2%,2,$(ios)),2)

 gcc := 4.0
 else
 gcc := 4.0
 else

-ios := 3.2

 gcc := 4.2
 endif
 
 flags := 
 link := 
 
 gcc := 4.2
 endif
 
 flags := 
 link := 
 

-#dpkg := /Library/Cydia/bin/dpkg-deb -Zlzma
+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
 dpkg := dpkg-deb

+endif

 
 

-sdk := /Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS$(ios).sdk
+sdk := $(sdks)/iPhoneOS$(ios).sdk

 
 flags += -F$(sdk)/System/Library/PrivateFrameworks
 flags += -I. -isystem sysroot/usr/include -Lsysroot/usr/lib
 
 flags += -F$(sdk)/System/Library/PrivateFrameworks
 flags += -I. -isystem sysroot/usr/include -Lsysroot/usr/lib


@@ -28,6 +39,7 @@ link += -framework GraphicsServices
 link += -framework IOKit
 link += -framework JavaScriptCore
 link += -framework QuartzCore
 link += -framework IOKit
 link += -framework JavaScriptCore
 link += -framework QuartzCore

+link += -framework SpringBoardServices

 link += -framework SystemConfiguration
 link += -framework WebCore
 link += -framework WebKit
 link += -framework SystemConfiguration
 link += -framework WebCore
 link += -framework WebKit


@@ -46,16 +58,19 @@ backrow += -FAppleTV -framework BackRow -framework AppleTV
 
 #cycc = cycc -r4.2 -i$(ios) -o$@
 gxx := /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/g++-$(gcc)
 
 #cycc = cycc -r4.2 -i$(ios) -o$@
 gxx := /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/g++-$(gcc)

-cycc = $(gxx) -arch armv6 -o $@ -mcpu=arm1176jzf-s -miphoneos-version-min=$(ios) -isysroot $(sdk) -idirafter /usr/include -F/Library/Frameworks
+cycc = $(gxx) -mthumb -arch armv6 -o $@ -mcpu=arm1176jzf-s -miphoneos-version-min=2.0 -isysroot $(sdk) -idirafter /usr/include -F/Library/Frameworks

 
 all: MobileCydia
 
 clean:
        rm -f MobileCydia
 
 
 all: MobileCydia
 
 clean:
        rm -f MobileCydia
 

-MobileCydia: MobileCydia.mm UICaboodle/*.mm iPhonePrivate.h
-       $(cycc) $(filter %.mm,$^) $(flags) $(link) $(uikit)
-       ldid -Slaunch.xml $@
+%.o: %.c
+       $(cycc) -c -o $@ -x c $<
+
+MobileCydia: MobileCydia.mm UICaboodle/*.h UICaboodle/*.mm SDURLCache/SDURLCache.h SDURLCache/SDURLCache.m iPhonePrivate.h lookup3.o Cytore.hpp
+       $(cycc) $(filter %.mm,$^) $(filter %.o,$^) $(foreach m,$(filter %.m,$^),-x objective-c++ $(m)) $(flags) $(link) $(uikit)
+       ldid -Slaunch.xml $@ || { rm -f $@ && false; }

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


@@ -83,12 +98,17 @@ package: MobileCydia
        cp -a CydiaSettings.bundle _/System/Library/PreferenceBundles/CydiaSettings.bundle
        
        mkdir -p _/DEBIAN
        cp -a CydiaSettings.bundle _/System/Library/PreferenceBundles/CydiaSettings.bundle
        
        mkdir -p _/DEBIAN

-       echo "$$(cat control)"$$'\nInstalled-Size: '"$$(du -s _ | cut -f 1)" > _/DEBIAN/control
+       ./control.sh _ >_/DEBIAN/control
+       
+       find _ -name '*.png' -exec ./pngcrush.sh '{}' ';'

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

-       $(dpkg) -b _ $(shell grep ^Package: control | cut -d ' ' -f 2-)_$(shell grep ^Version: control | cut -d ' ' -f 2)_iphoneos-arm.deb
+       mkdir -p debs
+       ln -sf debs/cydia_$$(./version.sh)_iphoneos-arm.deb Cydia.deb
+       $(dpkg) -b _ Cydia.deb
+       @echo "$$(stat -L -f "%z" Cydia.deb) $$(stat -f "%Y" Cydia.deb)"

 
 .PHONY: all clean sign
 
 .PHONY: all clean sign