Commit 13a03ec4 authored by Zolnierczuk, Piotr's avatar Zolnierczuk, Piotr
Browse files

Merge branch 'pztest' into dev/docker

parents 107e2c2d c40c97eb
Loading
Loading
Loading
Loading
+3 −25
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@
.*.swp

# work directory (for tmp development)
work/*
tmp/*

# ========== LaTeX intermediate files
@@ -42,29 +43,6 @@ sources/extract_figures
sources/plain_figures
sources/mxx
#
tests/testbase
tests/testbinh
tests/testbins
tests/testcoord
tests/testdata
tests/testdmgr
tests/testecho
tests/testeshape
tests/testfileutil
tests/testfitsutil
tests/testfits
tests/testgeom
tests/testgetopt
tests/testgtyp
tests/testhisto
tests/testioutil
tests/testlogger
tests/testmatch
tests/testmath
tests/testmems
tests/testnewcom
tests/testosutils
tests/testread
tests/teststat
tests/teststrings
tests/test[a-z]*
!tests/test[a-z]*.[Ff]90
+7 −7
Original line number Diff line number Diff line
@@ -11,15 +11,15 @@ Fortran 2008 compatible compiler, for example
- Intel Fortran v12.0 or newer

### GR Framework
The report command in DrSPINE uses the GR Framework (gr-framework.org).
Follow installation instructions for the C library GR.
The DrSPINE report command uses the GR Framework (gr-framework.org).
Follow installation instructions for the C version of the GR library.

###  TeX Live
In order to rebuild the documentation or use report feature in DrSPINE
one needs full TeX Live https://www.tug.org/texlive distribution.

Note: it works "out of the box" on Ubuntu (14,16,20) and MacOS with Tex Live 2016 or newer.
RedHat/CentOS 7 requires extra packages to be downloaded from the CTAN archive.
Note: it works "out of the box" on Ubuntu (14+) and MacOS with Tex Live 2016 or newer.
RedHat/CentOS 7 requires extra packages that have to be downloaded from the CTAN archive.


### Python
@@ -49,8 +49,8 @@ The defaults should work in most cases. Edit only if needed.
    cp Makefile.def.in Makefile.def
    edit Makefile.def

There are five variables that can be adjusted in the Makefile.def file or on the command line
as parameters to make command. The defaults are usually safe.
There are several variables that can be adjusted in the Makefile.def file.
The defaults are usually safe.

	# Installation top directory
	DESTDIR=$(HOME)/local
@@ -88,7 +88,7 @@ A convenient shortcut is to add an alias to one's shell init script ($HOME/.bash
    
	alias nse=`source $HOME/local/bin/drspine_activate.sh`

so next time before running DrSPINE one would need to type 
so next time before running DrSPINE one would just type 

	nse

LICENSE.minpack

0 → 100644
+52 −0
Original line number Diff line number Diff line
Minpack Copyright Notice (1999) University of Chicago.  All rights reserved

Redistribution and use in source and binary forms, with or
without modification, are permitted provided that the
following conditions are met:

1. Redistributions of source code must retain the above
copyright notice, this list of conditions and the following
disclaimer.

2. Redistributions in binary form must reproduce the above
copyright notice, this list of conditions and the following
disclaimer in the documentation and/or other materials
provided with the distribution.

3. The end-user documentation included with the
redistribution, if any, must include the following
acknowledgment:

   "This product includes software developed by the
   University of Chicago, as Operator of Argonne National
   Laboratory.

Alternately, this acknowledgment may appear in the software
itself, if and wherever such third-party acknowledgments
normally appear.

4. WARRANTY DISCLAIMER. THE SOFTWARE IS SUPPLIED "AS IS"
WITHOUT WARRANTY OF ANY KIND. THE COPYRIGHT HOLDER, THE
UNITED STATES, THE UNITED STATES DEPARTMENT OF ENERGY, AND
THEIR EMPLOYEES: (1) DISCLAIM ANY WARRANTIES, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO ANY IMPLIED WARRANTIES
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE
OR NON-INFRINGEMENT, (2) DO NOT ASSUME ANY LEGAL LIABILITY
OR RESPONSIBILITY FOR THE ACCURACY, COMPLETENESS, OR
USEFULNESS OF THE SOFTWARE, (3) DO NOT REPRESENT THAT USE OF
THE SOFTWARE WOULD NOT INFRINGE PRIVATELY OWNED RIGHTS, (4)
DO NOT WARRANT THAT THE SOFTWARE WILL FUNCTION
UNINTERRUPTED, THAT IT IS ERROR-FREE OR THAT ANY ERRORS WILL
BE CORRECTED.

5. LIMITATION OF LIABILITY. IN NO EVENT WILL THE COPYRIGHT
HOLDER, THE UNITED STATES, THE UNITED STATES DEPARTMENT OF
ENERGY, OR THEIR EMPLOYEES: BE LIABLE FOR ANY INDIRECT,
INCIDENTAL, CONSEQUENTIAL, SPECIAL OR PUNITIVE DAMAGES OF
ANY KIND OR NATURE, INCLUDING BUT NOT LIMITED TO LOSS OF
PROFITS OR LOSS OF DATA, FOR ANY REASON WHATSOEVER, WHETHER
SUCH LIABILITY IS ASSERTED ON THE BASIS OF CONTRACT, TORT
(INCLUDING NEGLIGENCE OR STRICT LIABILITY), OR OTHERWISE,
EVEN IF ANY OF SAID PARTIES HAS BEEN WARNED OF THE
POSSIBILITY OF SUCH LOSS OR DAMAGES.
+10 −6
Original line number Diff line number Diff line
# DrSPINE Makefile

export FC     =ifort
export FCFLAGS=-g
export FC     =gfortran
export FCFLAGS=-g -O3
export LDFLAGS=$(FCFLAGS)
export INSTALL=install
export MKDIR_P=mkdir -p
@@ -9,7 +8,7 @@ export MKDIR_P=mkdir -p
-include ./Makefile.def
-include ./Makefile.version

SUBDIRS=doc python sources scripts tests examples
SUBDIRS=python sources scripts tests examples doc


all:
@@ -46,7 +45,7 @@ pylibs:
test:	libs
	@$(MAKE) -C tests

runtest: test
runtest: bins test
	@$(MAKE) -C tests run

tarball:
@@ -57,4 +56,9 @@ build-docker:
	docker build -t  $(PROJECT):$(VERSION_MAJOR).$(VERSION_MINOR) .
	docker tag       $(PROJECT):$(VERSION_MAJOR).$(VERSION_MINOR) $(PROJECT):latest

.PHONY: all bins docs clean test runtest install tarball libs pylibs distclean
# (found on the stack overflow):
help:
	@LC_ALL=C $(MAKE) -pRrq -f $(firstword $(MAKEFILE_LIST)) : 2>/dev/null | awk -v RS= -F: '/(^|\n)# Files(\n|$$)/,/(^|\n)# Finished Make data base/ {if ($$1 !~ "^[#.]") {print $$1}}' | sort | grep -E -v -e '^[^[:alnum:]]' -e '^$@$$'


.PHONY: all bins docs clean distclean test runtest install tarball libs pylibs help
+3 −3
Original line number Diff line number Diff line
# DrSPINE Makefile (version information)
export PROJECT=drspine

export VERSION_MAJOR=1
export VERSION_MINOR=4
export VERSION_RELEASE=8
export VERSION_MAJOR=2
export VERSION_MINOR=0
export VERSION_RELEASE=a4

export PROJLIB=lib$(PROJECT).a
export PROJARCH=$(PROJECT)-$(VERSION_MAJOR).$(VERSION_MINOR)
Loading