Update for 2020 Code Camp changes up to 26Jan20

nexusformat · Jan 27, 2020 · 87f1cc9 · 87f1cc9
1 parent c61d348
commit 87f1cc9
Show file tree

Hide file tree

Showing 165 changed files with 1,182 additions and 1,295 deletions.
diff --git a/.gitignore b/.gitignore
@@ -15,3 +15,5 @@ build
 impatient-guide/_build
 .DS_Store
 __github_creds__.txt
+
+launch.json
diff --git a/.travis.yml b/.travis.yml
@@ -8,7 +8,6 @@
 dist: xenial   # required for Python >= 3.7
 language: python
 python:
-  - "2.7"
   - "3.5"
   - "3.6"
   - "3.7"

diff --git a/Makefile b/Makefile
@@ -7,7 +7,7 @@
 
 SUBDIRS = manual impatient-guide
 
-.PHONY: subdirs $(SUBDIRS) builddir pdfdoc
+.PHONY: subdirs $(SUBDIRS) builddir all
 
 subdirs: $(SUBDIRS)
 
@@ -17,6 +17,20 @@ subdirs: $(SUBDIRS)
 manual :: nxdl2rst
 	$(MAKE) html -C $@
 
+all :: 
+	$(MAKE) rmbuilddir builddir
+	$(MAKE) impatient-guide manual -C build
+	# expect next make (PDF) to fail (thus exit 0) since nexus.ind not found first time
+	# extra option needed to satisfy "levels nested too deeply" error
+	($(MAKE) latexpdf LATEXOPTS="--interaction=nonstopmode" -C build/manual || exit 0)
+	# make that missing file
+	makeindex build/manual/build/latex/nexus.idx
+	# build the PDF, still a failure will be noted but we can ignore it without problem
+	($(MAKE) latexpdf LATEXOPTS="--interaction=nonstopmode" -C build/manual || exit 0)
+	# finally, report what was built
+	@echo "HTML built: `ls -lAFgh build/manual/build/html/index.html`"
+	@echo "PDF built: `ls -lAFgh build/manual/build/latex/nexus.pdf`"
+
 impatient-guide ::
 	$(MAKE) html -C $@
 
@@ -56,7 +70,7 @@ local ::
 
 # NeXus - Neutron and X-ray Common Data Format
 # 
-# Copyright (C) 2008-2018 NeXus International Advisory Committee (NIAC)
+# Copyright (C) 2008-2020 NeXus International Advisory Committee (NIAC)
 # 
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
-* NeXus: http://www.nexusformat.org/
+* NeXus: https://www.nexusformat.org/
 * citation: [![DOI](https://zenodo.org/badge/19377430.svg)](https://zenodo.org/badge/latestdoi/19377430) (DOI: 10.5281/zenodo.1472392)
-* documentation: http://download.nexusformat.org/doc/html/index.html
+* documentation: https://manual.nexusformat.org/
 * Release Notes: https://github.com/nexusformat/definitions/wiki/Release-Notes
 * build server: http://build.nexusformat.org/
 * travis-ci: syntax check of every NXDL file [![Build Status](https://travis-ci.org/nexusformat/definitions.svg)](https://travis-ci.org/nexusformat/definitions)

diff --git a/applications/NXarchive.nxdl.xml b/applications/NXarchive.nxdl.xml
@@ -3,7 +3,7 @@
 <!--
 # NeXus - Neutron and X-ray Common Data Format
 # 
-# Copyright (C) 2008-2018 NeXus International Advisory Committee (NIAC)
+# Copyright (C) 2008-2020 NeXus International Advisory Committee (NIAC)
 # 
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/applications/NXarpes.nxdl.xml b/applications/NXarpes.nxdl.xml
@@ -3,7 +3,7 @@
 <!--
 # NeXus - Neutron and X-ray Common Data Format
 # 
-# Copyright (C) 2012-2018 NeXus International Advisory Committee (NIAC)
+# Copyright (C) 2012-2020 NeXus International Advisory Committee (NIAC)
 # 
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/applications/NXcanSAS.nxdl.xml b/applications/NXcanSAS.nxdl.xml
@@ -3,7 +3,7 @@
 <!--
 # NeXus - Neutron and X-ray Common Data Format
 # 
-# Copyright (C) 2012-2018 NeXus International Advisory Committee (NIAC)
+# Copyright (C) 2012-2020 NeXus International Advisory Committee (NIAC)
 # 
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/applications/NXdirecttof.nxdl.xml b/applications/NXdirecttof.nxdl.xml
@@ -3,7 +3,7 @@
 <!--
 # NeXus - Neutron and X-ray Common Data Format
 # 
-# Copyright (C) 2008-2018 NeXus International Advisory Committee (NIAC)
+# Copyright (C) 2008-2020 NeXus International Advisory Committee (NIAC)
 # 
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/applications/NXfluo.nxdl.xml b/applications/NXfluo.nxdl.xml
@@ -3,7 +3,7 @@
 <!--
 # NeXus - Neutron and X-ray Common Data Format
 # 
-# Copyright (C) 2008-2018 NeXus International Advisory Committee (NIAC)
+# Copyright (C) 2008-2020 NeXus International Advisory Committee (NIAC)
 # 
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/applications/NXindirecttof.nxdl.xml b/applications/NXindirecttof.nxdl.xml
@@ -3,7 +3,7 @@
 <!--
 # NeXus - Neutron and X-ray Common Data Format
 # 
-# Copyright (C) 2008-2018 NeXus International Advisory Committee (NIAC)
+# Copyright (C) 2008-2020 NeXus International Advisory Committee (NIAC)
 # 
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/applications/NXiqproc.nxdl.xml b/applications/NXiqproc.nxdl.xml
@@ -3,7 +3,7 @@
 <!--
 # NeXus - Neutron and X-ray Common Data Format
 # 
-# Copyright (C) 2008-2018 NeXus International Advisory Committee (NIAC)
+# Copyright (C) 2008-2020 NeXus International Advisory Committee (NIAC)
 # 
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/applications/NXlauetof.nxdl.xml b/applications/NXlauetof.nxdl.xml
@@ -3,7 +3,7 @@
 <!--
 # NeXus - Neutron and X-ray Common Data Format
 # 
-# Copyright (C) 2008-2018 NeXus International Advisory Committee (NIAC)
+# Copyright (C) 2008-2020 NeXus International Advisory Committee (NIAC)
 # 
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/applications/NXmonopd.nxdl.xml b/applications/NXmonopd.nxdl.xml
@@ -3,7 +3,7 @@
 <!--
 # NeXus - Neutron and X-ray Common Data Format
 # 
-# Copyright (C) 2008-2018 NeXus International Advisory Committee (NIAC)
+# Copyright (C) 2008-2020 NeXus International Advisory Committee (NIAC)
 # 
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,7 +8,6 @@ @@
     dist: xenial   # required for Python >= 3.7
     language: python
     python:
-      - "2.7"
       - "3.5"
       - "3.6"
       - "3.7"
@@ Expand Down @@