Skip to content

Commit

Permalink
Remove superflouos invokations of ./otp_build autoconf
Browse files Browse the repository at this point in the history
  • Loading branch information
marcellanz authored and sverker committed Nov 18, 2021
1 parent 06023ba commit 132b0f4
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 39 deletions.
26 changes: 3 additions & 23 deletions .github/scripts/init-pre-release.sh
Original file line number Diff line number Diff line change
@@ -1,26 +1,6 @@
#!/bin/sh

## We create a tar ball that has generated configure
## (old versions might not have these included)
## This is used later by build-otp-tar to create
## the pre-built tar ball
## We create a tar ball that is used later by build-otp-tar
## to create the pre-built tar ball

if [ -f ./configure ]; then
git archive --prefix otp/ -o otp_src.tar.gz HEAD
else
ERL_TOP=`pwd`
./otp_build autoconf
find . -name aclocal.m4 | xargs git add -f
find . -name configure | xargs git add -f
find . -name config.h.in | xargs git add -f
find . -name config.guess | xargs git add -f
find . -name config.sub | xargs git add -f
find . -name install-sh | xargs git add -f
if ! git config user.name; then
git config user.email "[email protected]"
git config user.name "Your Name"
fi
git commit --no-verify -m 'Add generated configure files'
git archive --prefix otp/ -o otp_src.tar.gz HEAD
git reset --hard HEAD~1
fi
git archive --prefix otp/ -o otp_src.tar.gz HEAD
5 changes: 0 additions & 5 deletions HOWTO/OTP-PATCH-APPLY.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,6 @@ the updated applications.
> *NOTE*: Before applying a patch you need to do a *full* build
> of OTP in the source directory.
If you are building in `git` you first need to generate the
`configure` scripts:

$ ./otp_build autoconf

Configure and build all applications in OTP:

$ configure
Expand Down
1 change: 0 additions & 1 deletion lib/megaco/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,6 @@ include $(ERL_TOP)/make/otp_subdir.mk

reconf:
(cd $(ERL_TOP) && \
./otp_build autoconf && \
./otp_build configure && \
cd $(ERL_TOP)/../libraries/megaco)

Expand Down
10 changes: 0 additions & 10 deletions scripts/build-otp-tar
Original file line number Diff line number Diff line change
Expand Up @@ -469,16 +469,6 @@ else
echo " === Environment ==================================== " >> $build_log
env >> $build_log

progress "Running autoconf in OTP"
echo " " >> $build_log
echo " === Running autoconf in OTP ================================ " >> $build_log
echo " " >> $build_log
echo "./otp_build autoconf" >> $build_log
./otp_build autoconf >> $build_log 2>&1
if [ $? -ne 0 ]; then
error "Failed to run autoconf in OTP"
fi

progress "Configuring OTP"
echo " " >> $build_log
echo " === Configuring OTP ================================ " >> $build_log
Expand Down

0 comments on commit 132b0f4

Please sign in to comment.