We need to not leave parsed_ Packages laying around.

[cydia.git] / makefile

diff --git a/makefile b/makefile
index 1bfc33ca37767ba1009eec10bb57e722eaa375a3..8be707e4d8ce1e7b3f00bf68c297e78a7f39a712 100644 (file)
--- a/makefile
+++ b/makefile
@@ -63,8 +63,6 @@ version := $(shell ./version.sh)
 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{sysroot,}/Library/Frameworks
 
-flags += -DCYDIA_VERSION='"$(version)"'
-
 dirs := Menes CyteKit Cydia SDURLCache
 
 code := $(foreach dir,$(dirs),$(wildcard $(foreach ext,h hpp c cpp m mm,$(dir)/*.$(ext))))
@@ -85,6 +83,8 @@ object := $(object:%=Objects/%)
 images := $(shell find MobileCydia.app -name '*.png')
 images := $(images:%=Images/%)
 
+lproj_deb := debs/cydia-lproj_$(version)_iphoneos-arm.deb
+
 all: MobileCydia
 
 clean:
@@ -106,6 +106,8 @@ Objects/%.o: %.mm $(header)
        @echo "[cycc] $<"
        @$(cycc) -c -o $@ $< $(flags) $(xflags)
 
+Objects/MobileCydia.o: version.h
+
 Images/%.png: %.png
        @mkdir -p $(dir $@)
        @echo "[pngc] $<"
@@ -127,10 +129,14 @@ MobileCydia: sysroot $(object)
 CydiaAppliance: CydiaAppliance.mm
        $(cycc) $(filter %.mm,$^) $(flags) -bundle $(link) $(backrow)
 
-package: MobileCydia $(images)
+debs/cydia_$(version)_iphoneos-arm.deb: MobileCydia $(images) $(shell find MobileCydia.app) cydia.control
        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
@@ -140,16 +146,21 @@ package: MobileCydia $(images)
        
        mkdir -p _/Applications
        cp -a MobileCydia.app _/Applications/Cydia.app
+       rm -rf _/Applications/Cydia.app/*.lproj
        cp -a MobileCydia _/Applications/Cydia.app/MobileCydia
        
        cd MobileCydia.app && find . -name '*.png' -exec cp -af ../Images/MobileCydia.app/{} ../_/Applications/Cydia.app/{} ';'
        
+       #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
-       #cp -a Cydia.frappliance _/Applications/Lowtide.app/Appliances
-       #cp -a CydiaAppliance _/Applications/Lowtide.app/Appliances/Cydia.frappliance
+       #ln -s {/Applications/AppleTV,_/Applications/Lowtide}.app/Appliances/Cydia.frappliance
        
        mkdir -p _/DEBIAN
-       ./control.sh _ >_/DEBIAN/control
+       ./control.sh cydia.control _ >_/DEBIAN/control
+       cp -a preinst _/DEBIAN/
        
        find _ -exec touch -t "$$(date -j -f "%s" +"%Y%m%d%H%M.%S" "$$(git show --format='format:%ct' | head -n 1)")" {} ';'
        
@@ -162,4 +173,24 @@ package: MobileCydia $(images)
        $(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
+       cp -a preinst __/DEBIAN/
+       
+       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