- Moved binaries and images to correct subdirectories

This commit is contained in:
ccremers 2006-08-07 10:42:34 +00:00
parent f8480f0815
commit 9a182784a3
7 changed files with 6 additions and 4 deletions

View File

@ -15,7 +15,7 @@ import Misc
def ScytherIcon(window): def ScytherIcon(window):
""" Set a nice Scyther icon """ """ 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): if os.path.isfile(iconfile):
icon = wx.Icon(iconfile,wx.BITMAP_TYPE_ICO) icon = wx.Icon(iconfile,wx.BITMAP_TYPE_ICO)
window.SetIcon(icon) window.SetIcon(icon)

View File

@ -7,6 +7,7 @@
""" Import externals """ """ Import externals """
import os import os
import os.path
import sys import sys
import StringIO import StringIO
import tempfile import tempfile
@ -26,13 +27,14 @@ class Scyther(object):
if sys.platform.startswith('win'): if sys.platform.startswith('win'):
""" Windows """ """ Windows """
# TODO hardcoded for now, bad # 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): if not os.path.isfile(self.program):
print "I can't find the Scyther executable at %s" % (self.program) print "I can't find the Scyther executable at %s" % (self.program)
else: else:
""" Non-windows """ """ Non-windows """
self.program = "scyther" self.program = os.path.join("bin","scyther")
# defaults
self.options = "" self.options = ""
self.spdl = None self.spdl = None
self.inputfile = None self.inputfile = None
@ -113,7 +115,7 @@ def basicTest():
x = Scyther() x = Scyther()
if sys.platform.startswith('win'): if sys.platform.startswith('win'):
x.program = "Scyther.exe" x.program = os.path.join("bin","Scyther.exe")
if not os.path.isfile(x.program): if not os.path.isfile(x.program):
print "I can't find the Scyther executable %s" % (x.program) print "I can't find the Scyther executable %s" % (x.program)
pw,pr = os.popen2("%s --help" % x.program) pw,pr = os.popen2("%s --help" % x.program)

View File

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

View File

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 17 KiB