Merge pull request #390 from olebole/prepare-v2.18

Prepare version 2.18

INSTALL.md

@@ -1,44 +1,41 @@
 # Installation Instructions
 
-## Distribution Files
-
-IRAF v2.17.1 is available from github at
-
-https://github.com/iraf-community/iraf/releases/latest/
-
-
 ## System Requirements and Dependencies
 
-The distributed binaries require the readline or libedit, curl, expat,
-and zlib libraries to be installed.
+The distributed binaries require the readline or libedit, and zlib
+libraries to be installed.
 
 On Debian and its derivatives (Ubuntu, Mint, Devuan, Raspbian etc.):
 
-	$ sudo apt install gcc make bison flex zlib1g-dev
-	$ sudo apt install libcurl4-openssl-dev libexpat-dev libreadline-dev
+	$ sudo apt install gcc make bison flex zlib1g-dev libreadline-dev
 
 On Fedora and its derivatives (Redhat, Scientific Linux etc.)
 
-	$ sudo dnf install gcc make perl flex bison zlib-devel
-	$ sudo dnf install libcurl-devel expat-devel readline-devel
+	$ sudo dnf install gcc make perl flex bison zlib-devel readline-devel
 
-On MacOS X, you need to have the XCode tools installed. If you
+On macOS, you need to have the XCode tools installed. If you
 haven't, you can install them with:
 
 	$ xcode-select --install
 
 Click "Install" to download and install Xcode Command Line Tools.
 
 
-## Unpack the IRAF Distribution
+## Download and Unpack the IRAF Distribution
+
+IRAF v2.18 is available from Github at
+
+https://github.com/iraf-community/iraf/archive/refs/tags/v2.18.tar.gz
 
 The source distribution file is built as a tarball with the package
 name and version as base directory. Thus, distribution files can be
 unpacked with the command
 
-	$ tar zxf /<path>/iraf-2.17.1.tar.gz
-	$ cd iraf-2.17.1/
+	$ tar zxf /<path>/iraf-2.18.tar.gz
+	$ cd iraf-2.18/
 
