Commit 6509e249 authored by Éric Thiébaut's avatar Éric Thiébaut
Browse files

Shell commands renamed with an `_` separator instead of an `-`

parent ac002757
# User visible changes in TAO library API
## Versions 0.8.0
## Version 0.8.2
* Shell commands renamed with an `_` (underscore) separator instead of an `-`
(hyphen) as in Yorick and C code.
## Version 0.8.1
* Remote cameras and mirrors implement the `obj[i]` syntax to fetch the `i`-th
output image or data-frame from `obj`.
* Add `fanspeed` and `connection` configurable camera parameters.
* Pixel pre-processing activated for Phoenix cameras.
## Version 0.8.0
* A completely new camera server has been implemented. This server is much
more generic and does not use XPA messaging system. Clients communicate with
......
......@@ -51,58 +51,8 @@ libtao_alpao_la_SOURCES = \
libtao_alpao_la_LIBADD = $(ALPAO_LIBS) $(TAO_LIBS)
libtao_alpao_la_LDFLAGS = -version-info @version_info@
#TESTS = \
# test-alpao1 \
# test-alpao2 \
# test-alpao3 \
# test-alpao4
#if USE_CFITSIO
# TESTS += test-alpao5
#endif
#
bin_PROGRAMS = alpao-server
#noinst_PROGRAMS = $(TESTS)
bin_PROGRAMS = alpao_server
alpao_server_SOURCES = alpao-server.c
alpao_server_CPPFLAGS = $(COMMON_DEFS)
alpao_server_LDADD = $(COMMON_LIBS)
#
#test_alpao1_SOURCES = test-alpao1.c
#test_alpao1_LDADD = $(COMMON_LIBS)
#
#test_alpao2_SOURCES = test-alpao2.c
#test_alpao2_LDADD = $(COMMON_LIBS)
#
#test_alpao3_SOURCES = test-alpao3.c
#test_alpao3_LDADD = $(COMMON_LIBS)
#
#test_alpao4_SOURCES = test-alpao4.c
#test_alpao4_LDADD = $(COMMON_LIBS)
#
#test_alpao5_SOURCES = test-alpao5.c
#test_alpao5_CPPFLAGS = $(CFITSIO_DEFS) $(COMMON_DEFS)
#test_alpao5_LDADD = $(TAO_FITS_LIBS) $(COMMON_LIBS)
#
## FIXME: SIMDFLAGS = `$(srcdir)/../../tools/getsimdflags`
## FIXME: SIMDFLAGS = $(shell $(srcdir)/../../tools/getsimdflags)
## FIXME: see "Per-Object Flags Emulation" in automake doc.
## FIXME: alpao-convert.o: CFLAGS := $(CFLAGS) $(SIMDFLAGS)
#
#tests: test1 test2 test3 test4 test5
#
#test1: alpao-test1
# LD_LIBRARY_PATH="$(ALPAO_LIBDIR)" ./alpao-test1
#
#test2: alpao-test2
# LD_LIBRARY_PATH="$(ALPAO_LIBDIR)" ./alpao-test2
# LD_LIBRARY_PATH="$(ALPAO_LIBDIR)" ./alpao-test2 zyla
# LD_LIBRARY_PATH="$(ALPAO_LIBDIR)" ./alpao-test2 simcam
#
#test3: alpao-test3
# LD_LIBRARY_PATH="$(ALPAO_LIBDIR)" ./alpao-test3
#
#test4: alpao-test4
# LD_LIBRARY_PATH="$(ALPAO_LIBDIR)" ./alpao-test4
#
#test5: alpao-test5
# LD_LIBRARY_PATH="$(ALPAO_LIBDIR)" ./alpao-test5
......@@ -55,17 +55,17 @@ libtao_andor_la_LIBADD = $(ANDOR_LIBS) $(TAO_LIBS)
libtao_andor_la_LDFLAGS = -version-info @version_info@
TESTS = \
andor-test-1 \
andor-test-2 \
andor-test-3
andor_test_1 \
andor_test_2 \
andor_test_3
if USE_CFITSIO
TESTS += andor-test-5
TESTS += andor_test_5
endif
bin_PROGRAMS = \
andor-features \
andor-server
andor_features \
andor_server
noinst_PROGRAMS = $(TESTS)
......@@ -96,19 +96,19 @@ andor_test_5_LDADD = $(TAO_FITS_LIBS) $(COMMON_LIBS)
tests: test1 test2 test3 test4 test5
test1: andor-test-1
LD_LIBRARY_PATH="$(ANDOR_LIBDIR)" ./andor-test-1
test1: andor_test_1
LD_LIBRARY_PATH="$(ANDOR_LIBDIR)" ./andor_test_1
test2: andor-test-2
LD_LIBRARY_PATH="$(ANDOR_LIBDIR)" ./andor-test-2
LD_LIBRARY_PATH="$(ANDOR_LIBDIR)" ./andor-test-2 zyla
LD_LIBRARY_PATH="$(ANDOR_LIBDIR)" ./andor-test-2 simcam
test2: andor_test_2
LD_LIBRARY_PATH="$(ANDOR_LIBDIR)" ./andor_test_2
LD_LIBRARY_PATH="$(ANDOR_LIBDIR)" ./andor_test_2 zyla
LD_LIBRARY_PATH="$(ANDOR_LIBDIR)" ./andor_test_2 simcam
test3: andor-test-3
LD_LIBRARY_PATH="$(ANDOR_LIBDIR)" ./andor-test-3
test3: andor_test_3
LD_LIBRARY_PATH="$(ANDOR_LIBDIR)" ./andor_test_3
test4: andor-features
LD_LIBRARY_PATH="$(ANDOR_LIBDIR)" ./andor-features
test4: andor_features
LD_LIBRARY_PATH="$(ANDOR_LIBDIR)" ./andor_features
test5: andor-test-5
LD_LIBRARY_PATH="$(ANDOR_LIBDIR)" ./andor-test-5
test5: andor_test_5
LD_LIBRARY_PATH="$(ANDOR_LIBDIR)" ./andor_test_5
......@@ -124,31 +124,31 @@ libtao_fits_la_LDFLAGS = -version-info @version_info@
EXTRA_DIST = shared-methods.c intro.txt
bin_PROGRAMS = \
tao-fake-mirror-server \
tao-abort
tao_fake_mirror_server \
tao_abort
dist_bin_SCRIPTS =
noinst_PROGRAMS = $(TESTS)
TESTS = \
test-basics \
test-encodings \
test-errors \
test-pthread \
test-search \
test-semaphores \
test-shared \
test-shared-locks \
test-shared-rwlocks \
test-sleep \
test-threadpools \
test-varargs
test_basics \
test_encodings \
test_errors \
test_pthread \
test_search \
test_semaphores \
test_shared \
test_shared_locks \
test_shared_rwlocks \
test_sleep \
test_threadpools \
test_varargs
install-exec-hook:
for exe in tao-reset tao-kill tao-start tao-stop; do \
for exe in tao_reset tao_kill tao_start tao_stop; do \
rm -f "$(DESTDIR)$(bindir)/$$exe"; \
$(LN_S) tao-abort "$(DESTDIR)$(bindir)/$$exe"; \
$(LN_S) tao_abort "$(DESTDIR)$(bindir)/$$exe"; \
done
tao_fake_mirror_server_SOURCES = tao-fake-mirror-server.c
......
......@@ -87,7 +87,7 @@ typedef struct tao_shackhartmann_data_ {
tao_measured_position pos;///< Measured position (relative to the
/// reference).
double alpha;///< Intensity factor.
double epsilon;///< Quality factor.
double eta;///< Quality factor.
} tao_shackhartmann_data;
/**
......
......@@ -69,43 +69,48 @@ libtao_phoenix_la_LDFLAGS = -version-info @version_info@
#CLEANFILES = errors.c
dist_bin_SCRIPTS = \
phoenix-reload-modules
phoenix_reload_modules
bin_PROGRAMS = \
phoenix-info \
phoenix-config \
phoenix-capture \
phoenix-server
phoenix_info \
phoenix_config \
phoenix_capture \
phoenix_server
noinst_PROGRAMS = \
dump-errors \
dump_errors \
$(TESTS)
TESTS = \
test-utils
test_utils
# Settings for "phoenix_info" program:
phoenix_info_SOURCES = phoenix_info.c
phoenix_info_LDADD = $(COMMON_LIBS)
# Settings for "phoenix_config" program:
phoenix_config_SOURCES = phoenix_config.c
phoenix_config_LDADD = $(COMMON_LIBS)
# Settings for "phoenix_capture" program:
phoenix_capture_SOURCES = phoenix_capture.c
phoenix_capture_CPPFLAGS = $(CFITSIO_DEFS) $(COMMON_DEFS)
phoenix_capture_LDADD = $(TAO_FITS_LIBS) $(COMMON_LIBS)
# Settings for "phoenix_server" program:
phoenix_server_SOURCES = phoenix_server.c
phoenix_server_CPPFLAGS = $(COMMON_DEFS)
phoenix_server_LDADD = $(COMMON_LIBS)
dump_errors_SOURCES = dump_errors.c
dump_errors_CPPFLAGS = $(PHOENIX_DEFS)
dump_errors_LDADD = $(PHOENIX_LIBS)
errors.c: dump-errors
errors.c: dump_errors
rm -f $@
LD_LIBRARY_PATH="$(PHOENIX_LIBDIR)" ./dump-errors > $@
LD_LIBRARY_PATH="$(PHOENIX_LIBDIR)" ./dump_errors > $@
chmod 444 $@
test_utils_SOURCES = test-utils.c utils.c
test_utils_SOURCES = test_utils.c utils.c
test_utils_CPPFLAGS = -I$(srcdir) $(COMMON_DEFS)
test_utils_LDADD = $(TAO_LIBS)
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment