diff --git a/Makefile.am b/Makefile.am index 901dbeb84..833767b8c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,6 +19,7 @@ help: @echo "o2scl-examples: Compile and run examples" @echo "test-clean: Clean files created by tests" @echo "open-doc: View local HTML documentation" + @echo "open-idoc: View installed HTML documentation" @echo "blank-doc: Create blank documentation" @echo "web-doc: View web documentation" @echo "emacs-clean: Remove files ending with a tilde" @@ -124,6 +125,9 @@ endif open-doc: $(BROWSER) doc/o2scl/html/index.html +open-idoc: + $(BROWSER) ${docdir}/html/index.html + web-doc: $(BROWSER) https://neutronstars.utk.edu/code/o2scl/html/index.html diff --git a/doc/o2scl/.gitignore b/doc/o2scl/.gitignore index 4588becab..5708926ea 100644 --- a/doc/o2scl/.gitignore +++ b/doc/o2scl/.gitignore @@ -2,4 +2,5 @@ make_rst doxygen.log doxygen.scr *.tag -xml \ No newline at end of file +xml +html diff --git a/doc/o2scl/Makefile.am b/doc/o2scl/Makefile.am index 04e592b9c..6a9e926fc 100644 --- a/doc/o2scl/Makefile.am +++ b/doc/o2scl/Makefile.am @@ -27,7 +27,7 @@ dist_doc_DATA = # These are the files included in the distribution EXTRA_DIST = o2scl.tag -SUBDIRS = sphinx xml +SUBDIRS = sphinx emacs-clean: rm -f *~ diff --git a/docker/opensuse_leap_dev b/docker/opensuse_leap_dev index 4a189ded1..966d52056 100644 --- a/docker/opensuse_leap_dev +++ b/docker/opensuse_leap_dev @@ -29,9 +29,13 @@ WORKDIR /opt/o2scl RUN make o2scl-test RUN make o2scl-examples -# Python3, and o2sclpy via pip -RUN zypper install -y python3 python3-pip texlive dvipng python3-h5py -RUN pip3 install o2sclpy +# Python3, and o2sclpy via pip. Note that the dvipng package is named +# differently in OpenSUSE +WORKDIR /opt +RUN zypper install -y python3 python3-pip texlive texlive-dvipng python3-h5py +RUN git clone https://github.com/awsteiner/o2scl +WORKDIR /opt/o2sclpy +RUN pip3 install . # To ensure o2graph loads OpenMP appropriately ENV O2SCL_ADDL_LIBS /usr/lib/gcc/x86_64-linux-gnu/10/libgomp.so RUN o2graph -help diff --git a/src/base/prev_commit.h b/src/base/prev_commit.h index fe0b03ac1..c15a3eb75 100644 --- a/src/base/prev_commit.h +++ b/src/base/prev_commit.h @@ -1,4 +1,4 @@ -#define O2SCL_PREV_COMMIT_HASH "b37f8ef668fa1795c9e959e4a1cd72cd1b7a45de" -#define O2SCL_PREV_COMMIT_DATE "2022-07-23 01:16:21 -0400" +#define O2SCL_PREV_COMMIT_HASH "181b2c4ad6b4a008895fb1ef7ea520740ea8c012" +#define O2SCL_PREV_COMMIT_DATE "2022-07-23 11:14:25 -0400" #define O2SCL_BRANCH ""