Merge pull request #131 from Microsoft/release-1.1.1

Release 1.1.1

CHANGELOG.md

@@ -4,6 +4,13 @@ This changelog follows the following convention [https://keepachangelog.com/en/1
 
 ## [Unreleased]
 
+## [1.1.1] - 2019-02-08
+
+### Fixed
+
+- Packaging issues that prevented installation from source on macOS (#121)
+- Version numbers in documentation
+
 ## [1.1.0] - 2019-02-07
 
 ### Breaking

MANIFEST.in

@@ -14,9 +14,18 @@ include textworld/generator/data/logic/*.twl
 include textworld/generator/data/text_grammars/*.twg
 
 recursive-include textworld/render/tmpl *
+
 recursive-include textworld/thirdparty/frotz *
+prune textworld/thirdparty/frotz/.git
+
 recursive-include textworld/thirdparty/glulx *
+
 recursive-include textworld/thirdparty/inform7 *
-recursive-include textworld/thirdparty/inform7-6M62 *
+recursive-include textworld/thirdparty/inform7-6M62/bin *
+recursive-include textworld/thirdparty/inform7-6M62/share/inform7/Compilers *
+recursive-include textworld/thirdparty/inform7-6M62/share/inform7/Internal *
+recursive-include textworld/thirdparty/inform7-6M62/share/inform7/Interpreters *
+
+global-exclude *.o *.a
 
 prune build

docs/requirements.txt

@@ -1,4 +1,5 @@
+-r ../requirements.txt
 sphinx
 recommonmark
 sphinx_autodoc_typehints
--e git://github.com/snide/sphinx_rtd_theme.git#egg=sphinx_rtd_theme
+-e git://github.com/snide/sphinx_rtd_theme.git#egg=sphinx_rtd_theme

docs/source/conf.py

@@ -19,7 +19,10 @@
 # import os
 # import sys
 # sys.path.insert(0, os.path.abspath('.'))
+import os
 import sphinx_rtd_theme
+import subprocess
+import textworld
 
 # -- Project information -----------------------------------------------------
 
@@ -28,9 +31,14 @@
 author = 'Marc-Alexandre Côté, Tavian Barnes, Matthew Hausknecht, James Moore, Ákos Kádár, Ben Kybartas'
 
 # The short X.Y version
-version = ''
+version = textworld.__version__
+
 # The full version, including alpha/beta/rc tags
-release = '0.1-beta'
+if os.path.isdir(os.path.join(os.path.dirname(__file__), "../../.git")):
+    result = subprocess.run(["git", "describe", "--always"], stdout=subprocess.PIPE, stderr=subprocess.DEVNULL)
+    release = result.stdout.decode("utf-8").strip()
+else:
+    release = version
 
 
 # -- General configuration ---------------------------------------------------

textworld/thirdparty/glulx/Git-Glulx/Makefile

@@ -46,7 +46,7 @@ MAJOR = 1
 MINOR = 3
 PATCH = 5
 
-include $(GLKINCLUDEDIR)/$(GLKMAKEFILE)
+-include $(GLKINCLUDEDIR)/$(GLKMAKEFILE)
 
 EXENAME := git-glulx-ml
 
@@ -69,16 +69,16 @@ OBJS = git.o memory.o compiler.o opcodes.o operands.o \
 TESTS = test/test.sh \
 	test/Alabaster.gblorb test/Alabaster.walk test/Alabaster.golden
 
-all: git
+all: $(EXENAME)
 
-git: $(OBJS)
-	$(CC) $(OPTIONS) -o $(EXENAME) $(OBJS) $(LIBS)
+$(EXENAME): $(OBJS)
+	$(CC) $(OPTIONS) -o $@ $(OBJS) $(LIBS)
 
 install: git
 	cp $(EXENAME) $(INSTALLDIR)/$(EXENAME)
 
 clean:
-	rm -f *~ *.o git test/*.tmp
+	rm -f *~ *.o $(EXENAME) test/*.tmp
 
 $(OBJS): $(HEADERS)
 

textworld/version.py

@@ -1 +1 @@
-__version__ = '1.1.0'
+__version__ = '1.1.1'

tools/package.sh

@@ -0,0 +1,26 @@
+#!/bin/bash
+
+set -e
+
+if ! grep 'vsyscall=emulate' /proc/cmdline >/dev/null; then
+    cat >&2 <<EOF
+WARNING: The manylinux Docker images require the host kernel to have vsyscall
+emulation enabled, usually by adding vsyscall=emulate to the kernel command line
+EOF
+fi
+
+./tools/prep-release.sh
+
+# Set up all the third-party dependencies
+./setup.sh
+
+# But don't include too much in the source package
+rm -rf textworld/thirdparty/I7* textworld/thirdparty/inform7-6M62
+(cd textworld/thirdparty/frotz && make clean && rm -f dfrotz)
+make -C textworld/thirdparty/glulx/Git-Glulx clean
+make -C textworld/thirdparty/glulx/cheapglk clean
+rm -rf build *.egg-info
+
+python setup.py sdist
+
+docker run --rm -v "$PWD":/usr/src/TextWorld quay.io/pypa/manylinux1_x86_64 /usr/src/TextWorld/tools/package-impl.sh