Objective-C seriously didn't notice my mistake :/.

[cydia.git] / makefile

diff --git a/makefile b/makefile
index 51dcf7dfbe09387e43110d0deb36c6cf235b1de3..d503c3907408a22298ab08f0f2d1440726dcf1e6 100644 (file)
--- a/makefile
+++ b/makefile
@@ -8,15 +8,32 @@ flag :=
 plus :=
 link := 
 libs := 
 plus :=
 link := 
 libs := 

+lapt := 

 
 

-gxx := $(shell xcrun --sdk iphoneos -f g++)
+ifeq ($(doIA),yes)
+kind := iphonesimulator
+arch := x86_64
+else
+kind := iphoneos
+arch := arm64
+endif
+
+gxx := $(shell xcrun --sdk $(kind) -f g++)

 cycc := $(gxx)
 
 cycc := $(gxx)
 

-sdk := $(shell xcodebuild -sdk iphoneos -version Path)
+sdk := $(shell xcodebuild -sdk $(kind) -version Path)
+mac := $(shell xcodebuild -sdk macosx -version Path)
+

 cycc += -isysroot $(sdk)
 cycc += -isysroot $(sdk)

-cycc += -idirafter /usr/include
+cycc += -idirafter $(mac)/usr/include

 cycc += -F$(sdk)/System/Library/PrivateFrameworks
 
 cycc += -F$(sdk)/System/Library/PrivateFrameworks
 

+ifeq ($(doIA),yes)
+cycc += -Xarch_x86_64 -F$(sdk)/../../../../iPhoneOS.platform/Developer/Library/CoreSimulator/Profiles/Runtimes/iOS.simruntime/Contents/Resources/RuntimeRoot/System/Library/PrivateFrameworks
+endif
+
+cycc += -include system.h
+

 cycc += -fmessage-length=0
 cycc += -gfull -O2
 cycc += -fvisibility=hidden
 cycc += -fmessage-length=0
 cycc += -gfull -O2
 cycc += -fvisibility=hidden


@@ -24,17 +41,18 @@ cycc += -fvisibility=hidden
 link += -Wl,-dead_strip
 link += -Wl,-no_dead_strip_inits_and_terms
 
 link += -Wl,-dead_strip
 link += -Wl,-no_dead_strip_inits_and_terms
 

-flag += -Xarch_armv6 -Iapt32
-flag += -Xarch_armv6 -Iapt32-contrib
-flag += -Xarch_armv6 -Iapt32-deb
-flag += -Xarch_armv6 -Iapt-extra
-flag += -Xarch_armv6 -IObjects/apt32
+iapt := 
+iapt += -Iapt32
+iapt += -Iapt32-contrib
+iapt += -Iapt32-deb
+iapt += -Iapt-extra
+iapt += -IObjects/apt32

 
 

-flag += -Xarch_arm64 -Iapt64
-flag += -Xarch_arm64 -Iapt64-contrib
-flag += -Xarch_arm64 -Iapt64-deb
-flag += -Xarch_arm64 -Iapt-extra
-flag += -Xarch_arm64 -IObjects/apt64
+ifeq ($(do32),yes)
+flag += $(patsubst %,-Xarch_armv6 %,$(iapt))
+endif
+
+flag += $(patsubst %,-Xarch_$(arch) %,$(subst apt32,apt64,$(iapt)))

 
 flag += -I.
 flag += -isystem sysroot/usr/include
 
 flag += -I.
 flag += -isystem sysroot/usr/include


@@ -64,40 +82,54 @@ libs += -framework IOKit
 libs += -framework QuartzCore
 libs += -framework SpringBoardServices
 libs += -framework SystemConfiguration
 libs += -framework QuartzCore
 libs += -framework SpringBoardServices
 libs += -framework SystemConfiguration

-libs += -framework WebCore

 libs += -framework WebKit
 
 libs += -framework WebKit
 

+libs += -framework CFNetwork
+
+ifeq ($(do32),yes)
+libs += -framework WebCore
+libs += -llockdown

 libs += -Xarch_armv6 -Wl,-force_load,Objects/libapt32.a
 libs += -Xarch_armv6 -Wl,-force_load,Objects/libapt32.a

