diff --git a/Makefile b/Makefile new file mode 100644 index 00000000..d53b661d --- /dev/null +++ b/Makefile @@ -0,0 +1,19 @@ +# reminder Makefile for MIRIAD + + +TIME = /usr/bin/time + +## help: This Help for given HOST +help : Makefile + @echo "HOST: `hostname`" + @sed -n 's/^##//p' $< + +## bench: standard quick benchmark +bench: + (cd install; $(TIME) ./mir.bench) + +## start: make new miriad_start files for this location +start: + ./install/make_miriad_starts + @echo "" + @echo "You can now 'source miriad_start.sh' (the appropriate) start file to add MIRIAD to your shell" diff --git a/VERSION b/VERSION index 5fe60723..9b9a2442 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -6.0.1 +6.0.2 diff --git a/VERSIONS b/VERSIONS index 088598bf..d48a9b6a 100644 --- a/VERSIONS +++ b/VERSIONS @@ -37,3 +37,13 @@ ATNF miriad: http://www.atnf.csiro.au/computing/software/miriad/ 5.x Never released - the MIR5 branch was meant to merge the ATNF and CARMA versions 6.0.0 29may20 Moved the repo from CVS to GIT, finally. + + +Branches: +--------- +MIR3 - deprecated +MIR4 - deprecated +MIR5 - deprecated +memallox - expanded 64 bit memory allocation? +rpfits225 - attempt to use the new RPFITS, only used by ATNF routines +wcslib - diff --git a/borrow/pgplot/sys_darwin/gfortran_gcc.conf b/borrow/pgplot/sys_darwin/gfortran_gcc.conf index 7e7c89d1..aadf4b30 100644 --- a/borrow/pgplot/sys_darwin/gfortran_gcc.conf +++ b/borrow/pgplot/sys_darwin/gfortran_gcc.conf @@ -46,7 +46,7 @@ # (NB. makemake prepends -c to $FFLAGC where needed) # -u now seems to cause havoc on mac - FFLAGC="-Wall -fPIC -O" + FFLAGC="-Wall -fPIC -O -std=legacy" # Mandatory. # The FORTRAN compiler flags to use when compiling fortran demo programs. diff --git a/borrow/pgplot/sys_linux/gfortran_gcc.conf b/borrow/pgplot/sys_linux/gfortran_gcc.conf index b4be5131..ab4dc2ef 100644 --- a/borrow/pgplot/sys_linux/gfortran_gcc.conf +++ b/borrow/pgplot/sys_linux/gfortran_gcc.conf @@ -40,7 +40,7 @@ # The FORTRAN compiler flags to use when compiling the pgplot library. # (NB. makemake prepends -c to $FFLAGC where needed) - FFLAGC="-u -Wall -fPIC -O" + FFLAGC="-u -Wall -fPIC -O -std=legacy" # Mandatory. # The FORTRAN compiler flags to use when compiling fortran demo programs. diff --git a/docs/install_miriad.sh b/docs/install_miriad.sh index 5347bb7d..29d5f4e8 100755 --- a/docs/install_miriad.sh +++ b/docs/install_miriad.sh @@ -3,7 +3,7 @@ # new V6.0+ install # -echo "install_miriad.sh: Version 1.0 -- 29-may-2020" +echo "install_miriad.sh: Version 1.0 -- 28-jan-2023" opt=1 miriad=miriad @@ -49,16 +49,26 @@ fi date0=$(date) -rm -rf $miriad -git clone $url $miriad -cd $miriad -git checkout $branch - - -# default use the GNU compiler -export F77=gfortran -export CC=gcc -export CXX=g++ +if [ $miriad == "." ]; then + if [ -d .git ]; then + git pull + else + echo Not a miriad with git? + exit 0 + fi +else + rm -rf $miriad + git clone $url $miriad + cd $miriad + git checkout $branch +fi + +# default use the GNU compiler +# @todo some tools don't listen to this yet +export F77=${F77:-gfortran} +export FC=${FC:-gfortran} +export CC=${CC:-gcc} +export CXX=${CXX:-g++} # if (-e $rootdir/src/tools/ercmd.c) rm $rootdir/src/tools/ercmd.c time install/install.miriad gfortran=1 generic=1 gif=1 telescope=carma diff --git a/install/compile.generic.in b/install/compile.generic.in index 9d45c2d8..38e59564 100644 --- a/install/compile.generic.in +++ b/install/compile.generic.in @@ -55,8 +55,8 @@ endif # DSO linking might need this patch for AS_NEEDED, X11 is the usual offender for libpgplot.so set X11=($need[1] -lX11 $need[2]) setenv Fcompile "@F77@" -setenv Foptions "-O $slib_flags" -setenv FoptionsN "$slib_flags" +setenv Foptions "-O -std=legacy $slib_flags" +setenv FoptionsN "-std=legacy $slib_flags" setenv Flinkdir "-L`echo $mmir/lib/$mhost $MIRXLIB | sed 's/ / -L/g'`" setenv Flinklib "$lfs -lmir -llinpack -lpgplot $wcslib $X11 -lm" setenv Finclude "-I`echo $mmir/src/inc $MIRXINC | sed 's/ / -I/g'`" diff --git a/install/make_miriad_starts b/install/make_miriad_starts index b7de2b53..738f4ecb 100755 --- a/install/make_miriad_starts +++ b/install/make_miriad_starts @@ -91,13 +91,11 @@ set sname=`uname -s` if ($sname == Linux) then echo MIRIAD installed on a Linux system - if (! -e /usr/bin/cvs) echo "Warning: cvs not present." if (! -e /usr/bin/make) echo "Warning: make not present." if (! -e /usr/bin/gfortran) echo "Warning: gfortran not present." else if ($sname == Darwin) then echo MIRIAD installed on a mac. Hold your breath... # check if Xcode installed - if (! -e /usr/bin/cvs) echo "Warning: cvs not present, did you not install Xcode?" if (! -e /usr/bin/make) echo "Warning: make not present, did you not install Xcode?" # check if HPC compiler installed if (! -e /usr/local/bin/gfortran) then diff --git a/src/subs/sma_mirRead.c b/src/subs/sma_mirRead.c index fc3e1a84..8cf5f563 100644 --- a/src/subs/sma_mirRead.c +++ b/src/subs/sma_mirRead.c @@ -231,7 +231,10 @@ #endif #include -#include +//#include // in recent glibc header this was moved. Both redhat and ubuntu now have issues finding it + // which might be solved with the lib(n)tirpc-dev(el) - seems like a messy "upgrade" to me. + // use an extra -I/usr/include/tirpc if you need this feature + // it seems this code doesn't use RPC #include #include #include diff --git a/src/sys/bin/compile.linux_gfortran b/src/sys/bin/compile.linux_gfortran index d2ae550b..87254571 100644 --- a/src/sys/bin/compile.linux_gfortran +++ b/src/sys/bin/compile.linux_gfortran @@ -26,8 +26,8 @@ else set gold="" endif setenv Fcompile "gfortran" -setenv Foptions "$gold -O -fPIC" -setenv FoptionsN "$gold -fPIC" +setenv Foptions "$gold -O -fPIC -std=legacy" +setenv FoptionsN "$gold -fPIC -std=legacy" setenv Flinkdir "-L`echo $mmir/lib/$mhost $MIRXLIB | sed 's/ / -L/g'`" setenv Flinklib "$lfs -lmir -llinpack -lpgplot $wcslib -lX11 -lm" setenv Finclude "-I`echo $mmir/src/inc $MIRXINC | sed 's/ / -I/g'`"