Add -[CyteWebViewDelegate webView:didCommitLoadForFrame:].

[cydia.git] / makefile

diff --git a/makefile b/makefile
index 9a1145dcf42b5ccd2466cf6f8457c7af8af4ba9f..23f25ee2917628ae48ed7da57588ddafabb9b600 100644 (file)
--- a/makefile
+++ b/makefile
@@ -1,13 +1,8 @@
 sdks := /Developer/Platforms/iPhoneOS.platform/Developer/SDKs
 sdks := /Developer/Platforms/iPhoneOS.platform/Developer/SDKs

+ioss := $(sort $(patsubst $(sdks)/iPhoneOS%.sdk,%,$(wildcard $(sdks)/iPhoneOS*.sdk)))

 
 

-ios := 3.2
-#ios := 2.0
-
-ifeq ($(patsubst 2%,2,$(ios)),2)
-gcc := 4.0
-else
+ios := $(word $(words $(ioss)),$(ioss))

 gcc := 4.2
 gcc := 4.2

-endif

 
 flags := 
 link := 
 
 flags := 
 link := 


@@ -30,7 +25,13 @@ flags += -I. -isystem sysroot/usr/include -Lsysroot/usr/lib
 flags += -Wall -Werror -Wno-deprecated-declarations
 flags += -fmessage-length=0
 flags += -g0 -O2
 flags += -Wall -Werror -Wno-deprecated-declarations
 flags += -fmessage-length=0
 flags += -g0 -O2

-flags += -fobjc-call-cxx-cdtors -fobjc-exceptions
+flags += -fobjc-exceptions
+flags += -fno-guess-branch-probability
+flags += -fvisibility=hidden
+
+xflags :=
+xflags += -fobjc-call-cxx-cdtors
+xflags += -fvisibility-inlines-hidden

 
 link += -framework CoreFoundation
 link += -framework CoreGraphics
 
 link += -framework CoreFoundation
 link += -framework CoreGraphics


@@ -56,29 +57,89 @@ uikit += -framework UIKit
 backrow := 
 backrow += -FAppleTV -framework BackRow -framework AppleTV
 
 backrow := 
 backrow += -FAppleTV -framework BackRow -framework AppleTV
 

+version := $(shell ./version.sh)
+

 #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) -mthumb -arch armv6 -o $@ -mcpu=arm1176jzf-s -miphoneos-version-min=2.0 -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{sysroot,}/Library/Frameworks

 
 

-all: MobileCydia
+dirs := Menes CyteKit Cydia SDURLCache

 
 

-clean:
-       rm -f MobileCydia
+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

 
 

-%.o: %.c
-       $(cycc) -c -o $@ -x c $<
+source := $(filter %.m,$(code)) $(filter %.mm,$(code))
+source += $(filter %.c,$(code)) $(filter %.cpp,$(code))
+header := $(filter %.h,$(code)) $(filter %.hpp,$(code))

 
 

-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; }
+object := $(source)
+object := $(object:.c=.o)
+object := $(object:.cpp=.o)
+object := $(object:.m=.o)
+object := $(object:.mm=.o)
+object := $(object:%=Objects/%)
+
+images := $(shell find MobileCydia.app/ -type f -name '*.png')
+images := $(images:%=Images/%)
+
+lproj_deb := debs/cydia-lproj_$(version)_iphoneos-arm.deb
+
+all: MobileCydia
+
+clean:
+       rm -f MobileCydia postinst
+       rm -rf Objects/ Images/
+
+Objects/%.o: %.c $(header)
+       @mkdir -p $(dir $@)
+       @echo "[cycc] $<"
+       @$(cycc) -c -o $@ -x c $<
+
+Objects/%.o: %.m $(header)
+       @mkdir -p $(dir $@)
+       @echo "[cycc] $<"
+       @$(cycc) -c -o $@ $< $(flags)
+
+Objects/%.o: %.mm $(header)
+       @mkdir -p $(dir $@)
+       @echo "[cycc] $<"
+       @$(cycc) -c -o $@ $< $(flags) $(xflags)
+
+Objects/Version.o: version.h
+
+Images/%.png: %.png
+       @mkdir -p $(dir $@)
+       @echo "[pngc] $<"
+       @./pngcrush.sh $< $@
+
+sysroot: sysroot.sh
+       @echo "Your ./sysroot/ is either missing or out of date. Please read compiling.txt for help." 1>&2
+       @echo 1>&2
+       @exit 1
+
+MobileCydia: sysroot $(object)
+       @echo "[link] $(object:Objects/%=%)"
+       @$(cycc) $(filter %.o,$^) $(flags) $(link) $(uikit)
+       @echo "[strp] $@"
+       @strip -no_uuid $@
+       @echo "[sign] $@"
+       @ldid -T0 -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)
 

