- Removed Bin subdirectory and updates scripts.

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

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')

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)
 

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

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 "---------------------------------------------------------"

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