+Alternatively, the development version can be always retrieved from
+the [Github repository](https://github.com/iraf-community/iraf).
 
 ## Build from Sources
 

README.contents

@@ -6,7 +6,6 @@
     Makefile		Top-level makefile
     README.contents	This file
     INSTALL.md		Installation Notes
-    RELEASE.md		IRAF Release Notes
     bin			Symbolic link to current system architecture
     dev			IRAF Device definition files
     doc			IRAF System Documentation, release notes, etc
@@ -27,9 +26,6 @@
   o  For Installation instructions see the 'INSTALL.md' file in
      this directory.
 
-  o  For a summary of what is included in this release see the 'RELEASE.md'
-     file in this directory.
-
   o  For problems or questions, please see
      https://github.com/iraf-community/iraf/discussions and
      https://github.com/iraf-community/iraf/issues

README.md

@@ -1,4 +1,4 @@
-# IRAF Release 2.17.1
+# IRAF Release 2.18
 
 [![IRAF CI test](https://github.com/iraf-community/iraf/workflows/IRAF%20CI%20test/badge.svg)](https://github.com/olebole/iraf/actions?query=workflow%3A%22IRAF+CI+test%22)
 [![GitHub release](https://img.shields.io/github/release/iraf-community/iraf.svg)](https://github.com/iraf-community/iraf/releases/latest)
@@ -12,11 +12,12 @@ of problems, including major license issues and security bugs.
 
 To keep the software away from bitrotting, and to fix bugs that are in
 the package despite (or because) of its age, the iraf-community works
-on integrating the available patches into the IRAF source code. See
-[`RELEASE.md`](RELEASE.md) for the release notes.
+on integrating the available patches into the IRAF source code.
 
-For installation instructions see the file [`INSTALL.md`](INSTALL.md)
-in this directory.
+For instructions to install from source see the file
+[`INSTALL.md`](INSTALL.md) in this directory. Installation
+instructions for binary packages on Linux or macOS can be found on the
+[Installation web page](https://iraf-community.github.io/install.html).
 
 
 ## Contributing Code, Documentation, or Feedback

doc/releases/index.rst

@@ -12,3 +12,4 @@ IRAF Release Notes
     v215revs
     v216revs
     v217revs
+    v218revs

doc/releases/v217revs.rst

@@ -6,7 +6,7 @@ IRAF 2.17.1 Release notes
 
 The current IRAF version 2.17.1 is available from github at
 
-https://github.com/iraf-community/iraf/releases/latest/
+https://github.com/iraf-community/iraf/releases/tag/v2.17.1
 
 Changes to the NOAO 2.16.1 sources include:
 

doc/releases/v218revs.rst

@@ -0,0 +1,94 @@
+IRAF 2.18 Release Notes
+=======================
+
+:Authors: IRAF Community, NOIRLab
+:Date: April 05, 2024
+
+The current IRAF version 2.18 is available from Github at
+
+https://github.com/iraf-community/iraf/releases/tag/v2.18
+
+Changes to the version 2.17.1 include:
+
+- **Integration of NOIRLab changes**
+
+  NOIRLab recently published their own 2.18 version with the scope
+  limited to the support of the Gemini data reduction pipeline. All
+  NOIRLab changes are bugfixes, based on NOAO version 2.16.1. They
+  were reviewed and (if useful) integrated into the IRAF baseline.
+  This merge also triggers the update of the major version number to
+  be in sync with the NOIRlab version.
+
+- **VOTable support removed**
+
+  This is a consequence of merging the changes from NOIRlab, resulting
+  in a significant simplification of the code. If this creates
+  significant problems to the users, we will re-add VOTable support,
+  however.
+
+- **Command Language start script renamed to irafcl**
+
+  As already done since years in several Linux distributions, the
+  **cl** and **ecl** scripts are renamed to **irafcl**. **cl** and
+  **ecl** often conflict with the Common Lisp executable names and
+  require third special effort by third parties to circumvent
+  problems. For compatibility, **cl** and **ecl** are still provided
+  as links, but their use is deprecated. Please use **irafcl**
+  instead. A man page is provided.
+
+- **Support for the LoongArch architecture**
+
+  Support for using IRAF on the Chinese LoongArch LA64 architecture
+  was added. Binaries will be provided as part of the Debian loong64
+  port.
+
+- **Bug fixes and code cleanup**
+
+  As before, a number of bugs was fixed in this release. Cleaning up
+  the code and modernization of the code structure continued. This is
+  in large parts a benefit of integrating the NOIRLab changes.
+
+
+Detailed list of changes
+------------------------
+
+This list shows all pull requests that were merged since 2.17.1.
+
+- Makefile install fixes found when creating the Debian package (`#315 <https://github.com/iraf-community/iraf/pull/315>`__)
+- Strip more files from the installed package (`#316 <https://github.com/iraf-community/iraf/pull/316>`__)
+- C tweaks to make f2c compileable on Debian/mipsel (`#317 <https://github.com/iraf-community/iraf/pull/317>`__)
+- Fix iraf$ variable for "inplace" (personal) installation (`#318 <https://github.com/iraf-community/iraf/pull/318>`__)
+- Rename ecl canonical name to irafcl (`#323 <https://github.com/iraf-community/iraf/pull/323>`__)
+- Remove version information from CITATION.cff (`#332 <https://github.com/iraf-community/iraf/pull/332>`__)
+- Remove VOTable support  (`#330 <https://github.com/iraf-community/iraf/pull/330>`__)
+- Extend (E)CL testing (`#368 <https://github.com/iraf-community/iraf/pull/368>`__)
+- NOIRLAB: Re-add the vtel package (`#343 <https://github.com/iraf-community/iraf/pull/343>`__)
+- NOIRLAB: Update observatory database  (`#344 <https://github.com/iraf-community/iraf/pull/344>`__)
+- NOIRLAB: Clean up tbtables package (`#345 <https://github.com/iraf-community/iraf/pull/345>`__)
+- NOIRLAB: Force exclusion of .git directory from processing in rmbin and rmfiles (`#362 <https://github.com/iraf-community/iraf/pull/362>`__)
+- NOIRLAB: Remove unused variabled from nttables (`#351 <https://github.com/iraf-community/iraf/pull/351>`__)
+- NOIRLAB:  Restore missing font data files in sys/gio/fonts (`#356 <https://github.com/iraf-community/iraf/pull/356>`__)
+- NOIRLAB: string buffer fix in mii_readc in "help" package (`#355 <https://github.com/iraf-community/iraf/pull/355>`__)
+- NOIRLAB: Potential xc/xpp string overflow fixes (`#349 <https://github.com/iraf-community/iraf/pull/349>`__)
+- NOIRLAB: Small fixes in IRAF system packages (`#363 <https://github.com/iraf-community/iraf/pull/363>`__)
+- NOIRLAB: Remove or comment out unused variables (`#352 <https://github.com/iraf-community/iraf/pull/352>`__)
+- NOIRLAB: Small bugfixes for libsys (`#361 <https://github.com/iraf-community/iraf/pull/361>`__)
+- NOIRLAB: Small "noao" package fixes (`#360 <https://github.com/iraf-community/iraf/pull/360>`__)
+- NOIRLAB: fixes and cleanup for the "mkpkg" tool (`#348 <https://github.com/iraf-community/iraf/pull/348>`__)
+- NOIRLAB: cosmetic change for the "generic" tool (`#347 <https://github.com/iraf-community/iraf/pull/347>`__)
+- NOIRLAB: minor libboot.a improvements (`#350 <https://github.com/iraf-community/iraf/pull/350>`__)
+- NOIRLAB: Improve (E)CL code internals (`#364 <https://github.com/iraf-community/iraf/pull/364>`__)
+- NOIRLAB: Rewrite file taken from IRAF64 (`#353 <https://github.com/iraf-community/iraf/pull/353>`__)
+- NOIRLAB: zzsetenv.def updates (`#365 <https://github.com/iraf-community/iraf/pull/365>`__)
+- NOIRLAB: several patches for libos.a (`#346 <https://github.com/iraf-community/iraf/pull/346>`__)
+- Use fpurge/__fpurge to cancel buffered output (`#366 <https://github.com/iraf-community/iraf/pull/366>`__)
+- Add support for LoongArch (`#371 <https://github.com/iraf-community/iraf/pull/371>`__)
+- Update INSTALL.md typo (`#373 <https://github.com/iraf-community/iraf/pull/373>`__)
+- New Github runner for Mac M1 (`#374 <https://github.com/iraf-community/iraf/pull/374>`__)
+- Fix problems with using f2c.e/f77.sh on plain Fortran files (`#370 <https://github.com/iraf-community/iraf/pull/370>`__)
+- Remove outdated options from XC (`#372 <https://github.com/iraf-community/iraf/pull/372>`__)
+- Provide compatibility link to mkfloat.csh (`#375 <https://github.com/iraf-community/iraf/pull/375>`__)
+- NOIRLAB: Don't add to helpdb var if no helpdb.mip (sqiid/upsqiid) (`#378 <https://github.com/iraf-community/iraf/pull/378>`__)
+- CI workflow: update actions/checkout to v4 (`#382 <https://github.com/iraf-community/iraf/pull/382>`__)
+- NOIRLAB: Add numerical recipes to libxtools for Noirlab compatibility (`#387 <https://github.com/iraf-community/iraf/pull/387>`__)
+- Allow empty IRAFARCH in irafpath() (`#388 <https://github.com/iraf-community/iraf/pull/388>`__)

pkg/cl/cl.par

@@ -20,10 +20,10 @@ menus,b,h,yes,,,Display menu when changing packages?
 showtype,b,h,no,,,Add task-type suffix in menus?
 notify,b,h,yes,,,Send done message when bkgrnd task finishes?
 szprcache,i,h,4,1,10,Size of the process cache
-version,s,h,"IRAF V2.17.1 2023",,,IRAF version
+version,s,h,"IRAF V2.18 2024",,,IRAF version
 logver,s,h,"",,,login.cl version
 logregen,b,h,no,,,Updating of login.cl to current version is advised
-release,s,h,"2.17.1",,,IRAF release
+release,s,h,"2.18",,,IRAF release
 mode,s,h,ql,,,CL mode of execution (query or query+learn)
 
 auto,s,h,a,,,The next 4 params are read-only.

pkg/ecl/cl.par

@@ -20,10 +20,10 @@ menus,b,h,yes,,,Display menu when changing packages?
 showtype,b,h,no,,,Add task-type suffix in menus?
 notify,b,h,yes,,,Send done message when bkgrnd task finishes?
 szprcache,i,h,4,1,10,Size of the process cache
-version,s,h,"IRAF V2.17.1 2023",,,IRAF version
+version,s,h,"IRAF V2.18 2024",,,IRAF version
 logver,s,h,"",,,login.cl version
 logregen,b,h,no,,,Updating of login.cl to current version is advised
-release,s,h,"2.17.1",,,IRAF release
+release,s,h,"2.18",,,IRAF release
 mode,s,h,ql,,,CL mode of execution (query or query+learn)
 
 auto,s,h,a,,,The next 4 params are read-only.

unix/boot/spp/xc.c

@@ -72,8 +72,6 @@ char *iraflibs[] = { "libex.a",
 
 char *fortlib[] = { "-lf2c",
 		    "-lm",
-		    "-lcurl",
-		    "-lexpat",
 #if (defined (__linux__) || defined (__gnu_hurd__))
 		    "-lpthread",
 #endif

unix/hlib/irafcl.man

@@ -1,5 +1,5 @@
 .\"                                      Hey, EMACS: -*- nroff -*-
-.TH CL "1" "April 2023" "IRAF 2.17.1" "IRAF commands"
+.TH CL "1" "April 2024" "IRAF 2.18" "IRAF commands"
 .SH NAME
 IRAFCL \- IRAF Command Language Interpreter
 .SH SYNOPSIS

unix/hlib/login.cl

@@ -2,7 +2,7 @@
 
 # Identify login.cl version (checked in images.cl).
 if (defpar ("logver"))
-    logver = "IRAF V2.17.1 2023"
+    logver = "IRAF V2.18 2024"
 
 set	home		= (envget("HOME") // "/.iraf/")
 set	imdir		= "home$imdir/"

unix/hlib/zzsetenv.def

@@ -42,7 +42,7 @@ set	terminal	= xgterm
 set	ttybaud		= 9600
 set	ttyncols	= 80
 set	ttynlines	= 40
-set	version		= "Community IRAF V2.17.1"
+set	version		= "Community IRAF V2.18"
 
 # System directories.