Skip to content

Commit

Permalink
Fixed compile
Browse files Browse the repository at this point in the history
  • Loading branch information
jbendes committed Mar 27, 2024
1 parent 3592913 commit e054bcc
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 8 deletions.
17 changes: 10 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,16 @@ COPY zcm/ ./zcm
ENV PATH ${PATH}:/root/.local/bin:$ZCM_HOME/deps/julia/bin
ENV NVM_DIR /root/.nvm

RUN bash -c 'export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") && \
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
. $ZCM_HOME/deps/cxxtest/.env && \
./waf distclean configure --use-all --use-dev && \
./waf build && \
./waf install && \
./waf build_examples'
RUN <<EOF
#!/bin/bash
export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::")
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
. $ZCM_HOME/deps/cxxtest/.env
./waf distclean configure --use-all --use-dev
./waf build
./waf install
./waf build_examples
EOF

CMD bash -c 'export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") && \
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
Expand Down
2 changes: 1 addition & 1 deletion wscript
Original file line number Diff line number Diff line change
Expand Up @@ -474,7 +474,7 @@ def build(ctx):
ctx.recurse('gen')
ctx.recurse('tools')
ctx.recurse('DEBIAN')
ctx.recurse('bench')
#ctx.recurse('bench')
ctx.install_as('${PREFIX}/share/doc/zcm/copyright', 'LICENSE')
if not waflib.Options.options.skip_git:
generate_signature(ctx)
Expand Down

0 comments on commit e054bcc

Please sign in to comment.