From 61828765b9d1b2baf74bdf664f93d7a0b21dfbec Mon Sep 17 00:00:00 2001
From: ccremers <ccremers@4f7d145f-a0d4-0310-ae10-d96cc04433c1>
Date: Tue, 14 Nov 2006 11:03:19 +0000
Subject: [PATCH] - Improved error reporting for missing libs. - Moved all
 binaries to Bin/ (untested here as stupid thing does not work.)

---
 gui/{Scyther => Bin}/Scyther.exe | Bin
 gui/{Scyther => Bin}/scyther     | Bin
 gui/Scyther/Scyther.py           |   2 +-
 gui/Scyther/XMLReader.py         |   7 ++++++-
 gui/scyther-gui.py               |   7 ++++++-
 5 files changed, 13 insertions(+), 3 deletions(-)
 rename gui/{Scyther => Bin}/Scyther.exe (100%)
 rename gui/{Scyther => Bin}/scyther (100%)

diff --git a/gui/Scyther/Scyther.exe b/gui/Bin/Scyther.exe
similarity index 100%
rename from gui/Scyther/Scyther.exe
rename to gui/Bin/Scyther.exe
diff --git a/gui/Scyther/scyther b/gui/Bin/scyther
similarity index 100%
rename from gui/Scyther/scyther
rename to gui/Bin/scyther
diff --git a/gui/Scyther/Scyther.py b/gui/Scyther/Scyther.py
index f49c35c..e843c5c 100755
--- a/gui/Scyther/Scyther.py
+++ b/gui/Scyther/Scyther.py
@@ -20,7 +20,7 @@ from Misc import *
 #---------------------------------------------------------------------------
 
 """ Globals """
-bindir="."
+bindir="../Bin"
 
 #---------------------------------------------------------------------------
 
diff --git a/gui/Scyther/XMLReader.py b/gui/Scyther/XMLReader.py
index 5292d87..e8bf410 100644
--- a/gui/Scyther/XMLReader.py
+++ b/gui/Scyther/XMLReader.py
@@ -22,8 +22,13 @@ except ImportError:
         from elementtree import ElementTree
     except ImportError:
         print """
-ERROR: Could not locate elementtree or cElementTree package.
+ERROR:
+
+Could not locate either the [elementtree] or the [cElementTree] package.
 Please install one of them in order to work with the Scyther python interface.
+The [cElementTree] packages can be found at http://effbot.org/zone/celementtree.htm
+
+Note that you can still use the Scyther binaries in the 'Bin' directory.
         """
         sys.exit(1)
 
diff --git a/gui/scyther-gui.py b/gui/scyther-gui.py
index 74ef965..66d30c3 100755
--- a/gui/scyther-gui.py
+++ b/gui/scyther-gui.py
@@ -8,9 +8,14 @@ try:
     import wx
 except ImportError:
     print """
-ERROR: Could not find the required wxPython package.
+ERROR:
+
+Could not find the required [wxPython] package.
 Please install this package in order to use the graphical user
 interface of Scyther.
+The [wxPython] packages can be found at http://www.wxpython.org/
+
+Note that you can still use the Scyther binaries in the 'Bin' directory.
     """
     sys.exit(1)
 import os