-
Notifications
You must be signed in to change notification settings - Fork 211
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
New Wrap: cfitsio-4.5.0 #1767
Open
kjmeagher
wants to merge
1
commit into
mesonbuild:master
Choose a base branch
from
kjmeagher:cfitsio-4.5.0
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
New Wrap: cfitsio-4.5.0 #1767
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
[wrap-file] | ||
directory = cfitsio-4.5.0 | ||
source_url = https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio-4.5.0.tar.gz | ||
source_filename = cfitsio-4.5.0.tar.gz | ||
source_hash = e4854fc3365c1462e493aa586bfaa2f3d0bb8c20b75a524955db64c27427ce09 | ||
patch_directory = cfitsio | ||
|
||
[provide] | ||
cfitsio = cfitsio_dep |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,263 @@ | ||
project( | ||
'cfitsio', | ||
'c', | ||
version: '4.5.0', | ||
meson_version: '>=1.1.0', | ||
license: 'CFITSIO', | ||
license_files: ['licenses/License.txt'], | ||
) | ||
SOVERSION = 10 | ||
|
||
cc = meson.get_compiler('c') | ||
libm = cc.find_library('m', required: false) | ||
zlib = dependency('zlib', method: 'pkg-config', required:true, fallback: ['zlib', 'zlib_dep']) | ||
deps = [libm,zlib] | ||
has_fortran = false | ||
|
||
if host_machine.system() == 'windows' | ||
has_fortran = false | ||
add_project_arguments('-Dcfitsio_EXPORTS', language: 'c') | ||
else | ||
has_fortran = add_languages( | ||
'fortran', | ||
native: false, | ||
required: get_option('fortran'), | ||
) | ||
|
||
bzip2 = cc.find_library('bzip2', required: false) | ||
if not bzip2.found() | ||
bzip2_proj = subproject('bzip2') | ||
bzip2 = bzip2_proj.get_variable('bzip2_dep') | ||
endif | ||
if bzip2.found() | ||
add_project_arguments('-DHAVE_BZIP2=1', language: 'c') | ||
deps += bzip2 | ||
endif | ||
|
||
threads = dependency('threads', required: get_option('reentrant')) | ||
if threads.found() | ||
add_project_arguments('-D_REENTRANT', language: 'c') | ||
deps += threads | ||
endif | ||
|
||
curl = dependency( | ||
'libcurl', | ||
method: 'pkg-config', | ||
required: get_option('curl'), | ||
) | ||
if curl.found() | ||
add_project_arguments('-DCFITSIO_HAVE_CURL', language: 'c') | ||
deps += curl | ||
endif | ||
endif | ||
|
||
if get_option('hera') | ||
add_project_arguments('-DBUILD_HERA=1', language: 'c') | ||
endif | ||
|
||
if cc.has_header('unistd.h') | ||
add_project_arguments('-DHAVE_UNISTD_H', language: 'c') | ||
if cc.has_header_symbol('unistd.h', 'ftruncate') | ||
add_project_arguments('-DHAVE_FTRUNCATE', language: 'c') | ||
endif | ||
else | ||
add_project_arguments('-DYY_NO_UNISTD_H', language: 'c') | ||
endif | ||
|
||
if cc.has_function('gethostbyname') and cc.has_function('connect') | ||
add_project_arguments('-DHAVE_NET_SERVICES', language: 'c') | ||
if cc.has_header_symbol('stdio.h', 'fmemopen') | ||
add_project_arguments('-DHAVE_FMEMOPEN', language: 'c') | ||
endif | ||
endif | ||
|
||
shmem_prefix = [ | ||
'#include <sys/ipc.h>', | ||
'#include <sys/shm.h>', | ||
'#include <sys/sem.h>', | ||
] | ||
flock_prefix = ['#include <sys/flock.h>'] | ||
|
||
have_shmem_services = true | ||
foreach func : ['shmat', 'shmdt', 'shmget', 'semget'] | ||
have_shmem_services = have_shmem_services and cc.has_function( | ||
func, | ||
prefix: shmem_prefix, | ||
) | ||
endforeach | ||
if have_shmem_services | ||
add_project_arguments('-DHAVE_SHMEM_SERVICES', language: 'c') | ||
if cc.has_type('flock_t', prefix: flock_prefix) | ||
add_project_arguments('-DHAVE_FLOCK_T', language: 'c') | ||
endif | ||
if cc.has_type('union semun', prefix: shmem_prefix) | ||
add_project_arguments('-DHAVE_UNION_SEMUN', language: 'c') | ||
endif | ||
endif | ||
|
||
if cc.has_type('long long') | ||
add_project_arguments('-DHAVE_LONGLONG', language: 'c') | ||
endif | ||
|
||
install_headers('fitsio.h', 'fitsio2.h', 'longnam.h') | ||
|
||
libcfitsio_SOURCES = [ | ||
'buffers.c', | ||
'cfileio.c', | ||
'checksum.c', | ||
'drvrfile.c', | ||
'drvrmem.c', | ||
'drvrnet.c', | ||
'drvrsmem.c', | ||
'editcol.c', | ||
'edithdu.c', | ||
'eval_l.c', | ||
'eval_y.c', | ||
'eval_f.c', | ||
'fitscore.c', | ||
'getcol.c', | ||
'getcolb.c', | ||
'getcold.c', | ||
'getcole.c', | ||
'getcoli.c', | ||
'getcolj.c', | ||
'getcolk.c', | ||
'getcoll.c', | ||
'getcols.c', | ||
'getcolsb.c', | ||
'getcoluk.c', | ||
'getcolui.c', | ||
'getcoluj.c', | ||
'getkey.c', | ||
'group.c', | ||
'grparser.c', | ||
'histo.c', | ||
'iraffits.c', | ||
'modkey.c', | ||
'putcol.c', | ||
'putcolb.c', | ||
'putcold.c', | ||
'putcole.c', | ||
'putcoli.c', | ||
'putcolj.c', | ||
'putcolk.c', | ||
'putcoluk.c', | ||
'putcoll.c', | ||
'putcols.c', | ||
'putcolsb.c', | ||
'putcolu.c', | ||
'putcolui.c', | ||
'putcoluj.c', | ||
'putkey.c', | ||
'region.c', | ||
'scalnull.c', | ||
'swapproc.c', | ||
'wcssub.c', | ||
'wcsutil.c', | ||
'imcompress.c', | ||
'quantize.c', | ||
'ricecomp.c', | ||
'pliocomp.c', | ||
'fits_hcompress.c', | ||
'fits_hdecompress.c', | ||
'simplerng.c', | ||
'zcompress.c', | ||
'zuncompress.c', | ||
] | ||
|
||
if has_fortran | ||
libcfitsio_SOURCES += [ | ||
'f77_wrap1.c', | ||
'f77_wrap2.c', | ||
'f77_wrap3.c', | ||
'f77_wrap4.c', | ||
] | ||
endif | ||
|
||
libcfitsio = library( | ||
'cfitsio', | ||
libcfitsio_SOURCES, | ||
dependencies: deps, | ||
version: meson.project_version(), | ||
soversion: SOVERSION, | ||
install: true, | ||
) | ||
message('libcfitsio: '+libcfitsio.name()+' '+libcfitsio.full_path()) | ||
|
||
cfitsio_dep = declare_dependency( | ||
link_with: libcfitsio, | ||
) | ||
|
||
pkg = import('pkgconfig') | ||
pkg.generate( | ||
libraries: libcfitsio, | ||
version: meson.project_version(), | ||
name: 'cifitsio', | ||
description: 'FITS File Subroutine Library', | ||
url: 'https://heasarc.gsfc.nasa.gov/fitsio/', | ||
) | ||
|
||
if get_option('utils') | ||
executable( | ||
'fitscopy', | ||
'utilities/fitscopy.c', | ||
dependencies: cfitsio_dep, | ||
install: true, | ||
) | ||
executable( | ||
'fitsverify', | ||
'utilities/ftverify.c', | ||
'utilities/fvrf_data.c', | ||
'utilities/fvrf_file.c', | ||
'utilities/fvrf_head.c', | ||
'utilities/fvrf_key.c', | ||
'utilities/fvrf_misc.c', | ||
c_args: '-DSTANDALONE', | ||
dependencies: cfitsio_dep, | ||
install: true, | ||
) | ||
executable( | ||
'fpack', | ||
'utilities/fpack.c', | ||
'utilities/fpackutil.c', | ||
dependencies: [libm, cfitsio_dep], | ||
install: true, | ||
) | ||
executable( | ||
'funpack', | ||
'utilities/funpack.c', | ||
'utilities/fpackutil.c', | ||
dependencies: [libm,cfitsio_dep], | ||
link_with: libcfitsio, | ||
install: true, | ||
) | ||
endif | ||
|
||
test( | ||
'cookbook', | ||
executable('cookbook', 'utilities/cookbook.c', link_with: libcfitsio), | ||
) | ||
cmp = find_program('test_compare.py') | ||
testprog = executable( | ||
'testprog', | ||
'utilities/testprog.c', | ||
dependencies: cfitsio_dep, | ||
) | ||
test('testprog', cmp, args: [testprog, meson.current_source_dir()]) | ||
if has_fortran | ||
testf77 = executable( | ||
'testf77', | ||
'utilities/testf77.f', | ||
dependencies: cfitsio_dep, | ||
) | ||
test('testf77', cmp, args: [testf77, meson.current_source_dir()]) | ||
endif | ||
|
||
# this benchmark uses POSIX sys/time.h which isn't available on msvc | ||
if cc.get_id() != 'msvc' | ||
benchmark( | ||
'speed', | ||
executable('speed', 'utilities/speed.c', dependencies: cfitsio_dep), | ||
) | ||
endif | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
option( | ||
'curl', | ||
type: 'feature', | ||
description: 'Enable linking with the curl library. Enables remote file i/o support', | ||
) | ||
option( | ||
'reentrant', | ||
type: 'feature', | ||
description: 'Enable reentrant multithreading', | ||
) | ||
option( | ||
'utils', | ||
type: 'boolean', | ||
description: 'Build fpack, funpack, fitscopy, and fitsverify executables', | ||
) | ||
option('hera', type: 'boolean', description: 'Build for HERA (ASD use only)') | ||
option( | ||
'bzip2', | ||
type: 'feature', | ||
description: 'Enable bzip2 support. Optional path to the location of include/bzlib.h and lib/libbz2', | ||
) | ||
option( | ||
'fortran', | ||
type: 'feature', | ||
description: 'Build package with Fortran support', | ||
) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
#!/usr/bin/env python3 | ||
|
||
""" | ||
cfitsio instructs the user build test executeables, run them, and then compare | ||
the output to provided reference files. This python file does that in a | ||
portable way integrated into meson's test framework | ||
""" | ||
|
||
import sys | ||
from pathlib import Path | ||
import subprocess | ||
|
||
test_exe = Path(sys.argv[1]) | ||
src_dir = Path(sys.argv[2]) | ||
name = test_exe.name.split('.')[0] | ||
|
||
input_name = src_dir / (name + ".tpt") | ||
output_ref = src_dir / (name + ".out") | ||
fits_ref = src_dir / (name + ".std") | ||
|
||
print(f"input file: {input_name} found : {input_name.is_file()}") | ||
print(f"output reference: {output_ref} found : {output_ref.is_file()}") | ||
print(f"fits reference: {fits_ref} found : {fits_ref.is_file()}") | ||
|
||
r = subprocess.run(test_exe.absolute(), cwd=src_dir, capture_output=True) | ||
if r.returncode: | ||
print(r"test returned non zero: {r.returncode}") | ||
exit(r.returncode) | ||
|
||
out_are_same = r.stdout.splitlines() == open(output_ref, "rb").read().splitlines() | ||
print(f"Outputs are the same: {out_are_same}") | ||
fits_are_same = ( | ||
open(fits_ref, "rb").read() == open(src_dir / (name + ".std"), "rb").read() | ||
) | ||
print(f"Fits are the same: {fits_are_same}") | ||
|
||
exit(int(not fits_are_same) * 2 + int(not out_are_same)) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
... and as we see here the option does indeed claim it will control building, not control installing.