Prepare for integration with main Starlink build

- dat_par.h is now static
- Library change to libhds_v5 to match v4 scheme
- Now build with _v5 API symbols by default

Author: timj

.gitignore

@@ -7,16 +7,11 @@ autom4te.cache
 aclocal.m4
 .deps
 .libs
-*_ERR
 *_err.h
-DAT_PAR
-dat_par.h
-dat_par_h
-dat_par_f
 hdsTest
 *.log
 *.trs
-hds_ctest.h5sdf
+hds_ctest.sdf
 build-aux
 configure
 config.h
@@ -28,3 +23,5 @@ starconf.status
 config.status
 libtool
 componentinfo.dtd
+fac_200_err
+hds_types.h

Makefile.am

@@ -2,85 +2,54 @@
 
 ## bin_PROGRAMS = hdsdump
 ## dist_bin_SCRIPTS = hds_link hds_link_adam
-noinst_PROGRAMS = dat_par_f dat_par_h make-hds-types
-## starhelp_DATA = hds_machine.txt
-
-AM_CFLAGS = -g -O0
+noinst_PROGRAMS = make-hds-types
 
 # libhdsf is for fortran interface
-lib_LTLIBRARIES = libhdsh5.la
+lib_LTLIBRARIES = libhds_v5.la
 
 TESTS = hdsTest
 check_PROGRAMS = hdsTest
 
-libhdsh5_la_SOURCES = \
+libhds_v5_la_SOURCES = \
 	$(PUBLIC_INCLUDES) \
 	$(PUBLIC_CINCLUDES) \
 	$(include_MESSAGES) \
 	$(PRIVATE_INCLUDES) \
 	$(C_ROUTINES)
 
-libhdsh5_la_LIBADD = `starmem_link` `ems_link`
-
-##libhdsf_la_SOURCES = \
-##	$(F_ROUTINES) \
-##	$(F_C_ROUTINES) \
-##	$(BLOCK_DATA_FILES)
-
-##libhdsf_la_LIBADD = `ems_link`
+libhds_v5_la_LIBADD = `starmem_link` `ems_link` `one_link` -lhdf5 -lhdf5_hl
 
 # Make all library code position independent. This is handy for creating
 # shareable libraries from the static ones (Java JNI libraries).
 if !NOPIC
-libhdsh5_la_CFLAGS = $(AM_CFLAGS) -prefer-pic
-libhdsh5_la_FCFLAGS = $(AM_FCFLAGS) -prefer-pic
-libhdsf_la_CFLAGS = $(AM_CFLAGS) -prefer-pic
-libhdsf_la_FCFLAGS = $(AM_FCFLAGS) -prefer-pic
+libhds_v5_la_CFLAGS = $(AM_CFLAGS) -prefer-pic
 endif
 
-## hds_machine_SOURCES = hds_machine.c
-## hds_machine_LDADD = libhds.la `ems_link` `cnf_link` `starmem_link`
-
-dat_par_h_SOURCES = dat_par_h.c
-dat_par_f_SOURCES = dat_par_f.c
 make_hds_types_SOURCES = make-hds-types.c
 
-## hdsdump_SOURCES = hds_dev/hdsdump.c
-## hdsdump_LDADD = libhds.la `ems_link` `cnf_link` `starmem_link`
-
-# Try to make sure that hds_types.h is built early
-# This does not seem to work right in conjunction with BUILT_SOURCES
-dat_par_f_DEPENDENCIES = hds_types.h hds1_types.h
-dat_par_h_DEPENDENCIES = hds_types.h hds1_types.h dat1.h
-
-## hds_test_SOURCES = hds_test.f
-## hds_test_LDADD = libhdsf.la libhds.la `ems_link` `chr_link` `cnf_link`
-
 hdsTest_SOURCES = hdsTest.c
