Date: Wed, 4 Jan 2012 12:42:37 -0800 (PST)
From: Jimmy Tang <jcft...@gmail.com>
Reply-To: sshuttle@googlegroups.com
To: sshuttle@googlegroups.com
Message-ID: <36525.111.1325709757189.JavaMail.geo-discussion-forums@vbbeg7>
In-Reply-To: <7380903.87.1325709277124.JavaMail.geo-discussion-forums@vbdz6>
References: <25672585.69.1324962673692.JavaMail.geo-discussion-forums@vbmi7>
 <CAPuLG2KOTu8UM=WQfzeZSH4dEui+2=13t_C0A548FEofWB3z0A@mail.gmail.com> <17688361.940.1325042846661.JavaMail.geo-discussion-forums@vbak19>
 <CAHqTa-1VU4zMXtVMzwat8N9bgF5SELSPDim9-pQZy_nUhxXY_Q@mail.gmail.com>
 <7380903.87.1325709277124.JavaMail.geo-discussion-forums@vbdz6>
Subject: Re: Still seeing a dead network issue on 10.7
MIME-Version: 1.0
Content-Type: multipart/mixed; 
	boundary="----=_Part_109_6550519.1325709757188"

------=_Part_109_6550519.1325709757188
Content-Type: multipart/alternative; 
	boundary="----=_Part_110_2483593.1325709757188"

------=_Part_110_2483593.1325709757188
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit

attached is an aggregated set of changes for the newer version of redo and 
the check for building on lion. I was just thinking maybe its worth just 
dropping the ppc support and just default to building i686 and x86_64 
for ui-macos/bits/runpython.c wrapper program.
------=_Part_110_2483593.1325709757188
Content-Type: text/html; charset=UTF-8
Content-Transfer-Encoding: 7bit

attached is an aggregated set of changes for the newer version of redo and the check for building on lion. I was just thinking maybe its worth just dropping the ppc support and just default to building i686 and x86_64 for&nbsp;ui-macos/bits/runpython.c wrapper program.
------=_Part_110_2483593.1325709757188--

------=_Part_109_6550519.1325709757188
Content-Type: text/x-diff; charset=us-ascii; 
	name=0001-Use-the-new-arguments-from-redo-v0.10-added-quick-ch.patch
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="0001-Use-the-new-arguments-from-redo-v0.10-added-quick-ch.patch"
X-Attachment-Id: e02608a6-b743-4048-8b98-079231bd2527

From c575bccbb4a495c6b952ba7b93d4afbbc8fcd1d4 Mon Sep 17 00:00:00 2001
From: Jimmy Tang <jt...@tchpc.tcd.ie>
Date: Wed, 4 Jan 2012 20:37:50 +0000
Subject: [PATCH] Use the new arguments from redo v0.10, added quick check for
 lion.

---
 default.8.do                   |    2 +-
 ui-macos/bits/runpython.do     |   17 +++++++++++------
 ui-macos/default.app.do        |   10 +++++-----
 ui-macos/default.app.tar.gz.do |    4 ++--
 ui-macos/default.app.zip.do    |    4 ++--
 ui-macos/default.nib.do        |    4 ++--
 6 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/default.8.do b/default.8.do
index 6d8dc8c..467bfbe 100644
--- a/default.8.do
+++ b/default.8.do
@@ -1,6 +1,6 @@
 exec >&2
 if pandoc </dev/null 2>/dev/null; then
-	pandoc -s -r markdown -w man -o $3 $1.md
+	pandoc -s -r markdown -w man -o $3 $2.md
 else
 	echo "Warning: pandoc not installed; can't generate manpages."
 	redo-always
diff --git a/ui-macos/bits/runpython.do b/ui-macos/bits/runpython.do
index a53247f..50782d1 100644
--- a/ui-macos/bits/runpython.do
+++ b/ui-macos/bits/runpython.do
@@ -1,13 +1,18 @@
 exec >&2
 redo-ifchange runpython.c
 ARCHES=""
+BUILDPLATFORM=$(uname -r)
 printf "Platforms: "
-for d in /usr/libexec/gcc/darwin/*; do
-    PLAT=$(basename "$d")
-    [ "$PLAT" != "ppc64" ] || continue  # fails for some reason on my Mac
-    ARCHES="$ARCHES -arch $PLAT"
-    printf "$PLAT "
-done
+if [ "$BUILDPLATFORM" = "11.2.0" ]; then
+	ARCHES="-arch i686"
+else
+	for d in /usr/libexec/gcc/darwin/*; do
+	    PLAT=$(basename "$d")
+	    [ "$PLAT" != "ppc64" ] || continue  # fails for some reason on my Mac
+	    ARCHES="$ARCHES -arch $PLAT"
+	    printf "$PLAT "
+	done
+fi
 printf "\n"
 gcc $ARCHES \
 	-Wall -o $3 runpython.c \
diff --git a/ui-macos/default.app.do b/ui-macos/default.app.do
index 64e3a52..5c88273 100644
--- a/ui-macos/default.app.do
+++ b/ui-macos/default.app.do
@@ -3,9 +3,9 @@ redo-ifchange sources.list
 redo-ifchange Info.plist bits/runpython \
 	$(while read name newname; do echo "$name"; done <sources.list)
 
-rm -rf "$1.app"
-mkdir "$1.app" "$1.app/Contents"
-cd "$1.app/Contents"
+rm -rf "$2.app"
+mkdir "$2.app" "$2.app/Contents"
+cd "$2.app/Contents"
 
 cp "$TOP/Info.plist" .
 
@@ -18,11 +18,11 @@ cd "$TOP"
 while read name newname; do
 	[ -z "$name" ] && continue
 	: "${newname:=$name}"
-	outname=$1.app/Contents/Resources/$newname
+	outname=$2.app/Contents/Resources/$newname
 	outdir=$(dirname "$outname")
 	[ -d "$outdir" ] || mkdir "$outdir"
 	cp "${name-$newname}" "$outname"
 done <sources.list
 
-cd "$1.app"
+cd "$2.app"
 redo-ifchange $(find . -type f)
diff --git a/ui-macos/default.app.tar.gz.do b/ui-macos/default.app.tar.gz.do
index 3311d31..5d9336e 100644
--- a/ui-macos/default.app.tar.gz.do
+++ b/ui-macos/default.app.tar.gz.do
@@ -1,5 +1,5 @@
 exec >&2
 IFS="
 "
-redo-ifchange $1.app
-tar -czf $3 $1.app/
+redo-ifchange $2.app
+tar -czf $3 $2.app/
diff --git a/ui-macos/default.app.zip.do b/ui-macos/default.app.zip.do
index c12e2d2..64f3a10 100644
--- a/ui-macos/default.app.zip.do
+++ b/ui-macos/default.app.zip.do
@@ -1,5 +1,5 @@
 exec >&2
 IFS="
 "
-redo-ifchange $1.app
-zip -q -r $3 $1.app/
+redo-ifchange $2.app
+zip -q -r $3 $2.app/
diff --git a/ui-macos/default.nib.do b/ui-macos/default.nib.do
index afa91f4..02ddec6 100644
--- a/ui-macos/default.nib.do
+++ b/ui-macos/default.nib.do
@@ -1,2 +1,2 @@
-redo-ifchange $1.xib
-ibtool --compile $3 $1.xib
+redo-ifchange $2.xib
+ibtool --compile $3 $2.xib
-- 
1.7.7.4


------=_Part_109_6550519.1325709757188--