diff options
| author | Matthias Vogelgesang <matthias.vogelgesang@ipe.fzk.de> | 2011-03-16 14:02:43 +0100 |
|---|---|---|
| committer | Matthias Vogelgesang <matthias.vogelgesang@ipe.fzk.de> | 2011-03-16 14:02:43 +0100 |
| commit | 31b20f08150907fadc05e5054f4ffd04f68d2144 (patch) | |
| tree | 8f4aaf79177341bcdc709830608529d58eb204c8 | |
| parent | 426687c80bbc52474a53939d7034d45180adc1f5 (diff) | |
| download | uca-31b20f08150907fadc05e5054f4ffd04f68d2144.tar.gz uca-31b20f08150907fadc05e5054f4ffd04f68d2144.tar.bz2 uca-31b20f08150907fadc05e5054f4ffd04f68d2144.tar.xz uca-31b20f08150907fadc05e5054f4ffd04f68d2144.zip | |
Add publishing script and propagate version from top directory
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | doc/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | doc/publish.sh.in | 8 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | src/uca-cam.h | 6 | ||||
| -rw-r--r-- | src/uca.c | 3 |
6 files changed, 19 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 61972ab..fa80f94 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,10 @@ cmake_minimum_required(VERSION 2.8) project(uca) +set(UCA_VERSION_MAJOR "0") +set(UCA_VERSION_MINOR "3") +set(UCA_VERSION_PATCH "0") + add_subdirectory(src) add_subdirectory(doc) add_subdirectory(test) diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 6f9f078..ff2030a 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -5,6 +5,7 @@ find_package(Doxygen) # --- Create Doxygen source documentation by typing `make doc` if(DOXYGEN_FOUND) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile) + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/publish.sh.in ${CMAKE_CURRENT_BINARY_DIR}/publish.sh) # add 'ALL after 'doc' to create documentation, whenever you type make add_custom_target(doc diff --git a/doc/publish.sh.in b/doc/publish.sh.in new file mode 100644 index 0000000..6ae3733 --- /dev/null +++ b/doc/publish.sh.in @@ -0,0 +1,8 @@ +#!/bin/sh + +echo -n "user: " +read -e USER +echo -n "host (:~/public_html is appended): " +read -e HOST + +scp -r html/ $USER@$HOST:~/public_html/libuca-${UCA_VERSION_MAJOR}.${UCA_VERSION_MINOR}.${UCA_VERSION_PATCH} diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index fdc19dd..9c25ca7 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,9 +1,5 @@ cmake_minimum_required(VERSION 2.8) -set(UCA_VERSION_MAJOR "0") -set(UCA_VERSION_MINOR "3") -set(UCA_VERSION_PATCH "0") - # --- Set sources ------------------------------------------------------------- set(uca_SRCS uca.c @@ -145,8 +141,7 @@ target_link_libraries(uca ${uca_LIBS}) # --- Install target ---------------------------------------------------------- install(TARGETS uca - ARCHIVE DESTINATION lib - LIBRARY DESTINATION lib) + LIBRARY DESTINATION lib{LIB_SUFFIX}) install(FILES ${uca_HDRS} DESTINATION include/libuca) diff --git a/src/uca-cam.h b/src/uca-cam.h index c7e88a2..5203f8f 100644 --- a/src/uca-cam.h +++ b/src/uca-cam.h @@ -196,9 +196,9 @@ struct uca_camera_t { struct uca_grabber_t *grabber; /**< grabber associated with this camera */ enum uca_cam_state state; /**< camera state */ - uint32_t frame_width; - uint32_t frame_height; - uint32_t current_frame; + uint32_t frame_width; /**< current frame width */ + uint32_t frame_height; /**< current frame height */ + uint32_t current_frame; /**< last grabbed frame number */ void *user; /**< private user data to be used by the camera driver */ }; @@ -141,9 +141,10 @@ struct uca_t *uca_init(const char *config_filename) if (grabber != NULL) grabber->next = NULL; - /* Probe each camera that is configured */ i = 0; struct uca_camera_t *current = NULL; + /* Probe each camera that is configured and append a found camera to the + * linked list. */ while (cam_inits[i] != NULL) { struct uca_camera_t *cam = NULL; uca_cam_init init = cam_inits[i]; |