Skip to content

Commit

Permalink
Removing xml from dist and updated opensuse docker. This commit is ta…
Browse files Browse the repository at this point in the history
…rgeted for the 0.927 release.
  • Loading branch information
Andrew W. Steiner committed Jul 23, 2022
1 parent 72074ce commit 9061fb5
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 7 deletions.
4 changes: 4 additions & 0 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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

Expand Down
3 changes: 2 additions & 1 deletion doc/o2scl/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@ make_rst
doxygen.log
doxygen.scr
*.tag
xml
xml
html
2 changes: 1 addition & 1 deletion doc/o2scl/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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 *~
Expand Down
10 changes: 7 additions & 3 deletions docker/opensuse_leap_dev
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions src/base/prev_commit.h
Original file line number Diff line number Diff line change
@@ -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 ""

0 comments on commit 9061fb5

Please sign in to comment.