Skip to content

Commit

Permalink
app.src + otp26
Browse files Browse the repository at this point in the history
  • Loading branch information
sebastiw committed Sep 24, 2023
1 parent 765fe3b commit a2fc18d
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 2 deletions.
5 changes: 3 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ $(DEPS:%=deps/%/ebin):
$(MKDIR) $(MKDIR_FLAGS) $@
$(ERLC) +debug_info -o $@ -I$(@:/ebin=/include) -I$(@:/ebin=/src) $(@:/ebin=/src)/*.erl
# reltool doesn't support unrecognized options
sed -i '/env/{ s/,$$// };/licenses/d;/links/{ N; N; N; d }' $(@:/ebin=/src)/$(@:deps/%/ebin=%).app.src
sed -i 'H; $$!d; x; s/[[:space:]]\+%[^\n]\+//g; s/,[[:space:]]\+{licenses[^\n]\+//; s/{links, \[[^]]\+]}//;' $(@:/ebin=/src)/$(@:deps/%/ebin=%).app.src
cp $(@:/ebin=/src)/$(@:deps/%/ebin=%).app.src $@/$(@:deps/%/ebin=%).app

.PHONY: $(LIBS)
Expand All @@ -68,7 +68,8 @@ dialyzer: erlang.plt edts.plt
erlang.plt:
$(DIALYZER) --quiet --build_plt --output_plt $@ --apps \
erts kernel stdlib mnesia crypto sasl eunit \
syntax_tools compiler tools debugger dialyzer
syntax_tools compiler tools debugger dialyzer \
wx runtime_tools
edts.plt: erlang.plt
$(DIALYZER) --add_to_plt --plt erlang.plt -r lib/ deps/ --output_plt $@

Expand Down
28 changes: 28 additions & 0 deletions test_data/manual/Dockerfile.otp26
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
FROM ubuntu:22.04

SHELL ["/bin/bash", "-c"]

ENV DEBIAN_FRONTEND=noninteractive

RUN apt-get -q update && \
apt-get -yq install \
wget libncurses5 libwxgtk3.0-gtk3-0v5 libwxbase3.0-0v5 libsctp1 \
build-essential emacs git && \
rm -rf /var/lib/apt/lists/*

ENV ERLANG_VERSION=26.0.2 \
ERLANG_EMACS_LIB="/usr/lib/erlang/lib/tools-3.5.3/emacs"

RUN . /etc/os-release && \
export FILE="esl-erlang_${ERLANG_VERSION}-1~ubuntu~${VERSION_CODENAME}_amd64.deb" && \
wget -q "https://binaries2.erlang-solutions.com/ubuntu/pool/contrib/e/esl-erlang/$FILE" && \
dpkg -i $FILE && \
rm $FILE

WORKDIR /edts

COPY . .

RUN make
# && \
# make test

0 comments on commit a2fc18d

Please sign in to comment.