Skip to content

Commit

Permalink
Move scripts and bootstrap into fireplace. Necessary for scripts to b…
Browse files Browse the repository at this point in the history
…e callable from setup.py install (they must be part of package).

Part of jleclanche#318
  • Loading branch information
smallnamespace committed Feb 20, 2016
1 parent b892ca5 commit 6f84ab6
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 8 deletions.
7 changes: 3 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,10 @@ cache:
directories:
- $HOME/.pip-cache/
- $HOME/virtualenv/python3.5
script:
# Travis will automatically detect requirements.txt and run pip install
- ./bootstrap
install:
- ./setup.py install
- py.test
- fireplace/bootstrap
script: py.test
notifications:
email:
on_failure: always
Expand Down
4 changes: 2 additions & 2 deletions bootstrap → fireplace/bootstrap
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
:; ./scripts/bootstrap.sh; exit $?
:; $(dirname $0)/scripts/bootstrap.sh; exit $?
@echo off
@where Powershell.exe
if %ERRORLEVEL% neq 0 (
echo Please install Powershell from https://www.microsoft.com/en-us/download/details.aspx?id=40855
) ELSE (
Powershell.exe -executionpolicy remotesigned -File scripts/bootstrap.ps1
Powershell.exe -executionpolicy remotesigned -File %~dp0scripts\bootstrap.ps1
)
2 changes: 1 addition & 1 deletion scripts/bootstrap.ps1 → fireplace/scripts/bootstrap.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
$BASEDIR=Split-Path $script:MyInvocation.MyCommand.Path
$HSDATA_URL="https://github.com/HearthSim/hs-data.git"
$HSDATA_DIR="$BASEDIR/hs-data"
$CARDDEFS_OUT="$BASEDIR/../fireplace/CardDefs.xml"
$CARDDEFS_OUT="$BASEDIR/../CardDefs.xml"

# check python version
$PY_MAJOR=$(python -c 'import sys; print(sys.version_info[0])')
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion scripts/bootstrap.sh → fireplace/scripts/bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
BASEDIR="$(dirname $0)"
HSDATA_URL="https://github.com/HearthSim/hs-data.git"
HSDATA_DIR="$BASEDIR/hs-data"
CARDDEFS_OUT="$BASEDIR/../fireplace/CardDefs.xml"
CARDDEFS_OUT="$BASEDIR/../CardDefs.xml"

# check python version
PY_MAJOR=$(python -c 'import sys; print(sys.version_info[0])')
Expand Down

0 comments on commit 6f84ab6

Please sign in to comment.