From 9a182784a3458e23f3ec6067c4ea9f65d96f02f1 Mon Sep 17 00:00:00 2001
From: ccremers <ccremers@4f7d145f-a0d4-0310-ae10-d96cc04433c1>
Date: Mon, 7 Aug 2006 10:42:34 +0000
Subject: [PATCH] - Moved binaries and images to correct subdirectories

---
 gui/Icon.py                         |   2 +-
 gui/Scyther.py                      |   8 +++++---
 gui/{ => bin}/Scyther.exe           | Bin
 gui/{ => bin}/scyther               | Bin
 gui/{ => images}/scyther-gui-16.ico | Bin
 gui/{ => images}/scyther-gui-32.ico | Bin
 gui/{ => images}/scyther-gui-64.ico | Bin
 7 files changed, 6 insertions(+), 4 deletions(-)
 rename gui/{ => bin}/Scyther.exe (100%)
 rename gui/{ => bin}/scyther (100%)
 rename gui/{ => images}/scyther-gui-16.ico (100%)
 rename gui/{ => images}/scyther-gui-32.ico (100%)
 rename gui/{ => images}/scyther-gui-64.ico (100%)

diff --git a/gui/Icon.py b/gui/Icon.py
index 10abb78..bcefe9d 100644
--- a/gui/Icon.py
+++ b/gui/Icon.py
@@ -15,7 +15,7 @@ import Misc
 
 def ScytherIcon(window):
         """ Set a nice Scyther icon """
-        iconfile = Misc.mypath("scyther-gui-32.ico")
+        iconfile = Misc.mypath(os.path.join("images","scyther-gui-32.ico"))
         if os.path.isfile(iconfile):
             icon = wx.Icon(iconfile,wx.BITMAP_TYPE_ICO)
             window.SetIcon(icon)
diff --git a/gui/Scyther.py b/gui/Scyther.py
index 0b65167..85cea94 100755
--- a/gui/Scyther.py
+++ b/gui/Scyther.py
@@ -7,6 +7,7 @@
 
 """ Import externals """
 import os
+import os.path
 import sys
 import StringIO
 import tempfile
@@ -26,13 +27,14 @@ class Scyther(object):
         if sys.platform.startswith('win'):
             """ Windows """
             # TODO hardcoded for now, bad
-            self.program = "c:\\Scyther.exe"
+            self.program = os.path.join("bin","Scyther.exe")
             if not os.path.isfile(self.program):
                 print "I can't find the Scyther executable at %s" % (self.program)
         else:
             """ Non-windows """
-            self.program = "scyther"
+            self.program = os.path.join("bin","scyther")
 
+        # defaults
         self.options = ""
         self.spdl = None
         self.inputfile = None
@@ -113,7 +115,7 @@ def basicTest():
     x = Scyther()
 
     if sys.platform.startswith('win'):
-        x.program = "Scyther.exe"
+        x.program = os.path.join("bin","Scyther.exe")
         if not os.path.isfile(x.program):
             print "I can't find the Scyther executable %s" % (x.program)
     pw,pr = os.popen2("%s --help" % x.program)
diff --git a/gui/Scyther.exe b/gui/bin/Scyther.exe
similarity index 100%
rename from gui/Scyther.exe
rename to gui/bin/Scyther.exe
diff --git a/gui/scyther b/gui/bin/scyther
similarity index 100%
rename from gui/scyther
rename to gui/bin/scyther
diff --git a/gui/scyther-gui-16.ico b/gui/images/scyther-gui-16.ico
similarity index 100%
rename from gui/scyther-gui-16.ico
rename to gui/images/scyther-gui-16.ico
diff --git a/gui/scyther-gui-32.ico b/gui/images/scyther-gui-32.ico
similarity index 100%
rename from gui/scyther-gui-32.ico
rename to gui/images/scyther-gui-32.ico
diff --git a/gui/scyther-gui-64.ico b/gui/images/scyther-gui-64.ico
similarity index 100%
rename from gui/scyther-gui-64.ico
rename to gui/images/scyther-gui-64.ico