Skip to content

autoconf tweaks#8639

Merged
dra27 merged 8 commits intoocaml:trunkfrom
dra27:autoconf-tweak
Apr 17, 2020
Merged

autoconf tweaks#8639
dra27 merged 8 commits intoocaml:trunkfrom
dra27:autoconf-tweak

Conversation

@dra27
Copy link
Copy Markdown
Member

@dra27 dra27 commented Apr 24, 2019

The principal motivation for this change is to allow make configure instead of ./autogen.

dra27 added 4 commits December 4, 2018 10:28
This should be improved to give better warnings for when Makefile.config
and Makefile.common are required.
@shindere
Copy link
Copy Markdown
Contributor

shindere commented May 13, 2019 via email

@shindere
Copy link
Copy Markdown
Contributor

I am not merging yet because I don't know why Travis is failing, can anybody check this, please?

@gasche
Copy link
Copy Markdown
Member

gasche commented May 14, 2019

Travis is failing because (1) a Changes entry is missing and (2) check-typo is failing.

The check-typo failure is non-standard (it is not due to a typo), I believe that it comes from the following piece of code in tools/ci/travis/travis-ci.sh that probably needs updating:

 if [ -e CHECK_CONFIGURE ] ; then
    rm -f CHECK_CONFIGURE
    echo "configure or configure.ac altered in $1"
    echo "Verifying that configure.ac generates configure"
    git checkout "$1"
    mv configure configure.ref
    ./autogen
    if ! diff -q configure configure.ref >/dev/null ; then
      echo "configure.ac no longer generates configure, \
please run ./autogen and commit"
      exit 1
    fi
  fi

The relevant portion of the log is as follows:

configure or configure.ac altered in a453d65a7a3dcecdc594a1763b63f649c2d8e580
Verifying that configure.ac generates configure
HEAD is now at a453d65 Merge 53a93199f5b1ffa37b5a90bd748dfee0226d9c81 into f2c71fe44dd5ce6117234e954faf4d44b4e5c362
tools/autogen
configure.ac no longer generates configure, please run rm configure ; make configure and commit
The command "bash -e tools/ci/travis/travis-ci.sh" exited with 1.

@gasche
Copy link
Copy Markdown
Member

gasche commented May 14, 2019

(Apparently some of the travis-ci.sh code above was modified by the PR itself, so @dra27 should know about this.)

@shindere
Copy link
Copy Markdown
Contributor

shindere commented May 14, 2019 via email

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants