- Removed Bin subdirectory and updates scripts.
This commit is contained in:
		
							parent
							
								
									38a5d04c8c
								
							
						
					
					
						commit
						461895555b
					
				
							
								
								
									
										3
									
								
								dist/gitdist.sh
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										3
									
								
								dist/gitdist.sh
									
									
									
									
										vendored
									
									
								
							| @ -113,8 +113,7 @@ then | |||||||
| fi | fi | ||||||
| 
 | 
 | ||||||
| # Copy the resulting binary to the correct location | # Copy the resulting binary to the correct location | ||||||
| BINDIR=$BUILDDIR/Scyther/Bin | BINDIR=$BUILDDIR/Scyther/ | ||||||
| mkdir $BINDIR |  | ||||||
| cp $BIN $BINDIR | cp $BIN $BINDIR | ||||||
| 
 | 
 | ||||||
| # Prepare tag for gui version | # Prepare tag for gui version | ||||||
|  | |||||||
| @ -34,7 +34,7 @@ def scyther_to_dotfile(): | |||||||
|     """ Run Scyther, return dotfile name """ |     """ Run Scyther, return dotfile name """ | ||||||
| 
 | 
 | ||||||
|     mydir = os.path.dirname(__file__) |     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:]) |     args = " ".join(sys.argv[1:]) | ||||||
|     tmpdotfile = generateTemp('dot') |     tmpdotfile = generateTemp('dot') | ||||||
|  | |||||||
| @ -7,6 +7,6 @@ | |||||||
| import Scyther | import Scyther | ||||||
| import os.path | import os.path | ||||||
| 
 | 
 | ||||||
| bindir = os.path.join(__path__[0],"Bin") | bindir = __path__[0] | ||||||
| Scyther.setBinDir(bindir) | Scyther.setBinDir(bindir) | ||||||
| 
 | 
 | ||||||
|  | |||||||
| @ -1,8 +1,8 @@ | |||||||
| #!/bin/sh | #!/bin/sh | ||||||
| 
 | 
 | ||||||
| cp scyther-linux ../gui/Scyther/Bin | cp scyther-linux ../gui/Scyther/ | ||||||
| cp scyther-w32.exe ../gui/Scyther/Bin | cp scyther-w32.exe ../gui/Scyther/ | ||||||
| cp scyther-mac ../gui/Scyther/Bin | cp scyther-mac ../gui/Scyther/ | ||||||
| 
 | 
 | ||||||
| # bonus... | # bonus... | ||||||
| cp scyther-linux ~/bin | cp scyther-linux ~/bin | ||||||
|  | |||||||
| @ -14,7 +14,7 @@ echo "---------------------------------------------------------" | |||||||
| echo "Built the Mac universal binary" | echo "Built the Mac universal binary" | ||||||
| 
 | 
 | ||||||
| # Copy to the correct locations | # 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 Copied the files to their respective locations | ||||||
| echo "---------------------------------------------------------" | echo "---------------------------------------------------------" | ||||||
|  | |||||||
| @ -13,8 +13,8 @@ echo "---------------------------------------------------------" | |||||||
| echo "Built the Linux and Windows binaries" | echo "Built the Linux and Windows binaries" | ||||||
| 
 | 
 | ||||||
| # Copy to the correct locations | # Copy to the correct locations | ||||||
| cp scyther-linux ../gui/Scyther/Bin | cp scyther-linux ../gui/Scyther/ | ||||||
| cp scyther-w32.exe ../gui/Scyther/Bin | cp scyther-w32.exe ../gui/Scyther/ | ||||||
| 
 | 
 | ||||||
| # bonus... | # bonus... | ||||||
| cp scyther-linux ~/bin | cp scyther-linux ~/bin | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user