-package: MobileCydia
+postinst: postinst.mm Sources.mm Sources.h CyteKit/stringWithUTF8Bytes.mm CyteKit/stringWithUTF8Bytes.h CyteKit/UCPlatform.h
+       $(cycc) $(filter %.mm,$^) $(flags) -framework CoreFoundation -framework Foundation -framework UIKit -lpcre
+
+debs/cydia_$(version)_iphoneos-arm.deb: MobileCydia preinst postinst $(images) $(shell find MobileCydia.app) cydia.control

        sudo rm -rf _
        mkdir -p _/var/lib/cydia
        
        sudo rm -rf _
        mkdir -p _/var/lib/cydia
        

+       mkdir -p _/etc/apt
+       cp -a Trusted.gpg _/etc/apt/trusted.gpg.d
+       cp -a Sources.list _/etc/apt/sources.list.d
+       

        mkdir -p _/usr/libexec
        cp -a Library _/usr/libexec/cydia
        cp -a sysroot/usr/bin/du _/usr/libexec/cydia
        mkdir -p _/usr/libexec
        cp -a Library _/usr/libexec/cydia
        cp -a sysroot/usr/bin/du _/usr/libexec/cydia


@@ -88,27 +149,54 @@ package: MobileCydia
        
        mkdir -p _/Applications
        cp -a MobileCydia.app _/Applications/Cydia.app
        
        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/MobileCydia
        

-       #mkdir -p _/Applications/Lowtide.app/Appliances
-       #cp -a Cydia.frappliance _/Applications/Lowtide.app/Appliances
-       #cp -a CydiaAppliance _/Applications/Lowtide.app/Appliances/Cydia.frappliance
+       cd MobileCydia.app && find . -name '*.png' -exec cp -af ../Images/MobileCydia.app/{} ../_/Applications/Cydia.app/{} ';'
+       
+       mkdir -p _/Applications/Cydia.app/Sources
+       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 _/System/Library/PreferenceBundles
-       cp -a CydiaSettings.bundle _/System/Library/PreferenceBundles/CydiaSettings.bundle
+       #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
        
        mkdir -p _/DEBIAN

-       ./control.sh _ >_/DEBIAN/control
+       ./control.sh cydia.control _ >_/DEBIAN/control
+       cp -a preinst postinst _/DEBIAN/

        
        

-       find _ -name '*.png' -exec ./pngcrush.sh '{}' ';'
+       find _ -exec touch -t "$$(date -j -f "%s" +"%Y%m%d%H%M.%S" "$$(git show --format='format:%ct' | head -n 1)")" {} ';'

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

-       ln -sf debs/cydia_$$(./version.sh)_iphoneos-arm.deb Cydia.deb
+       ln -sf debs/cydia_$(version)_iphoneos-arm.deb Cydia.deb

        $(dpkg) -b _ Cydia.deb
        @echo "$$(stat -L -f "%z" Cydia.deb) $$(stat -f "%Y" Cydia.deb)"
 
        $(dpkg) -b _ Cydia.deb
        @echo "$$(stat -L -f "%z" Cydia.deb) $$(stat -f "%Y" Cydia.deb)"
 

-.PHONY: all clean sign
+$(lproj_deb): $(shell find MobileCydia.app -name '*.strings') cydia-lproj.control
+       sudo rm -rf __
+       mkdir -p __/Applications/Cydia.app
+       
+       cp -a MobileCydia.app/*.lproj __/Applications/Cydia.app
+       
+       mkdir -p __/DEBIAN
+       ./control.sh cydia-lproj.control __ >__/DEBIAN/control
+       
+       sudo chown -R 0 __
+       sudo chgrp -R 0 __
+       
+       mkdir -p debs
+       ln -sf debs/cydia-lproj_$(version)_iphoneos-arm.deb Cydia_.deb
+       $(dpkg) -b __ Cydia_.deb
+       @echo "$$(stat -L -f "%z" Cydia_.deb) $$(stat -f "%Y" Cydia_.deb)"
+       
+package: debs/cydia_$(version)_iphoneos-arm.deb $(lproj_deb)
+
+.PHONY: all clean package sign