Skip to content

Commit

Permalink
package.sh: Remove architecture-specific files from the sdist
Browse files Browse the repository at this point in the history
Also move this under tools/ while we're at it.

Conceptually this reverts 68b8fcb and
fixes #121 in a different way.
  • Loading branch information
Tavian Barnes committed Feb 8, 2019
1 parent f8f6af8 commit 906b50b
Show file tree
Hide file tree
Showing 5 changed files with 41 additions and 20 deletions.
11 changes: 10 additions & 1 deletion MANIFEST.in
Expand Up @@ -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
14 changes: 0 additions & 14 deletions package.sh

This file was deleted.

10 changes: 5 additions & 5 deletions textworld/thirdparty/glulx/Git-Glulx/Makefile
Expand Up @@ -46,7 +46,7 @@ MAJOR = 1
MINOR = 3
PATCH = 5

include $(GLKINCLUDEDIR)/$(GLKMAKEFILE)
-include $(GLKINCLUDEDIR)/$(GLKMAKEFILE)

EXENAME := git-glulx-ml

Expand All @@ -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)

Expand Down
File renamed without changes.
26 changes: 26 additions & 0 deletions 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

0 comments on commit 906b50b

Please sign in to comment.