-libs += -Xarch_arm64 -Wl,-force_load,Objects/libapt64.a
+lapt += Objects/libapt32.a
+endif
+
+libs += -Xarch_$(arch) -Wl,-force_load,Objects/libapt64.a
+lapt += Objects/libapt64.a

 
 libs += -licucore
 
 uikit := 
 uikit += -framework UIKit
 
 
 libs += -licucore
 
 uikit := 
 uikit += -framework UIKit
 

-link += -Xarch_armv6 -Wl,-segalign,4000
-

 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 DiskUsage.cpp
 
 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 DiskUsage.cpp
 

+code += gpgv.cc
+code += http.cc
+

 source := $(filter %.m,$(code)) $(filter %.mm,$(code))
 source := $(filter %.m,$(code)) $(filter %.mm,$(code))

-source += $(filter %.c,$(code)) $(filter %.cpp,$(code))
-header := $(filter %.h,$(code)) $(filter %.hpp,$(code))
+source += $(filter %.c,$(code)) $(filter %.cpp,$(code)) $(filter %.cc,$(code))
+header := $(filter %.h,$(code)) $(filter %.hpp,$(code)) $(filter %.hh,$(code))

 
 object := $(source)
 object := $(object:.c=.o)
 object := $(object:.cpp=.o)
 
 object := $(source)
 object := $(object:.c=.o)
 object := $(object:.cpp=.o)

+object := $(object:.cc=.o)

 object := $(object:.m=.o)
 object := $(object:.mm=.o)
 object := $(object:%=Objects/%)
 
 object := $(object:.m=.o)
 object := $(object:.mm=.o)
 object := $(object:%=Objects/%)
 

