From 461895555b53352bf7a262f68e81be05665bdaee Mon Sep 17 00:00:00 2001
From: Cas Cremers <cas@scizor.(none)>
Date: Mon, 21 May 2007 13:24:19 +0200
Subject: [PATCH] - Removed Bin subdirectory and updates scripts.

---
 dist/gitdist.sh               | 3 +--
 gui/Scripts/scytherview.py    | 2 +-
 gui/Scyther/__init__.py       | 2 +-
 src/copy2gui.sh               | 6 +++---
 src/subbuild-mac-universal.sh | 2 +-
 src/subbuild-unix-both.sh     | 4 ++--
 6 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/dist/gitdist.sh b/dist/gitdist.sh
index 0ba1a48..627ef25 100755
--- a/dist/gitdist.sh
+++ b/dist/gitdist.sh
@@ -113,8 +113,7 @@ then
 fi
 
 # Copy the resulting binary to the correct location
-BINDIR=$BUILDDIR/Scyther/Bin
-mkdir $BINDIR
+BINDIR=$BUILDDIR/Scyther/
 cp $BIN $BINDIR
 
 # Prepare tag for gui version
diff --git a/gui/Scripts/scytherview.py b/gui/Scripts/scytherview.py
index 5315bd4..fe235ef 100755
--- a/gui/Scripts/scytherview.py
+++ b/gui/Scripts/scytherview.py
@@ -34,7 +34,7 @@ def scyther_to_dotfile():
     """ Run Scyther, return dotfile name """
 
     mydir = os.path.dirname(__file__)
-    scythername = os.path.join(mydir, "../Scyther/Bin/scyther-linux")
+    scythername = os.path.join(mydir, "../Scyther/scyther-linux")
 
     args = " ".join(sys.argv[1:])
     tmpdotfile = generateTemp('dot')
diff --git a/gui/Scyther/__init__.py b/gui/Scyther/__init__.py
index c2b35da..8b81dc6 100644
--- a/gui/Scyther/__init__.py
+++ b/gui/Scyther/__init__.py
@@ -7,6 +7,6 @@
 import Scyther
 import os.path
 
-bindir = os.path.join(__path__[0],"Bin")
+bindir = __path__[0]
 Scyther.setBinDir(bindir)
 
diff --git a/src/copy2gui.sh b/src/copy2gui.sh
index c4ffda6..bc07119 100755
--- a/src/copy2gui.sh
+++ b/src/copy2gui.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 
-cp scyther-linux ../gui/Scyther/Bin
-cp scyther-w32.exe ../gui/Scyther/Bin
-cp scyther-mac ../gui/Scyther/Bin
+cp scyther-linux ../gui/Scyther/
+cp scyther-w32.exe ../gui/Scyther/
+cp scyther-mac ../gui/Scyther/
 
 # bonus...
 cp scyther-linux ~/bin
diff --git a/src/subbuild-mac-universal.sh b/src/subbuild-mac-universal.sh
index 96f612f..bec0289 100755
--- a/src/subbuild-mac-universal.sh
+++ b/src/subbuild-mac-universal.sh
@@ -14,7 +14,7 @@ echo "---------------------------------------------------------"
 echo "Built the Mac universal binary"
 
 # Copy to the correct locations
-cp scyther-mac ../gui/Scyther/Bin
+cp scyther-mac ../gui/Scyther/
 
 echo Copied the files to their respective locations
 echo "---------------------------------------------------------"
diff --git a/src/subbuild-unix-both.sh b/src/subbuild-unix-both.sh
index 368b361..5fb0123 100755
--- a/src/subbuild-unix-both.sh
+++ b/src/subbuild-unix-both.sh
@@ -13,8 +13,8 @@ echo "---------------------------------------------------------"
 echo "Built the Linux and Windows binaries"
 
 # Copy to the correct locations
-cp scyther-linux ../gui/Scyther/Bin
-cp scyther-w32.exe ../gui/Scyther/Bin
+cp scyther-linux ../gui/Scyther/
+cp scyther-w32.exe ../gui/Scyther/
 
 # bonus...
 cp scyther-linux ~/bin