-hdsTest_LDADD = libhdsh5.la `ems_link` `one_link`
+hdsTest_LDADD = libhds_v5.la
 
 ## hds_test_prm_SOURCES = hds_test_prm.c
 ## hds_test_prm_LDADD = libhds.la `ems_link` `cnf_link` `cnf_link`
 
 cincludedir = $(includedir)/star
 cinclude_HEADERS = $(PUBLIC_CINCLUDES)
 include_HEADERS = $(PUBLIC_INCLUDES)
-include_MESSAGES = CMP_ERR DAT_ERR dat_err.h
-
-## stardocs_DATA = @STAR_LATEX_DOCUMENTATION@
+noinst_MESSAGES = dat_err.h
 
 # dat_par.h was previously released so must go in the root include dir
-PUBLIC_CINCLUDES = hds.h hds_types.h hds_fortran.h
-PUBLIC_INCLUDES = DAT_PAR dat_par.h
+PUBLIC_CINCLUDES = hds_v5.h hds_types.h
 
 PRIVATE_INCLUDES = \
+	hds_h dat_par.h
 	hds1_types.h \
 	dat1.h \
 	$(noinst_MESSAGES)
 
 C_ROUTINES = \
 	$(PUBLIC_C_ROUTINES) \
-	$(PRIVATE_C_ROUTINES) $(F_C_ROUTINES)
+	$(PRIVATE_C_ROUTINES)
 
 PUBLIC_C_ROUTINES = \
 datAlter.c \
@@ -192,37 +161,21 @@ dau1CheckType.c \
 dau1HdsType.c \
 dau1Native2MemType.c
 
-F_C_ROUTINES = \
-fortran_interface.c \
-hdsDimC2F.c \
-hdsDimF2C.c
-
-DAT_PAR: dat_par_f$(EXEEXT)
-	./dat_par_f > DAT_PAR
-
-dat_par.h: dat_par_h$(EXEEXT)
-	./dat_par_h > dat_par.h
-
 hds_types.h: make-hds-types$(EXEEXT)
 	./make-hds-types
 
 hds1_types.h: make-hds-types$(EXEEXT)
 	./make-hds-types
 
-#hds_machine.txt: hds_machine$(EXEEXT)
-#	echo "Machine characteristics, as determined by HDS" >$@
-#	echo "" >>$@
-#	./hds_machine >>$@
-
 # Have to make sure that hds_types appears before DAT_PAR so that
 # the include file generation routines are built in the correct order
 BUILT_SOURCES = hds_types.h hds1_types.h \
-	$(include_MESSAGES) $(noinst_MESSAGES) DAT_PAR dat_par.h
+	$(include_MESSAGES) $(noinst_MESSAGES)
 
-CLEANFILES = DAT_PAR dat_par.h CMP_ERR DAT_ERR dat_err.h \
+CLEANFILES = dat_err.h \
 	hds_types.h hds1_types.h
 
 ## dist_starnews_DATA = hds.news
 
-EXTRA_DIST = cmp_err.msg dat_err.msg
+EXTRA_DIST = dat_err.msg
 

cmp_err.msg

@@ -2,9 +2,9 @@
 <!DOCTYPE component SYSTEM "componentinfo.dtd">
 <!-- component.xml.  Generated from component.xml.in by configure. -->
 
-<component id="hdsonhdf5" support="S">
+<component id="hds-v5" support="S">
   <version>5.1-1</version>
-  <path>libraries/hdsonhdf5</path>
+  <path>libext/hds-v5</path>
   <description>Hierarchical Data System layered on HDF5</description>
   <abstract>
     <p>HDS is a file-based hierarchical data system designed for the
@@ -28,15 +28,15 @@
       software.</p>
   </abstract>
   <dependencies >
-    <build>sae</build><build>chr</build><build>cnf</build><build>ems</build><build>one</build><build>prm</build><build>starmem</build><link>chr</link><link>cnf</link><link>ems</link><link>one</link><link>starmem</link><test>chr</test><test>cnf</test><test>ems</test><test>prm</test><test>starmem</test><sourceset>star2html</sourceset><sourceset>messgen</sourceset>
+    <build>sae</build><build>chr</build><build>cnf</build><build>ems</build><build>one</build><build>prm</build><build>starmem</build><link>chr</link><link>cnf</link><link>ems</link><link>one</link><link>starmem</link><link>one</link><test>chr</test><test>cnf</test><test>ems</test><test>prm</test><test>starmem</test><sourceset>messgen</sourceset>
   </dependencies>
   <developers>
     <person>
       <name>Tim Jenness</name>
       <role>owner</role>
     </person>
   </developers>
-  <documentation> sun92</documentation>
+  <documentation></documentation>
   <bugreports>starlink@jiscmail.ac.uk</bugreports>
   <!-- <notes><p></p></notes> -->
 </component>

component.xml

@@ -4,7 +4,7 @@
 
 <component id="@PACKAGE@" support="S">
   <version>@PACKAGE_VERSION@</version>
-  <path>libraries/hdsonhdf5</path>
+  <path>libext/hds-v5</path>
   <description>Hierarchical Data System layered on HDF5</description>
   <abstract>
     <p>HDS is a file-based hierarchical data system designed for the

component.xml.in

@@ -2,7 +2,7 @@ dnl    Process this file with autoconf to produce a configure script
 AC_REVISION($Revision$)
 
 dnl    Initialisation: package name and version number
-AC_INIT([hdsonhdf5],[5.1-1],[starlink@jiscmail.ac.uk])
+AC_INIT([hds-v5],[5.1-1],[starlink@jiscmail.ac.uk])
 AC_CONFIG_AUX_DIR([build-aux])
 
 dnl    Require autoconf-2.50 at least
@@ -17,15 +17,6 @@ AC_CONFIG_SRCDIR([hdsTest.c])
 dnl    Include defaults for Starlink configurations
 STAR_DEFAULTS
 
-dnl    Define _POSIX_C_SOURCE to be used in all routines. This was
-dnl    declared in the old header file "hds1_feature.h", but we need
-dnl    to make sure all feature-level defines are included in the autoconf
-dnl    tests (this is important for large file support under Solaris, which
-dnl    does not define _LARGEFILE_SOURCE without _POSIX_C_SOURCE).
-AC_DEFINE([_POSIX_C_SOURCE], [200112L], [Specify the version of the POSIX
-standard we want to work with (should provide POSIX.1, POSIX.2 and POSIX.4,
-if available)])
-
 dnl    Find required versions of the programs we need for configuration
 AC_PROG_CC
 AC_PROG_FC
@@ -45,8 +36,6 @@ dnl    by operating system
 AC_HEADER_STDC
 AC_CHECK_HEADERS(stddef.h)
 AC_CHECK_HEADERS(unistd.h)
-AC_CHECK_HEADERS([sys/param.h])
-AC_CHECK_HEADERS(inttypes.h)
 
 dnl    Check for largefile support (various macros and fseeko).
 dnl    Make sure we don't use the cached version for this (can
@@ -67,17 +56,13 @@ AC_CHECK_SIZEOF(size_t)
 
 dnl    Declare the build and use dependencies for this package
 STAR_DECLARE_DEPENDENCIES([build], [sae chr cnf ems one prm starmem])
-STAR_DECLARE_DEPENDENCIES([link],  [chr cnf ems one starmem])
+STAR_DECLARE_DEPENDENCIES([link],  [chr cnf ems one starmem one])
 STAR_DECLARE_DEPENDENCIES([test],  [chr cnf ems prm starmem])
 
-dnl    List the sun/ssn/... numbers which document this package and
-dnl    which are present as .tex files in this directory.
-STAR_LATEX_DOCUMENTATION(sun92)
-
 dnl    There are two .msg files in this directory, so we need to specify
 dnl    the names of them explicitly, rather than them being defaulted from
 dnl    the package name.
-STAR_MESSGEN([cmp_err.msg dat_err.msg])
+STAR_MESSGEN([dat_err.msg])
 
 AM_CONFIG_HEADER(config.h)
 

configure.ac

@@ -103,19 +103,7 @@ typedef enum {
 
 /* Global Constants:                                                        */
 /* ================                                                         */
-/* The following are "public" values. Copies are made available externally  */
-/* in the dat_par.h and dat_par(.f) files.                                  */
-#define DAT__MXDIM 7             /* Maximum number of object dimensions     */
-#define DAT__NOLOC "<NOT A LOCATOR> "/* Null (invalid) locator value        */
-#define DAT__NOWLD 0             /* Null wild-card search context           */
-#define DAT__ROOT  "<ROOT LOCATOR>  "/* Root locator value                  */
-#define DAT__SZGRP 15            /* Size of group name                      */
-#define DAT__SZLOC 16            /* Size of Fortran locator string          */
-#define DAT__SZMOD 15            /* Size of access mode string              */
-#define DAT__SZNAM 15            /* Size of object name                     */
-#define DAT__SZTYP 15            /* Size of type string                     */
-#define DAT__FLEXT ".h5sdf"      /* Default HDS file extension              */
-#define DAT__SZFLX 6             /* Length of DAT__FLEXT                    */
+#include "dat_par.h"
 
 /* Internal Constants */
 #define DAT__MXCHR 0xffff        /* Max characters in a character data type */

dat1.h

@@ -0,0 +1,85 @@
+#if !defined( DAT_PAR_INCLUDED ) /* dat_par.h already included? */
+#define DAT_PAR_INCLUDED 1
+/*
+*+
+*  Name:
+*     dat_par.h
+
+*  Purpose:
+*     Define public global constants for the dat_ and hds_ routines.
+
+*  Language:
+*     ANSI C
+
+*  Type of Module:
+*     Global constants (macro) include file.
+
+*  Description:
+*     This file contains macro definitions for global constants which
+*     are used by the dat_ and hds_ routines within the HDS package and
+*     which may also be needed by software which calls these routines.
+
+*  Copyright:
+*     Copyright (C) 1998 Central Laboratory of the Research Councils
+
+*  Authors:
+*     Generated automatically by the dat_par_h program.
+*     {enter_new_authors_here}
+
+*  History:
+*     {enter_changes_here}
+
+*-
+*/
+
+/* Remove earlier definitions if clash with private dat1.h version */
+#ifdef DAT__MXDIM
+#undef DAT__MXDIM
+#endif
+#ifdef DAT__NOLOC
+#undef DAT__NOLOC
+#endif
+#ifdef DAT__NOWLD
+#undef DAT__NOWLD
+#endif
+#ifdef DAT__ROOT
+#undef DAT__ROOT
+#endif
+#ifdef DAT__SZGRP
+#undef DAT__SZGRP
+#endif
+#ifdef DAT__SZLOC
+#undef DAT__SZLOC
+#endif
+#ifdef DAT__SZMOD
+#undef DAT__SZMOD
+#endif
+#ifdef DAT__SZNAM
+#undef DAT__SZNAM
+#endif
+#ifdef DAT__SZTYP
+#undef DAT__SZTYP
+#endif
+#ifdef DAT__FLEXT
+#undef DAT__FLEXT
+#endif
+#ifdef DAT__SZFLX
+#undef DAT__SZFLX
+#endif
+
+/* Global Constants: */
+
+#define DAT__MXDIM 7            /* Maximum number of object dimensions  */
+#define DAT__NOLOC "<NOT A LOCATOR> " /* Null (invalid) locator value */
+#define DAT__NOWLD 0            /* Null wild-card search context */
+#define DAT__ROOT "<ROOT LOCATOR>  " /* Root locator value */
+#define DAT__SZGRP 15            /* Size of group name */
+#define DAT__SZLOC 16            /* Size of locator */
+#define DAT__SZMOD 15            /* Size of access mode string */
+#define DAT__SZNAM 15            /* Size of object name */
+#define DAT__SZTYP 15            /* Size of type string */
+#define DAT__SZFLX 4            /* Size of file extension DAT__FLEXT */
+#define DAT__FLEXT ".sdf" /* Default HDS file extension */
+
+/*. */
+#endif