kopia lustrzana https://github.com/f4exb/sdrangel
Cache version numbers, so they can be used in other scripts
rodzic
ad7c08d05c
commit
9a6ade37d9
|
@ -43,7 +43,11 @@ jobs:
|
||||||
echo github.workspace: ${{ github.workspace }}
|
echo github.workspace: ${{ github.workspace }}
|
||||||
- name: Get version
|
- name: Get version
|
||||||
id: get_version
|
id: get_version
|
||||||
run: echo "version=$(git describe --tags | cut -c2-)" >> $env:GITHUB_OUTPUT
|
run: echo "version=$(grep sdrangel_VERSION CMakeCache.txt | cut -d "=" -f2)" >> $env:GITHUB_OUTPUT
|
||||||
|
#run: echo "version=$(git describe --tags | cut -c2-)" >> $env:GITHUB_OUTPUT
|
||||||
|
- name: Diplay version
|
||||||
|
run:
|
||||||
|
echo ${{ steps.get_version.outputs.version }}
|
||||||
- name: Install basic dependencies on Windows
|
- name: Install basic dependencies on Windows
|
||||||
if: startsWith(matrix.config.os, 'windows')
|
if: startsWith(matrix.config.os, 'windows')
|
||||||
run: |
|
run: |
|
||||||
|
@ -107,7 +111,8 @@ jobs:
|
||||||
# Need with clause so git describe --tags works
|
# Need with clause so git describe --tags works
|
||||||
- name: Get version
|
- name: Get version
|
||||||
id: get_version
|
id: get_version
|
||||||
run: echo "version=$(git describe --tags | cut -c2-)" >> $GITHUB_OUTPUT
|
run: echo "version=$(grep CPACK_PACKAGE_FILE_NAME CMakeCache.txt | cut -d "=" -f2)" >> $GITHUB_OUTPUT
|
||||||
|
#
|
||||||
# Requires git fetch --tags upstream to have been run on the branch!
|
# Requires git fetch --tags upstream to have been run on the branch!
|
||||||
# git remote add upstream https://github.com/f4exb/sdrangel.git
|
# git remote add upstream https://github.com/f4exb/sdrangel.git
|
||||||
# git fetch --tags upstream
|
# git fetch --tags upstream
|
||||||
|
|
|
@ -173,7 +173,7 @@ if(GIT_FOUND AND EXISTS "${CMAKE_SOURCE_DIR}/.git/")
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
set(sdrangel_VERSION "${sdrangel_VERSION_MAJOR}.${sdrangel_VERSION_MINOR}.${sdrangel_VERSION_PATCH}${sdrangel_VERSION_SUFFIX}")
|
set(sdrangel_VERSION "${sdrangel_VERSION_MAJOR}.${sdrangel_VERSION_MINOR}.${sdrangel_VERSION_PATCH}${sdrangel_VERSION_SUFFIX}" CACHE INTERNAL "")
|
||||||
message(STATUS "${APPLICATION_NAME} Version: ${sdrangel_VERSION}")
|
message(STATUS "${APPLICATION_NAME} Version: ${sdrangel_VERSION}")
|
||||||
add_definitions("-DSDRANGEL_LIB_VERSION=\"${sdrangel_VERSION_MAJOR}.${sdrangel_VERSION_MINOR}.${sdrangel_VERSION_PATCH}\"")
|
add_definitions("-DSDRANGEL_LIB_VERSION=\"${sdrangel_VERSION_MAJOR}.${sdrangel_VERSION_MINOR}.${sdrangel_VERSION_PATCH}\"")
|
||||||
add_definitions("-DSDRANGEL_VERSION=\"${sdrangel_VERSION}\"")
|
add_definitions("-DSDRANGEL_VERSION=\"${sdrangel_VERSION}\"")
|
||||||
|
|
|
@ -36,7 +36,7 @@ if(APPLE AND BUNDLE AND BUILD_GUI)
|
||||||
set(CPACK_BUNDLE_ICON "${CMAKE_SOURCE_DIR}/cmake/cpack/sdrangel_icon.icns")
|
set(CPACK_BUNDLE_ICON "${CMAKE_SOURCE_DIR}/cmake/cpack/sdrangel_icon.icns")
|
||||||
set(CPACK_BUNDLE_PLIST "${CMAKE_BINARY_DIR}/Info.plist")
|
set(CPACK_BUNDLE_PLIST "${CMAKE_BINARY_DIR}/Info.plist")
|
||||||
set(CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}/cmake/cpack/sdrangel_icon.icns")
|
set(CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}/cmake/cpack/sdrangel_icon.icns")
|
||||||
set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${CPACK_PACKAGE_VERSION}_${CPACK_MACOS_PACKAGE_ARCHITECTURE}_${CMAKE_SYSTEM_PROCESSOR}")
|
set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${CPACK_PACKAGE_VERSION}_${CPACK_MACOS_PACKAGE_ARCHITECTURE}_${CMAKE_SYSTEM_PROCESSOR}" CACHE INTERNAL "")
|
||||||
set(CPACK_PRE_BUILD_SCRIPTS "${PROJECT_BINARY_DIR}/deploy_mac.cmake")
|
set(CPACK_PRE_BUILD_SCRIPTS "${PROJECT_BINARY_DIR}/deploy_mac.cmake")
|
||||||
|
|
||||||
# copy SoapySDR Modules
|
# copy SoapySDR Modules
|
||||||
|
|
Ładowanie…
Reference in New Issue