+methods := copy file rred
+

 libapt32 := 
 libapt32 += $(wildcard apt32/apt-pkg/*.cc)
 libapt32 += $(wildcard apt32/apt-pkg/deb/*.cc)
 libapt32 += $(wildcard apt32/apt-pkg/contrib/*.cc)
 libapt32 := 
 libapt32 += $(wildcard apt32/apt-pkg/*.cc)
 libapt32 += $(wildcard apt32/apt-pkg/deb/*.cc)
 libapt32 += $(wildcard apt32/apt-pkg/contrib/*.cc)

+libapt32 += apt32/methods/gzip.cc
+libapt32 += $(patsubst %,apt32/methods/%.cc,$(methods))

 libapt32 := $(patsubst %.cc,Objects/%.o,$(libapt32))
 
 libapt64 := 
 libapt32 := $(patsubst %.cc,Objects/%.o,$(libapt32))
 
 libapt64 := 


@@ -106,36 +138,39 @@ libapt64 += $(wildcard apt64/apt-pkg/deb/*.cc)
 libapt64 += $(wildcard apt64/apt-pkg/contrib/*.cc)
 libapt64 += apt64/apt-pkg/tagfile-keys.cc
 libapt64 += apt64/methods/store.cc
 libapt64 += $(wildcard apt64/apt-pkg/contrib/*.cc)
 libapt64 += apt64/apt-pkg/tagfile-keys.cc
 libapt64 += apt64/methods/store.cc

+libapt64 += $(patsubst %,apt64/methods/%.cc,$(methods))

 libapt64 := $(filter-out %/srvrec.cc,$(libapt64))
 libapt64 := $(patsubst %.cc,Objects/%.o,$(libapt64))
 
 link += -Wl,-liconv
 libapt64 := $(filter-out %/srvrec.cc,$(libapt64))
 libapt64 := $(patsubst %.cc,Objects/%.o,$(libapt64))
 
 link += -Wl,-liconv

-link += -Xarch_arm64 -Wl,-lz
+link += -Xarch_$(arch) -Wl,-lz

 
 flag += -DAPT_PKG_EXPOSE_STRING_VIEW
 flag += -Dsighandler_t=sig_t
 
 
 flag += -DAPT_PKG_EXPOSE_STRING_VIEW
 flag += -Dsighandler_t=sig_t
 

+ifeq ($(do32),yes)

 flag32 := 
 flag32 += -arch armv6
 flag32 += -Xarch_armv6 -miphoneos-version-min=2.0
 flag32 += -Xarch_armv6 -marm # @synchronized
 flag32 += -Xarch_armv6 -mcpu=arm1176jzf-s
 flag32 += -mllvm -arm-reserve-r9
 flag32 := 
 flag32 += -arch armv6
 flag32 += -Xarch_armv6 -miphoneos-version-min=2.0
 flag32 += -Xarch_armv6 -marm # @synchronized
 flag32 += -Xarch_armv6 -mcpu=arm1176jzf-s
 flag32 += -mllvm -arm-reserve-r9

-link += -Xarch_armv6 -Wl,-lgcc_s.1

 
 

-flag64 := 
-flag64 += -arch arm64
-flag64 += -Xarch_arm64 -miphoneos-version-min=7.0
+link += -Xarch_armv6 -Wl,-lgcc_s.1
+link += -Xarch_armv6 -Wl,-segalign,4000

 
 apt32 := $(cycc) $(flag32) $(flag)
 
 apt32 := $(cycc) $(flag32) $(flag)

-apt32 += -include apt.h

 apt32 += -Wno-deprecated-register
 apt32 += -Wno-format-security
 apt32 += -Wno-tautological-compare
 apt32 += -Wno-uninitialized
 apt32 += -Wno-unused-private-field
 apt32 += -Wno-unused-variable
 apt32 += -Wno-deprecated-register
 apt32 += -Wno-format-security
 apt32 += -Wno-tautological-compare
 apt32 += -Wno-uninitialized
 apt32 += -Wno-unused-private-field
 apt32 += -Wno-unused-variable

-apt32 += -D'VERSION="0.7.25.3"'
+endif
+
+flag64 := 
+flag64 += -arch $(arch)
+flag64 += -Xarch_$(arch) -m$(kind)-version-min=7.0

 
 apt64 := $(cycc) $(flag64) $(flag)
 apt64 += -include apt.h
 
 apt64 := $(cycc) $(flag64) $(flag)
 apt64 += -include apt.h


@@ -143,7 +178,18 @@ apt64 += -Wno-deprecated-register
 apt64 += -Wno-unused-private-field
 apt64 += -Wno-unused-variable
 
 apt64 += -Wno-unused-private-field
 apt64 += -Wno-unused-variable
 

+eapt := -include apt.h
+apt64 += $(eapt)
+eapt += -D'VERSION="0.7.25.3"'
+apt32 += $(eapt)
+eapt += -Wno-format
+eapt += -Wno-logical-op-parentheses
+iapt += $(eapt)
+
+ifeq ($(do32),yes)

 cycc += $(flag32)
 cycc += $(flag32)

+endif
+

 cycc += $(flag64)
 
 plus += -std=c++11
 cycc += $(flag64)
 
 plus += -std=c++11


@@ -159,10 +205,10 @@ clean:
        rm -f MobileCydia postinst
        rm -rf Objects/ Images/
 
        rm -f MobileCydia postinst
        rm -rf Objects/ Images/
 

-Objects/apt64/apt-pkg/tagfile.o: apt64/apt-pkg/tagfile-keys.cc
-Objects/apt64/apt-pkg/deb/deblistparser.o: apt64/apt-pkg/tagfile-keys.cc
+Objects/apt64/apt-pkg/tagfile.o: Objects/apt64/apt-pkg/tagfile-keys.h
+Objects/apt64/apt-pkg/deb/deblistparser.o: Objects/apt64/apt-pkg/tagfile-keys.h

 
 

-apt64/apt-pkg/tagfile-keys.cc:
+Objects/apt64/apt-pkg/tagfile-keys%h apt64/apt-pkg/tagfile-keys%cc:

        mkdir -p apt64
        mkdir -p Objects/apt64/apt-pkg
        cd apt64 && ../apt64/triehash/triehash.pl \
        mkdir -p apt64
        mkdir -p Objects/apt64/apt-pkg
        cd apt64 && ../apt64/triehash/triehash.pl \


@@ -174,7 +220,12 @@ apt64/apt-pkg/tagfile-keys.cc:
             --function-name pkgTagHash \
             --include "<apt-pkg/tagfile.h>" \
             ../apt64/apt-pkg/tagfile-keys.list
             --function-name pkgTagHash \
             --include "<apt-pkg/tagfile.h>" \
             ../apt64/apt-pkg/tagfile-keys.list

-       sed -i -e 's@typedef char static_assert64@//\\0@' $@
+       sed -i -e 's@typedef char static_assert64@//\\0@' apt64/apt-pkg/tagfile-keys.cc
+
+Objects/%.o: %.cc $(header)
+       @mkdir -p $(dir $@)
+       @echo "[cycc] $<"
+       @$(cycc) $(plus) -c -o $@ $< $(flag) -Wno-format -include apt.h -Dmain=main_$(basename $(notdir $@))

 
 Objects/apt32/%.o: apt32/%.cc $(header) apt.h apt-extra/*.h
        @mkdir -p $(dir $@)
 
 Objects/apt32/%.o: apt32/%.cc $(header) apt.h apt-extra/*.h
        @mkdir -p $(dir $@)


@@ -212,6 +263,7 @@ Images/%.png: %.png
        @mkdir -p $(dir $@)
        @echo "[pngc] $<"
        @./pngcrush.sh $< $@
        @mkdir -p $(dir $@)
        @echo "[pngc] $<"
        @./pngcrush.sh $< $@

+       @touch $@

 
 sysroot: sysroot.sh
        @echo "Your ./sysroot/ is either missing or out of date. Please read compiling.txt for help." 1>&2
 
 sysroot: sysroot.sh
        @echo "Your ./sysroot/ is either missing or out of date. Please read compiling.txt for help." 1>&2


@@ -226,7 +278,7 @@ Objects/libapt64.a: $(libapt64)
        @echo "[arch] $@"
        @ar -rc $@ $^
 
        @echo "[arch] $@"
        @ar -rc $@ $^
 

-MobileCydia: $(object) entitlements.xml Objects/libapt32.a Objects/libapt64.a
+MobileCydia: $(object) entitlements.xml $(lapt)

        @echo "[link] $@"
        @$(cycc) -o $@ $(filter %.o,$^) $(link) $(libs) $(uikit) -Wl,-sdk_version,8.0
        @mkdir -p bins
        @echo "[link] $@"
        @$(cycc) -o $@ $(filter %.o,$^) $(link) $(libs) $(uikit) -Wl,-sdk_version,8.0
        @mkdir -p bins


@@ -250,7 +302,7 @@ cydo: cydo.cpp
        $(cycc) $(plus) -o $@ $(filter %.cpp,$^) $(flag) $(link) -Wno-deprecated-writable-strings
        @ldid -T0 -S $@
 
        $(cycc) $(plus) -o $@ $(filter %.cpp,$^) $(flag) $(link) -Wno-deprecated-writable-strings
        @ldid -T0 -S $@
 

-postinst: postinst.mm CyteKit/stringWithUTF8Bytes.mm CyteKit/stringWithUTF8Bytes.h CyteKit/UCPlatform.h
+postinst: postinst.mm CyteKit/stringWith.mm CyteKit/stringWith.h CyteKit/UCPlatform.h

        $(cycc) $(plus) -o $@ $(filter %.mm,$^) $(flag) $(link) -framework CoreFoundation -framework Foundation -framework UIKit
        @ldid -T0 -S $@
 
        $(cycc) $(plus) -o $@ $(filter %.mm,$^) $(flag) $(link) -framework CoreFoundation -framework Foundation -framework UIKit
        @ldid -T0 -S $@
 


@@ -259,6 +311,8 @@ debs/cydia_$(version)_iphoneos-arm.deb: MobileCydia preinst postinst cfversion s
        mkdir -p _/var/lib/cydia
        
        mkdir -p _/etc/apt
        mkdir -p _/var/lib/cydia
        
        mkdir -p _/etc/apt

+       mkdir _/etc/apt/apt.conf.d
+       mkdir _/etc/apt/preferences.d

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


@@ -277,7 +331,8 @@ debs/cydia_$(version)_iphoneos-arm.deb: MobileCydia preinst postinst cfversion s
        cp -a MobileCydia.app _/Applications/Cydia.app
        rm -rf _/Applications/Cydia.app/*.lproj
        cp -a MobileCydia _/Applications/Cydia.app/Cydia
        cp -a MobileCydia.app _/Applications/Cydia.app
        rm -rf _/Applications/Cydia.app/*.lproj
        cp -a MobileCydia _/Applications/Cydia.app/Cydia

-       ln -s Cydia _/Applications/Cydia.app/store
+       
+       for meth in bzip2 gzip lzma gpgv http https store $(methods); do ln -s Cydia _/Applications/Cydia.app/"$${meth}"; done

        
        cd MobileCydia.app && find . -name '*.png' -exec cp -af ../Images/MobileCydia.app/{} ../_/Applications/Cydia.app/{} ';'
        
        
        cd MobileCydia.app && find . -name '*.png' -exec cp -af ../Images/MobileCydia.app/{} ../_/Applications/Cydia.app/{} ';'