Multiple commits

.github/workflows/builds.yaml

@@ -0,0 +1,139 @@
+name: Build tests
+
+on: [pull_request]
+
+jobs:
+  macos:
+    runs-on: macos-latest
+    strategy:
+      matrix:
+        path: ['non-vpath', 'vpath']
+        sphinx: ['no-sphinx', 'sphinx']
+    steps:
+    - name: Install dependencies
+      run: brew install libevent hwloc autoconf automake libtool
+    - name: Git clone OpenPMIx
+      uses: actions/checkout@v3
+      with:
+            submodules: recursive
+            repository: openpmix/openpmix
+            path: openpmix/master
+            ref: master
+    - name: Build OpenPMIx
+      run: |
+        cd openpmix/master
+        ./autogen.pl
+        ./configure --prefix=$RUNNER_TEMP/pmixinstall
+        make -j
+        make install
+    - name: Git clone PRRTE
+      uses: actions/checkout@v3
+      with:
+            submodules: recursive
+            clean: false
+    - name: Build PRRTE
+      run: |
+        ./autogen.pl
+
+        sphinx=
+        if test "${{ matrix.sphinx }}" = sphinx; then
+            pip3 install -r docs/requirements.txt
+            sphinx=--enable-sphinx
+        fi
+
+        c=./configure
+        if test "${{ matrix.path }}" = vpath; then
+            mkdir build
+            cd build
+            c=../configure
+        fi
+
+        $c --prefix=$RUNNER_TEMP/prteinstall --with-pmix=$RUNNER_TEMP/pmixinstall $sphinx
+        make -j
+        make install
+        make uninstall
+
+  ubuntu:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        path: ['non-vpath', 'vpath']
+        sphinx: ['no-sphinx', 'sphinx']
+    steps:
+    - name: Install dependencies
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y --no-install-recommends software-properties-common libhwloc-dev libevent-dev
+    - name: Git clone OpenPMIx
+      uses: actions/checkout@v3
+      with:
+            submodules: recursive
+            repository: openpmix/openpmix
+            path: openpmix/master
+            ref: master
+    - name: Build OpenPMIx
+      run: |
+        cd openpmix/master
+        ./autogen.pl
+        ./configure --prefix=$RUNNER_TEMP/pmixinstall
+        make -j
+        make install
+    - name: Git clone PRRTE
+      uses: actions/checkout@v3
+      with:
+            submodules: recursive
+            clean: false
+    - name: Build PRRTE
+      run: |
+        ./autogen.pl
+
+        sphinx=
+        if test "${{ matrix.sphinx }}" = sphinx; then
+            pip3 install -r docs/requirements.txt
+            sphinx=--enable-sphinx
+        fi
+
+        c=./configure
+        if test "${{ matrix.path }}" = vpath; then
+            mkdir build
+            cd build
+            c=../configure
+        fi
+
+        $c --prefix=$RUNNER_TEMP/prteinstall --with-pmix=$RUNNER_TEMP/pmixinstall $sphinx
+        make -j
+        make install
+        make uninstall
+
+  distcheck:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Install dependencies
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y --no-install-recommends software-properties-common libhwloc-dev libevent-dev python3 python3-pip
+    - name: Git clone OpenPMIx
+      uses: actions/checkout@v3
+      with:
+            submodules: recursive
+            repository: openpmix/openpmix
+            path: openpmix/master
+            ref: master
+    - name: Build OpenPMIx
+      run: |
+        cd openpmix/master
+        ./autogen.pl
+        ./configure --prefix=$RUNNER_TEMP/pmixinstall
+        make -j
+        make install
+    - name: Git clone PRRTE
+      uses: actions/checkout@v3
+      with:
+            submodules: recursive
+            clean: false
+    - name: Distcheck
+      run: |
+        pip install -r docs/requirements.txt
+        ./autogen.pl
+        ./configure --prefix=$RUNNER_TEMP/prteinstall --with-pmix=$RUNNER_TEMP/pmixinstall --enable-sphinx
+        make distcheck AM_DISTCHECK_MAKEFLAGS=-j AM_DISTCHECK_CONFIGURE_FLAGS="--with-pmix=$RUNNER_TEMP/pmixinstall"

