Skip to content

Commit

Permalink
bob-namespace-sandbox: always use this name
Browse files Browse the repository at this point in the history
Previously the helper was built as namespace-sandbox and renamed to
bob-namespace-sandbox. This is not supported by distutils and even
unnecessary to begin with.
  • Loading branch information
jkloetzke committed May 28, 2019
1 parent 6b367e2 commit 9b4e643
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ SPHINX := $(shell command -v sphinx-build 2>/dev/null)

.PHONY: all install pym check doc

all: bin/namespace-sandbox check pym doc
all: bin/bob-namespace-sandbox check pym doc

bin/namespace-sandbox: $(patsubst %,$(DIR)/%,$(SOURCE) $(HEADERS))
bin/bob-namespace-sandbox: $(patsubst %,$(DIR)/%,$(SOURCE) $(HEADERS))
@gcc -o $@ -std=c99 $^ -lm

pym:
Expand All @@ -36,8 +36,8 @@ pym:
install: all
@rm -rf $(DESTDIR)/lib/bob
@mkdir -p $(DESTDIR)/bin $(DESTDIR)/lib/bob/bin
@cp bin/namespace-sandbox $(DESTDIR)/lib/bob/bin
@cp bin/namespace-sandbox $(DESTDIR)/bin/bob-namespace-sandbox
@cp bin/bob-namespace-sandbox $(DESTDIR)/lib/bob/bin
@cp bin/bob-namespace-sandbox $(DESTDIR)/bin/bob-namespace-sandbox
@cp -r bob bob-audit-engine bob-hash-engine bob-hash-tree contrib pym $(DESTDIR)/lib/bob
@ln -sf ../lib/bob/bob $(DESTDIR)/bin
@ln -sf ../lib/bob/bob-audit-engine $(DESTDIR)/bin
Expand Down
2 changes: 1 addition & 1 deletion bin/.gitignore
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/namespace-sandbox
/bob-namespace-sandbox
2 changes: 1 addition & 1 deletion pym/bob/cmds/build/builder.py
Original file line number Diff line number Diff line change
Expand Up @@ -552,7 +552,7 @@ async def _runShell(self, step, scriptName, cleanWorkspace, logger):
if step.getSandbox() is not None:
sandboxSetup = "\"$(mktemp -d)\""
sandboxMounts = [ "declare -a mounts=( )" ]
sandbox = [ quote(os.path.join(self.__bobRoot, "bin", "namespace-sandbox")) ]
sandbox = [ quote(os.path.join(self.__bobRoot, "bin", "bob-namespace-sandbox")) ]
if self.__verbose >= TRACE:
sandbox.append('-D')
sandbox.extend(["-S", "\"$_sandbox\""])
Expand Down

0 comments on commit 9b4e643

Please sign in to comment.