[jhbuild] build: Add --with-python option to the simple install

[Christoph Reiter <creiter src gnome org>]

commit 14d0fca35038da9ad4b20a62d8baf075f8b12884
Author: Christoph Reiter <reiter christoph gmail com>
Date:   Wed Oct 2 20:50:24 2019 +0200

    build: Add --with-python option to the simple install
    
    So that ./autogen.sh --with-python=python3 works when autotools is not installed.
    python3 is the default. Compared to autotools we don't do any checks on the passed
    name/path and just use the basename of it as is.
    
    Also adds a simple install case to CI.
    
    Fixes #35

 .gitlab-ci.yml | 13 +++++++++++++
 Makefile.plain |  2 +-
 autogen.sh     |  8 ++++++++
 3 files changed, 22 insertions(+), 1 deletion(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b88305ae..76261a50 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,13 +5,20 @@ stages:
 test-py2:
   image: registry.gitlab.gnome.org/gnome/jhbuild/jhbuild:v3
   script:
+    # autotools install
     - mkdir _build && cd _build
     - ../autogen.sh --with-python=python2
     - make
     - make install
     - make distcheck
     - cd ..
+    # simple install
+    - ./autogen.sh --simple-install --with-python=python2
+    - make install
+    - $HOME/.local/bin/jhbuild help
+    # flake 8
     - python2 -m flake8 .
+    # docs
     - mkdir public
     - cd public
     - yelp-build html ../doc/C/index.docbook
@@ -22,12 +29,18 @@ test-py2:
 test-py3:
   image: registry.gitlab.gnome.org/gnome/jhbuild/jhbuild:v3
   script:
+    # autotools install
     - mkdir _build && cd _build
     - ../autogen.sh --with-python=python3
     - make
     - make install
     - make distcheck
     - cd ..
+    # simple install
+    - ./autogen.sh --simple-install --with-python=python3
+    - make install
+    - $HOME/.local/bin/jhbuild help
+    # flake 8
     - python3 -m flake8 .
   artifacts:
     paths:
diff --git a/Makefile.plain b/Makefile.plain
index 022e2418..f0ed236b 100644
--- a/Makefile.plain
+++ b/Makefile.plain
@@ -24,7 +24,7 @@ install: include-check
        @echo "Creating $(bindir)/jhbuild"
        @mkdir -p $(bindir)
        @sed -e "s,@jhbuilddir@,`pwd`,g" \
-               -e "s,@python@,python2,g" \
+               -e "s,@python@,$(python),g" \
                -e "s,USE_CHECKOUT_SRC = False,USE_CHECKOUT_SRC = True," < \
                scripts/jhbuild.in > $(bindir)/jhbuild
        @chmod a+x $(bindir)/jhbuild
diff --git a/autogen.sh b/autogen.sh
index e13c3023..44042d03 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -80,6 +80,7 @@ setup_i18n()
 parse_commandline()
 {
   enable_autotools=$TRUE
+  python="python3"
 
   while [ -n "$1" ]; do
     case "$1" in
@@ -90,9 +91,15 @@ parse_commandline()
       --prefix=*)
         prefix="$(echo "$1" | cut -d= -f2)"
         ;;
+
+      --with-python=*)
+        python="$(echo "$1" | cut -d= -f2)"
+        ;;
     esac
     shift
   done
+
+  python="$(basename $python)"
 }
 
 # configure JHBuild to build and install without autotools via a plain
@@ -133,6 +140,7 @@ configure_without_autotools()
          "run."
     echo "prefix=$prefix"
     echo "bindir=$bindir"
+    echo "python=$python"
     echo "datarootdir=$datarootdir"
     echo "desktopdir=$desktopdir"
     if [ "$msgfmtl_available" -ne 0 ]; then