Makefile.prte-rules

@@ -3,6 +3,7 @@
 # Copyright (c) 2008      Sun Microsystems, Inc.  All rights reserved.
 # Copyright (c) 2020      Intel, Inc.  All rights reserved.
 # Copyright (c) 2023      Nanook Consulting.  All rights reserved.
+# Copyright (c) 2023      Jeffrey M. Squyres.  All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -23,8 +24,8 @@ PRTE_V_SPHINX_MAN = $(prte__v_SPHINX_MAN_$V)
 prte__v_SPHINX_MAN_ = $(prte__v_SPHINX_MAN_$AM_DEFAULT_VERBOSITY)
 prte__v_SPHINX_MAN_0 = @echo "  GENERATE man pages";
 
-PRTE_V_TXT = $(prte__v_SPHINX_TXT_$V)
-prte__v_TXT_ = $(prte__v_SPHINX_TXT_$AM_DEFAULT_VERBOSITY)
+PRTE_V_TXT = $(prte__v_TXT_$V)
+prte__v_TXT_ = $(prte__v_TXT_$AM_DEFAULT_VERBOSITY)
 prte__v_TXT_0 = @echo "  GENERATE text files";
 
 PRTE_V_LN_S = $(prte__v_LN_S_$V)

configure.ac

@@ -718,6 +718,7 @@ AC_INCLUDES_DEFAULT
 #
 
 OAC_SETUP_SPHINX([$srcdir/docs/_build/html/index.html], [])
+AC_CHECK_PROGS(PYTHON, [python3 python python2])
 
 AS_IF([test -n "$OAC_MAKEDIST_DISABLE"],
       [AS_IF([test -n "$PRTE_MAKEDIST_DISABLE"],

src/docs/show-help-files/Makefile.am

@@ -96,7 +96,9 @@ $(TXT_SENTINEL_OUTPUT):
 if PRTE_BUILD_DOCS
 	$(PRTE_V_TXT) $(SPHINX_BUILD) -M text "$(srcdir)" "$(OUTDIR)" $(SPHINX_OPTS)
 else !PRTE_BUILD_DOCS
-	$(PRTE_V_TXT) $(srcdir)/build-dummy-ini-files.py $(TXT_OUTDIR) $(ALL_TXT_BUILT)
+	$(PRTE_V_TXT) \
+	$(PYTHON) $(srcdir)/build-dummy-ini-files.py $(TXT_OUTDIR) $(ALL_TXT_BUILT); \
+	touch $(TXT_SENTINEL_OUTPUT)
 endif !PRTE_BUILD_DOCS
 
 maintainer-clean-local:
@@ -105,6 +107,4 @@ maintainer-clean-local:
 ###########################################################################
 
 # Install the generated text files
-if [ -e $(TXT_OUTDIR)/help-schizo-pinfo.txt ] ; \
-	dist_prtedata_DATA = $(ALL_TXT_BUILT) ; \
-endif
+dist_prtedata_DATA = $(ALL_TXT_BUILT)

src/docs/show-help-files/build-dummy-ini-files.py

@@ -63,16 +63,20 @@
 
     # Ensure the out directory exists
     full_outdir = os.path.abspath(os.path.dirname(outfile))
-    # Use older form of os.mkdirs (without the exist_ok param) to make
-    # this script runnable in as many environments as possible.
+    if not os.path.exists(full_outdir):
+        # Use older form of os.mkdirs (without the exist_ok param) to
+        # make this script runnable in as many environments as
+        # possible.
+        os.makedirs(full_outdir)
+
     try:
-        os.makedirs(full_outdir, exists_ok=True)
         # Write the output file
         with open(outfile, 'w') as fp:
             for section in sections:
                 # Use Python 2-friendly formatting for environments where
                 # we don't have Python 3 (!).
                 fp.write("""[{}]
     This help section is empty because PRRTE was built without Sphinx.\n""".format(section))
-    except Exception:
+    except Exception as e:
+        print("ERROR: {}".format(e))
         pass