diff options
| author | Josh Blum <josh@joshknows.com> | 2011-07-29 09:45:08 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-07-29 09:45:08 -0700 |
| commit | 49330ed43307bc2fae1dacb0b12ec3186bca8249 (patch) | |
| tree | cda76a2c99aab9a9a37fe9325fdaa7ba9669eab4 | |
| parent | 043c586ff8745b0cc01ed173d23951289dbcffcf (diff) | |
| download | uhd-49330ed43307bc2fae1dacb0b12ec3186bca8249.tar.gz uhd-49330ed43307bc2fae1dacb0b12ec3186bca8249.tar.bz2 uhd-49330ed43307bc2fae1dacb0b12ec3186bca8249.zip | |
uhd: incr minor, add date to images tag, add package target to makefile
| -rw-r--r-- | host/cmake/Modules/UHDVersion.cmake | 2 | ||||
| -rw-r--r-- | images/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | images/Makefile | 6 |
3 files changed, 9 insertions, 2 deletions
diff --git a/host/cmake/Modules/UHDVersion.cmake b/host/cmake/Modules/UHDVersion.cmake index ba736d2fc..c2517a5ff 100644 --- a/host/cmake/Modules/UHDVersion.cmake +++ b/host/cmake/Modules/UHDVersion.cmake @@ -27,7 +27,7 @@ FIND_PACKAGE(Git QUIET) ######################################################################## SET(UHD_VERSION_MAJOR 003) SET(UHD_VERSION_MINOR 002) -SET(UHD_VERSION_PATCH 000) +SET(UHD_VERSION_PATCH 001) ######################################################################## # Version information discovery through git log diff --git a/images/CMakeLists.txt b/images/CMakeLists.txt index c9e5c68b9..af4d23fb0 100644 --- a/images/CMakeLists.txt +++ b/images/CMakeLists.txt @@ -22,6 +22,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6) PROJECT(UHD-images NONE) LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/../host/cmake/Modules) INCLUDE(UHDVersion) #sets version variables (used below) +EXECUTE_PROCESS(COMMAND "date" OUTPUT_VARIABLE DATETIME_NOW OUTPUT_STRIP_TRAILING_WHITESPACE) #sets the date ######################################################################## # Setup CPack @@ -41,5 +42,5 @@ MESSAGE(STATUS "Version: ${CPACK_PACKAGE_VERSION}") # Install Images ######################################################################## #tag the images with a version number (something identifiable) -FILE(WRITE ${CMAKE_SOURCE_DIR}/images/${CPACK_PACKAGE_VERSION}.tag ${UHD_BUILD_INFO}) +FILE(WRITE ${CMAKE_SOURCE_DIR}/images/${CPACK_PACKAGE_VERSION}.tag "${CPACK_PACKAGE_VERSION}-${UHD_BUILD_INFO}\n${DATETIME_NOW}\n") INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/images DESTINATION share/uhd) diff --git a/images/Makefile b/images/Makefile index e1e533b12..f0a656d0d 100644 --- a/images/Makefile +++ b/images/Makefile @@ -260,6 +260,12 @@ endif images: $(IMAGES_LIST) find $(BUILT_IMAGES_DIR) -type f | xargs chmod -x +package: + mkdir -p build + cd build && cmake -DUHD_RELEASE_MODE=OFF .. + cd build && cmake -DCPACK_GENERATOR=TGZ .. && make package + cd build && cmake -DCPACK_GENERATOR=ZIP .. && make package + clean: $(RM) -rf $(BUILT_IMAGES_DIR) $(RM) -rf $(CMAKE_BUILD_DIR) |