1
0
Fork 0
mirror of https://github.com/shlomif/PySolFC.git synced 2025-04-05 00:02:29 -04:00

travis osx pkg fix - tile is part of tk.

See https://wiki.tcl-lang.org/page/Ttk .
This commit is contained in:
Shlomi Fish 2018-11-12 17:33:01 +02:00
parent 38f645964a
commit 745b31ae73
2 changed files with 1 additions and 27 deletions

View file

@ -10,7 +10,6 @@ before_install:
- if test "$TRAVIS_OS_NAME" = "osx" ; then brew list python3 &>/dev/null || brew install python3; fi
- if test "$TRAVIS_OS_NAME" = "osx" ; then brew install pyenv-virtualenv; fi
- if test "$TRAVIS_OS_NAME" = "osx" ; then brew bundle ; brew link gettext --force ; export PATH="$PATH:/usr/local/bin" ; export DYLD_LIBRARY_PATH="/usr/local/opt/curl/lib:/usr/local/opt/openssl/lib:${DYLD_LIBRARY_PATH}" ; export PATH="/usr/local/opt/openssl/bin:$PATH" ; export LDFLAGS="$LDFLAGS -L/usr/local/opt/openssl/lib" ; export CPPFLAGS="$CPPFLAGS -I/usr/local/opt/openssl/include" ; export CPPFLAGS="$CPPFLAGS -I$(brew --prefix openssl)/include" PKG_CONFIG_PATH="$(brew --prefix openssl)/lib/pkgconfig:$PKG_CONFIG_PATH" LDFLAGS="$LDFLAGS -L$(brew --prefix openssl)/lib" ;fi
- if test "$TRAVIS_OS_NAME" = "osx" ; then find /usr/local/opt/tcl-tk -iname '*tile*' -print ; exit 1 ; fi
install:
- sudo cpanm Code::TidyAll::Plugin::Flake8 Perl::Tidy Test::Code::TidyAll Test::Differences Test::TrailingSpace
- export PY_MODS='pycotap random2 six'

View file

@ -6,7 +6,6 @@ Usage:
import os
import sys
import shutil
from six.moves import tkinter
from subprocess import call
from setuptools import setup
from pysollib.settings import PACKAGE, VERSION
@ -26,21 +25,6 @@ if not os.path.exists('data/html'):
# build the HTML list of games
call("./scripts/all_games.py > docs/all_games.html", shell=True)
# Use Tile widgets, if they are installed.
# http://tktable.sourceforge.net/tile/
root = tkinter.Tk()
root.withdraw()
try:
root.tk.call('package', 'require', 'tile', '0.7.8')
except Exception:
TILE = None
else:
TILE = "tile0.7.8"
TCL_EXTENSION_PATH = "/Library/Tcl"
finally:
root.destroy()
del root, tkinter
# Use Freecell Solver, if it is installed.
# http://fc-solve.berlios.de/
SOLVER_LIB_PATH = "/usr/local/lib/libfreecell-solver.0.dylib"
@ -66,7 +50,7 @@ PLIST = dict(
APP = ['pysol.py']
ICON_FILE = 'data/PySol.icns'
DATA_FILES = ['docs', 'data', 'scripts', 'COPYING', 'README.md'] + SOLVER
RESOURCES = [os.path.join(TCL_EXTENSION_PATH, TILE)] if TILE else []
RESOURCES = []
FRAMEWORKS = [SOLVER_LIB_PATH] if SOLVER_LIB_PATH else []
OPTIONS = dict(argv_emulation=True,
plist=PLIST,
@ -85,15 +69,6 @@ setup(
#
top = os.getcwd()
# FIXME: a hack to get Tcl extensions working
# from inside the app bundle
if TILE and "py2app" in sys.argv:
os.chdir('dist/%s.app/Contents/Frameworks' % PACKAGE)
try:
os.symlink('../Resources/%s' % TILE, TILE)
except OSError:
pass
os.chdir(top)
# Modify the fc-solve binary with install_name_tool to use the dependent
# libfreecell-solver dynamic library in the app bundle.
if SOLVER and "py2app" in sys.argv: