Merge pull request #330 from olebole/remove-libvotable-cfitsio

Remove VOTable support

Makefile

@@ -40,7 +40,7 @@ export RANLIB = ranlib
 export CFLAGS ?= -g -O2
 export XC_CFLAGS = $(CPPFLAGS) $(CFLAGS)
 
-.PHONY: all sysgen clean test arch noao host novos core vendor bindirs bin_links config inplace starttime
+.PHONY: all sysgen clean test arch noao host novos core bindirs bin_links config inplace starttime
 
 all:: sysgen
 
@@ -72,18 +72,12 @@ host: novos
  $(MAKE) -C $(host) bindir=$(hbin) boot/install
  $(MAKE) -C $(host) clean
 
-# Build vendor libs (cfitsio and libvotable)
-vendor: host
- $(MAKE) -C $(iraf)vendor \
- includedir=$(iraf)include/ bindir=$(bin) install
- $(MAKE) -C $(iraf)vendor clean
-
 # Build the core system.
-core: host vendor
+core: host
  $(MKPKG)
 
 # Build the NOAO package.
-noao: host vendor core
+noao: host core
  cd $(noao) && $(MKPKG) -p noao
 
 # Run the test suite.
@@ -94,7 +88,6 @@ test:
 # by generic, xyacc and similar.
 clean:
  $(MAKE) -C unix clean
- $(MAKE) -C vendor clean
  find ./local ./math ./pkg ./sys ./noao/[adfimnorst]* \
  -type f -name \*.\[aeo\] -exec rm -f {} \;
  rm -f $(bin)/* noao/bin$(arch)/* $(hbin)* .build_started \

doc/releases/v217revs.rst

@@ -81,8 +81,7 @@ Changes to the NOAO 2.16.1 sources include:
  an external package
  <https://iraf-community.github.io/iraf-v216/issues/90>`__. Therefore,
  no attempt was put into getting these problems fixed, and the VO
- stuff was cut out. The VOTable functionality, however, remains
- available
+ stuff was cut out.
 
 Detailed list of changes
 ------------------------

pkg/tbtables/tbfpri.x

@@ -48,7 +48,7 @@ int exists # YES if the file exists
 int blocksize
 int nchar
 int morekeys # extra space (none) in primary header
-int fnroot(), fnextn(), tbparse(), tbttyp(), vot_to_fits()
+int fnroot(), fnextn(), tbparse(), tbttyp()
 int access(), strncmp()
 bool is_votable()
 errchk tbferr, tbparse, tbttyp, vfn_expand_ldir
@@ -92,12 +92,6 @@ begin
 
  if (access (Memc[cnv], 0, 0) == NO) {
  call fcadd ("cache$", Memc[url], "", Memc[intbl], SZ_PATHNAME)
- if (access (Memc[cnv],0,0) == YES && is_votable (Memc[cnv])) {
- if (vot_to_fits (Memc[intbl], Memc[intbl]) != OK) {
- call error (ER_TBCONVERT,
- "tbtopn: cannot convert table format")
- }
- }
  } else
  call strcpy (Memc[cnv], Memc[intbl], SZ_PATHNAME)
  } else

pkg/tbtables/tbtopn.x

@@ -60,8 +60,8 @@ char url[SZ_PATHNAME], tblname[SZ_PATHNAME]
 char osfn[SZ_PATHNAME], cnvname[SZ_PATHNAME], cosfn[SZ_PATHNAME]
 
 long tbtbod()
-int tbnparse(), tbttyp(), strncmp(), access(), vot_to_fits()
-bool streq(), is_votable()
+int tbnparse(), tbttyp(), strncmp(), access()
+bool streq()
 
 errchk malloc, tbuopn, tbsopn, tbctpe, tbnparse, tbttyp, vfn_expand_ldir
 
@@ -88,12 +88,6 @@ begin
  if (access (cnvname, 0, 0) == NO) {
  #call fcadd ("cache$", url, "fits", tblname, SZ_PATHNAME)
  call fcadd ("cache$", url, "", tblname, SZ_PATHNAME)
- if (access (cnvname,0,0) == YES && is_votable (cnvname)) {
- if (vot_to_fits (tblname, tblname) != OK) {
- call error (ER_TBCONVERT, 
- "tbtopn: cannot convert table format")
- }
- }
  } else
  call strcpy (cnvname, tblname, SZ_PATHNAME)
 
@@ -114,28 +108,6 @@ begin
  if (access (cnvname, 0, 0) == NO) {
  call fcadd ("cache$", tablename[lstart], "fits", tblname,
  SZ_PATHNAME)
- if (access (cnvname,0,0) == YES && is_votable (cnvname)) {
- if (vot_to_fits (tblname, tblname) != OK) {
- call error (ER_TBCONVERT, 
- "tbtopn: cannot convert table format")
- }
- }
- } else
- call strcpy (cnvname, tblname, SZ_PATHNAME)
-
- } else if (is_votable (tablename)) {
- call fcname ("cache$", tablename, "f", tblname, SZ_PATHNAME)
- call strcpy (tblname, cnvname, SZ_PATHNAME)
- call strcat (".fits", cnvname, SZ_PATHNAME)
-
- if (access (cnvname, 0, 0) == NO) {
- call fcadd ("cache$", tablename, "fits", tblname, SZ_PATHNAME)
- if (access (cnvname,0,0) == YES && is_votable (cnvname)) {
- if (vot_to_fits (tblname, cnvname) != OK) {
- call error (ER_TBCONVERT, 
- "tbtopn: cannot convert table format")
- }
- }
  } else
  call strcpy (cnvname, tblname, SZ_PATHNAME)