comparison deploy/osx/combine.sh @ 335:aa852b477e4d

More OS/X deployment: Try to set shared library dependencies separately for each source arch

 #!/bin/bash
-app=EasyMercurial.app
-if [ ! -d "$app.carbon" ] || [ ! -d "$app.cocoa" ]; then
+app=EasyMercurial
+if [ ! -d "$app.carbon.app" ] || [ ! -d "$app.cocoa.app" ]; then
 	echo Carbon or Cocoa bundle not found
 	exit 1
 fi
-(cd "$app.cocoa" ; find . -type f -print) | while read f; do
+(cd "$app.cocoa.app" ; find . -type f -print) | while read f; do
         d=$(dirname "$f")
-        mkdir -p "$app.output/$d"
-	case $(file "$app.cocoa/$f") in
+        mkdir -p "$app.app/$d"
+	case $(file "$app.cocoa.app/$f") in
+	*universal*x86_64*)
+		lipo "$app.cocoa.app/$f" -extract x86_64 -output "/tmp/$$.x86_64";;
 	*x86_64*)
-		lipo "$app.cocoa/$f" -extract x86_64 -output "/tmp/$$.x86_64"
-		case $(file "$app.carbon/$f") in
-		*x86_64*)
-			lipo "$app.carbon/$f" -remove x86_64 -output "/tmp/$$.rest"
-			;;
-		*)
-			cp "$app.carbon/$f" "/tmp/$$.rest"
-			;;
-		esac
-		lipo "/tmp/$$.x86_64" "/tmp/$$.rest" -create -output "$app.output/$f"
-		rm "/tmp/$$".*
+		lipo "$app.cocoa.app/$f" -create -output "/tmp/$$.x86_64";;
+	*)
+		cp "$app.cocoa.app/$f" "$app.app/$f"
+		continue;;
+	esac
+	case $(file "$app.carbon.app/$f") in
+	*x86_64*)
+		lipo "$app.carbon.app/$f" -remove x86_64 -output "/tmp/$$.rest"
+		;;
+	*universal*)
+		cp "$app.carbon.app/$f" "/tmp/$$.rest"
 		;;
 	*)
-		cp "$app.cocoa/$f" "$app.output/$f"
+		lipo "$app.carbon.app/$f" -create -output "/tmp/$$.rest"
 		;;
 	esac
+	lipo "/tmp/$$.x86_64" "/tmp/$$.rest" -create -output "$app.app/$f"
+	rm "/tmp/$$".*
 done