ObjFW  Diff

Differences From Artifact [65fb800552]:

To Artifact [edcee238b4]:


45
46
47
48
49
50
51

52
53
54
55
56
57
58
59





60
61
62
63
64
65
66
67
68
69
70
71

72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
	cp -R src/ObjFW.framework src/bridge/ObjFW_Bridge.framework \
		$prefix/$1/Frameworks
	make distclean
}

build armv7 arm-apple-darwin iPhoneOS
build arm64 arm64-apple-darwin iPhoneOS

build x86_64 x86_64-apple-darwin iPhoneSimulator

msg "Sanity checking"
diff -Nru $prefix/armv7/include $prefix/arm64/include
diff -Nru $prefix/armv7/Frameworks/ObjFW.framework/Headers \
	$prefix/arm64/Frameworks/ObjFW.framework/Headers
diff -Nru $prefix/armv7/Frameworks/ObjFW_Bridge.framework/Headers \
	$prefix/arm64/Frameworks/ObjFW_Bridge.framework/Headers






mv $prefix/armv7/include $prefix/
mkdir -p						\
	$prefix/lib					\
	$prefix/Frameworks/ObjFW.framework		\
	$prefix/Frameworks/ObjFW_Bridge.framework

combine() {
	msg "Combining $1"
	lipo \
		$prefix/armv7/$1 \
		$prefix/arm64/$1 \

		$prefix/x86_64/$1 \
		-create -output $prefix/$1
}

combine lib/libobjfw.a
combine lib/libobjfw_bridge.a
combine Frameworks/ObjFW.framework/ObjFW
combine Frameworks/ObjFW_Bridge.framework/ObjFW_Bridge
rm $prefix/armv7/Frameworks/ObjFW.framework/ObjFW
mv $prefix/armv7/Frameworks/ObjFW.framework/* \
	$prefix/Frameworks/ObjFW.framework/
rm $prefix/armv7/Frameworks/ObjFW_Bridge.framework/ObjFW_Bridge
mv $prefix/armv7/Frameworks/ObjFW_Bridge.framework/* \
	$prefix/Frameworks/ObjFW_Bridge.framework/

msg "Cleaning up"
rm -fr $prefix/armv7 $prefix/arm64 $prefix/x86_64







>








>
>
>
>
>












>
















|
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
	cp -R src/ObjFW.framework src/bridge/ObjFW_Bridge.framework \
		$prefix/$1/Frameworks
	make distclean
}

build armv7 arm-apple-darwin iPhoneOS
build arm64 arm64-apple-darwin iPhoneOS
build i386 i386-apple-darwin iPhoneSimulator
build x86_64 x86_64-apple-darwin iPhoneSimulator

msg "Sanity checking"
diff -Nru $prefix/armv7/include $prefix/arm64/include
diff -Nru $prefix/armv7/Frameworks/ObjFW.framework/Headers \
	$prefix/arm64/Frameworks/ObjFW.framework/Headers
diff -Nru $prefix/armv7/Frameworks/ObjFW_Bridge.framework/Headers \
	$prefix/arm64/Frameworks/ObjFW_Bridge.framework/Headers
diff -Nru $prefix/i386/include $prefix/x86_64/include
diff -Nru $prefix/i386/Frameworks/ObjFW.framework/Headers \
	$prefix/x86_64/Frameworks/ObjFW.framework/Headers
diff -Nru $prefix/i386/Frameworks/ObjFW_Bridge.framework/Headers \
	$prefix/x86_64/Frameworks/ObjFW_Bridge.framework/Headers

mv $prefix/armv7/include $prefix/
mkdir -p						\
	$prefix/lib					\
	$prefix/Frameworks/ObjFW.framework		\
	$prefix/Frameworks/ObjFW_Bridge.framework

combine() {
	msg "Combining $1"
	lipo \
		$prefix/armv7/$1 \
		$prefix/arm64/$1 \
		$prefix/i386/$1 \
		$prefix/x86_64/$1 \
		-create -output $prefix/$1
}

combine lib/libobjfw.a
combine lib/libobjfw_bridge.a
combine Frameworks/ObjFW.framework/ObjFW
combine Frameworks/ObjFW_Bridge.framework/ObjFW_Bridge
rm $prefix/armv7/Frameworks/ObjFW.framework/ObjFW
mv $prefix/armv7/Frameworks/ObjFW.framework/* \
	$prefix/Frameworks/ObjFW.framework/
rm $prefix/armv7/Frameworks/ObjFW_Bridge.framework/ObjFW_Bridge
mv $prefix/armv7/Frameworks/ObjFW_Bridge.framework/* \
	$prefix/Frameworks/ObjFW_Bridge.framework/

msg "Cleaning up"
rm -fr $prefix/armv7 $prefix/arm64 $prefix/i386 $prefix/x86_64