From 4408e0ae775a4875ebde699135fad677bfddf9a4 Mon Sep 17 00:00:00 2001
From: David Aguilar <davvid@gmail.com>
Date: Tue, 25 Dec 2007 04:31:41 -0800
Subject: [PATCH] Don't include .pyc/.pyo files in released tarballs

Signed-off by: David Aguilar <davvid@gmail.com>
---
 README           | 40 +++++++++++++---------------------------
 scripts/mktar.sh | 22 ++++++++++++++++++++--
 2 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/README b/README
index f65babb..618e35a 100644
--- a/README
+++ b/README
@@ -21,31 +21,15 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-REQUIREMENTS:
+Requirements:
+Python 2.4 or newer
+PyQt 4.3 or newer
 
-python >= 2.4
-pyqt   >= 4.3
 
+INSTALLATION
 
-INSTALLING UGIT:
-
-	./configure --prefix=/usr
-	make && sudo make install
-
-
-Assuming python is version 2.4, "make install" installs ugit here:
-
-	/usr/local/bin/ugit linked to ugit.py
-	/usr/local/lib/python2.4/site-packages/ugitlibs/
-
-
-For example:
-
-If for some reason ugit.py is unable to locate its
-libraries, add the site-packages directory to your $PYTHONPATH.
-
-PYTHONPATH=/usr/local/lib/python2.4/site-packages
-export PYTHON
+./configure --prefix=/usr
+make && sudo make install
 
 
 WINDOWS SUPPORT
@@ -61,16 +45,18 @@ The ugit gui itself has run successfully on win32.
 2) Get the PyQt4 installer:
 	http://www.riverbankcomputing.co.uk/pyqt/download.php
 
-3) Get git:
-	I've only tested cygwin.
+3) Get git/msysgit:
 	http://git.or.cz/
 	http://git.or.cz/gitwiki/WindowsInstall
 	http://en.wikipedia.org/wiki/Git_(software)#Portability
 
+	NOTE: I've had better results with msysgit than with cygwin+git.  YMMV.
+
 4) Get ugit:
-	Download any of the win32 tarballs here:
-		http://ugit.justroots.com/
-	..and run the ugit-cygwin.sh script.
+	Download the most recent -win32 build:
+	http://ugit.justroots.com/
+
+5) Run the ugit-cygwin.sh or ugit-msysgit.sh scripts
 	The script assumes the you have Python/PyQt4 installed in
 	C:\Python25.  If that is not the case, edit the script accordingly.
 
diff --git a/scripts/mktar.sh b/scripts/mktar.sh
index bcaf6a6..13c584c 100755
--- a/scripts/mktar.sh
+++ b/scripts/mktar.sh
@@ -12,8 +12,26 @@ if [ -e .lock-wscript ]; then
 	mv .lock-wscript .lock-wscript.old
 fi
 ./configure --prefix=$DIR --blddir="$BLD" \
-&& make && make install \
-&& rsync -avr $DIR/ "$1/" \
+&& make && make install
+
+if [ $? != 0 ]; then
+	echo "error: $?"
+	exit
+fi
+
+find $DIR -name '*.py[co]' | xargs rm
+PYTHONVER=`python -c 'import sys; sys.stdout.write(sys.version[:3])'`
+
+(
+	cd $DIR/lib;
+	for i in 2.4 2.5; do
+		if [ ! -e python$i ]; then
+			ln -s python$PYTHONVER python$i
+		fi
+	done
+)
+
+rsync -avr $DIR/ "$1/" \
 && tar czf "$FILE" "$1/" \
 && rm -rf $DIR "$1" "$BLD"
 
-- 
2.11.4.GIT