diff --git a/.gitignore b/.gitignore index b33ca98f..aff54188 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,7 @@ data/levels.xml tuo tuodebug test/** +data/customdecks.txt +data/ownedcards.txt +out.txt + diff --git a/.travis.yml b/.travis.yml index 56137b9e..0984b590 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,64 +1,31 @@ language: cpp - matrix: - include: - - #- env: - # - TUO_PLATFORM='linux64' - # - TUO_FILE='tuo' - # os: linux - # dist: trusty - # sudo: required - # compiler: gcc - - - env: - - TUO_PLATFORM='windowsXX' - - TUO_FILE_32='tuo_x86.exe' - - TUO_FILE_64='tuo.exe' - os: linux - dist: trusty - sudo: required - compiler: gcc - - #- env: - # - TUO_PLATFORM='windows64' - # - TUO_FILE='tuo.exe' - # os: linux - # dist: trusty - # sudo: required - # compiler: gcc - - #- env: - # - TUO_PLATFORM='macXX' - # - TUO_FILE='tuo_osx' - # os: osx - # osx_image: xcode7.2 - # compiler: clang - + - env: + - TUO_PLATFORM='windowsXX' + - TUO_FILE_32='tuo_x86.exe' + - TUO_FILE_64='tuo.exe' + os: linux + dist: trusty + sudo: required + compiler: gcc before_install: - - TUO_TARGET="${TUO_PLATFORM::${#TUO_PLATFORM}-2}" - - ./build/${TUO_TARGET}/requirements.sh - +- TUO_TARGET="${TUO_PLATFORM::${#TUO_PLATFORM}-2}" +- "./build/${TUO_TARGET}/requirements.sh" install: - - source ./build/${TUO_TARGET}/build.sh - +- source ./build/${TUO_TARGET}/build.sh script: - - echo "NOP" - +- echo "NOP" before_deploy: - - source build/${TUO_TARGET}/package.sh - +- source build/${TUO_TARGET}/package.sh deploy: provider: releases api_key: - secure: AW+LUt5C16DYzqJ2Yx57iUrLJJEln7sAdyokGzEB45p/KXzGVQ9GjtGOtaUqupmBMa5j0aKJcA4lvLGsX6/NMus+jORuGbLKtc3STQsMpJah35ZPWYgg4BZaNTtuL1XZEyLZZrjVw5SssUDLhTXl+l/d01fl04QOiQUPcMGCcwxs76B5gPfJRtJy8bP4HDseHc62oiPQFMLUZ/dZ2xYWttXxmacX0pC+IZqTNIWBgYuhAtuJE63VXTi6p6tOwpAXQ1eTpUUFnVRJ18drRZNCu/4s/dtg/w7XXG12IlGYpCRnT2DknBI5ULG2yW0lhSS2MYfR9EhKQkwAsXD0Cm7sXA1h6aOrNu+oW/t+nDiNj5qbGg64e5meP58aozhsZcoqt3yPky58wcibQ9vdMHvV94hRHZkVQB9VDg5wfAn+xGlAcsNdqlbBoCAJEUQC1IEfGWXWJMbjMcpnI3vhvFDdhATVx3vMORdq+0Fhqz6YLGMk6d14x6xw0xf/YDP1JYrthP5iSl5bzNJmCjtZWJdRs2p8eqqpTVBPC3oX2YzbC2Ozm0Du3AjcfRZLCh2z3y3Bv03amAW0XpabXb7kN2/+exeOgo85uuZOTa1Ug7ZfnJ+poC0pREokegSNoOtp7U92DysUlkeTLqNIaLGkULO+Um1wNBYMuvFk400B6x8pHTg= - file: - - "${TUO_FILE_32}" - - "${TUO_FILE_64}" - - "${TUO_FILE_ZIP}" + secure: vKTCOsNwCpSzB2buiNSroCvhAR5xHv86L7YDa09A3Y4oZ/grFmcARQKFkjG/zJif+4gpHmrscUJIC4Ru9900QQSVP/mUh5NizPFpoQHHQBbRPOFoor0W0lSXhsFMA154sHICDQ7ZZhZbF8s804VL+JsmAblFqJ0XWNtLD9f0ElklEIELYdhVGDipXhWnIqA3TfG6ztm9KjMXZ3pfPRMf/l4D0t7ISHfzfX07O257ppH83DAEs1aJElG3kxDJiEWoi6k9fq7SIYXbFhmwj6aM3K//qj9ZxIhFwRLaEb8l2zOXj3hNtDGGg99P5Dz7UeDy7l/+eWOgIMBJLe1Ck9AbIYivnOychYxVn/wp56SbbaT1ZsNbgLQxygqc0/btfi2lrT9c0T6db+A9LSGOWvGk3n1pOPOMNE3wvOk7dhLfbA2azFDMoPswW7Hvad0ZQYkBg1TJK7gmChb5FYQtypZzA0CzJaw+r1z7d4a7mF7cAkZmGuM+/BbdmsX9AxYcazJAvsxgHmLnFSunKsw0B3kQ6l9DJmli7w4qi4kdjHGpxQCQ6ocqHmDMvFa85ejhvPjJDvYdyxltC1d5Jq+jxFL91d+2ZMGYdgptR05I0Dc9ApUcItv7NNbY8fNPWJT7AXAlY999bRt9Rz//JvSHUHstn5cc1s0ee6NGRTmiD5oAkuc= + file: + - "${TUO_FILE_32}" + - "${TUO_FILE_64}" + - "${TUO_FILE_ZIP}" skip_cleanup: true on: tags: true - - diff --git a/build/windows/package.sh b/build/windows/package.sh index 2b8c4de3..16634683 100755 --- a/build/windows/package.sh +++ b/build/windows/package.sh @@ -9,7 +9,7 @@ set -xue export TUO_FILE_ZIP="tuo.${TRAVIS_TAG}_32+64_bit.zip" -ls -la +#ls -la zip -r "$TUO_FILE_ZIP" data/ SimpleTUOptimizeStarter.ahk SimpleTUOptimizeStarter.exe "$TUO_FILE_32" "$TUO_FILE_64"