diff --git a/Makefile b/Makefile index ee604594..03daa4d4 100644 --- a/Makefile +++ b/Makefile @@ -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) @@ -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 $@ diff --git a/test_data/manual/Dockerfile.otp26 b/test_data/manual/Dockerfile.otp26 new file mode 100644 index 00000000..ef1cb7f3 --- /dev/null +++ b/test_data/manual/Dockerfile.otp26 @@ -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