From 168e241e09d698a1a227b244a7e39d8124c056ed Mon Sep 17 00:00:00 2001 From: Tobias Arrskog Date: Mon, 22 Dec 2014 12:45:19 +0100 Subject: Made versiontag optional --- configure.in | 11 +++++++++-- tools/android/packaging/xbmc/AndroidManifest.xml.in | 2 +- tools/darwin/packaging/atv2/mkdeb-atv2.sh.in | 7 ++++++- tools/darwin/packaging/ios/mkdeb-ios.sh.in | 7 ++++++- tools/darwin/packaging/osx/mkdmg-osx.sh.in | 7 ++++++- tools/windows/CompileInfo.bat | 7 ++++++- xbmc/win32/XBMC_PC.rc.in | 4 ++-- 7 files changed, 36 insertions(+), 9 deletions(-) diff --git a/configure.in b/configure.in index 646287a885..45bf2302ca 100644 --- a/configure.in +++ b/configure.in @@ -125,16 +125,23 @@ APP_VERSION_TAG_LC=$(echo $APP_VERSION_TAG | ${AWK} '{print tolower($0)}') APP_VERSION_CODE=${APP_VERSION_CODE-$(${AWK} '/VERSION_CODE/ {print $2}' version.txt)} APP_ADDON_API=${APP_ADDON_API-$(${AWK} '/ADDON_API/ {print $2}' version.txt)} if test "$APP_NAME" != "" && test "$APP_VERSION_MAJOR" != "" && test "$APP_VERSION_MINOR" != "" \ -&& test "$APP_VERSION_TAG" != "" && test "$APP_VERSION_CODE" != "" && test "$APP_ADDON_API" != ""; then - final_message="$final_message\n ${APP_NAME} Version:\t${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}-${APP_VERSION_TAG}" +&& test "$APP_VERSION_CODE" != "" && test "$APP_ADDON_API" != ""; then + APP_VERSION=${APP_VERSION_MAJOR}.${APP_VERSION_MINOR} + if test "$APP_VERSION_TAG" != ""; then + APP_VERSION=${APP_VERSION}-${APP_VERSION_TAG} + fi + AC_SUBST(APP_NAME) AC_SUBST(APP_NAME_LC) + AC_SUBST(APP_VERSION) AC_SUBST(APP_VERSION_MAJOR) AC_SUBST(APP_VERSION_MINOR) AC_SUBST(APP_VERSION_TAG) AC_SUBST(APP_VERSION_TAG_LC) AC_SUBST(APP_VERSION_CODE) AC_SUBST(APP_ADDON_API) + + final_message="$final_message\n ${APP_NAME} Version:\t${APP_VERSION}" else AC_MSG_ERROR(could not detect application Version, make sure version.txt is complete) fi diff --git a/tools/android/packaging/xbmc/AndroidManifest.xml.in b/tools/android/packaging/xbmc/AndroidManifest.xml.in index ba7ade529c..4232f1a852 100644 --- a/tools/android/packaging/xbmc/AndroidManifest.xml.in +++ b/tools/android/packaging/xbmc/AndroidManifest.xml.in @@ -3,7 +3,7 @@ + android:versionName="@APP_VERSION@" > diff --git a/tools/darwin/packaging/atv2/mkdeb-atv2.sh.in b/tools/darwin/packaging/atv2/mkdeb-atv2.sh.in index db637ebcbe..fefc6ce0a7 100644 --- a/tools/darwin/packaging/atv2/mkdeb-atv2.sh.in +++ b/tools/darwin/packaging/atv2/mkdeb-atv2.sh.in @@ -48,7 +48,12 @@ fi PACKAGE=org.xbmc.@APP_NAME_LC@-atv2 VERSION=@APP_VERSION_MAJOR@.@APP_VERSION_MINOR@ -REVISION=0~@APP_VERSION_TAG_LC@ +REVISION=0 + +if [ "@APP_VERSION_TAG_LC@" != "" ]; then + REVISION=$REVISION~@APP_VERSION_TAG_LC@ +fi + ARCHIVE=${PACKAGE}_${VERSION}-${REVISION}_iphoneos-arm.deb SIZE="$(du -s -k ${APP} | awk '{print $1}')" diff --git a/tools/darwin/packaging/ios/mkdeb-ios.sh.in b/tools/darwin/packaging/ios/mkdeb-ios.sh.in index 0ec4e2e848..f159bf9a19 100644 --- a/tools/darwin/packaging/ios/mkdeb-ios.sh.in +++ b/tools/darwin/packaging/ios/mkdeb-ios.sh.in @@ -49,7 +49,12 @@ fi PACKAGE=org.xbmc.@APP_NAME_LC@-ios VERSION=@APP_VERSION_MAJOR@.@APP_VERSION_MINOR@ -REVISION=0~@APP_VERSION_TAG_LC@ +REVISION=0 + +if [ "@APP_VERSION_TAG_LC@" != "" ]; then + REVISION=$REVISION~@APP_VERSION_TAG_LC@ +fi + ARCHIVE=${PACKAGE}_${VERSION}-${REVISION}_iphoneos-arm.deb SIZE="$(du -s -k ${APP} | awk '{print $1}')" diff --git a/tools/darwin/packaging/osx/mkdmg-osx.sh.in b/tools/darwin/packaging/osx/mkdmg-osx.sh.in index 33c13dd45a..2a10ebc081 100755 --- a/tools/darwin/packaging/osx/mkdmg-osx.sh.in +++ b/tools/darwin/packaging/osx/mkdmg-osx.sh.in @@ -25,7 +25,12 @@ ARCHITECTURE=`file $APP/Contents/MacOS/@APP_NAME@ | awk '{print $NF}'` PACKAGE=org.xbmc.@APP_NAME_LC@-osx VERSION=@APP_VERSION_MAJOR@.@APP_VERSION_MINOR@ -REVISION=0~@APP_VERSION_TAG_LC@ +REVISION=0 + +if [ "@APP_VERSION_TAG_LC@" != "" ]; then + REVISION=$REVISION~@APP_VERSION_TAG_LC@ +fi + ARCHIVE=${PACKAGE}_${VERSION}-${REVISION}_macosx-intel-${ARCHITECTURE} echo Creating $PACKAGE package version $VERSION revision $REVISION diff --git a/tools/windows/CompileInfo.bat b/tools/windows/CompileInfo.bat index ef8af0a36c..a94664a410 100644 --- a/tools/windows/CompileInfo.bat +++ b/tools/windows/CompileInfo.bat @@ -15,6 +15,11 @@ FOR /f %%i IN ('%msys_bin_dir%\awk.exe "/VERSION_MINOR/ {print $2}" %base_dir%\v FOR /f %%i IN ('%msys_bin_dir%\awk.exe "/VERSION_TAG/ {print $2}" %base_dir%\version.txt') DO SET tag=%%i FOR /f %%i IN ('%msys_bin_dir%\awk.exe "/ADDON_API/ {print $2}" %base_dir%\version.txt') DO SET addon_api=%%i +SET app_version=%major%.%minor% +IF NOT [%tag%] == [] ( + SET app_version=%app_version%-%tag% +) + REM XBMC_PC.rc.in requires a comma-separated version of addon_api SET separator=, CALL SET file_version=%%addon_api:.=%separator%%%%separator%0 @@ -22,5 +27,5 @@ CALL SET file_version=%%addon_api:.=%separator%%%%separator%0 REM create the files with the proper version information "%msys_bin_dir%\sed.exe" -e s/@APP_NAME@/%app_name%/g -e s/@APP_VERSION_MAJOR@/%major%/g -e s/@APP_VERSION_MINOR@/%minor%/g -e s/@APP_VERSION_TAG@/%tag%/g "%base_dir%\xbmc\CompileInfo.cpp.in" > "%base_dir%\xbmc\CompileInfo.cpp" "%msys_bin_dir%\sed.exe" s/@APP_ADDON_API@/%addon_api%/g "%base_dir%\addons\xbmc.addon\addon.xml.in" > "%base_dir%\addons\xbmc.addon\addon.xml" -"%msys_bin_dir%\sed.exe" -e s/@APP_NAME@/%app_name%/g -e s/@COMPANY_NAME@/%company_name%/g -e s/@APP_VERSION_MAJOR@/%major%/g -e s/@APP_VERSION_MINOR@/%minor%/g -e s/@APP_VERSION_TAG@/%tag%/g -e s/@FILE_VERSION@/%file_version%/g "%base_dir%\xbmc\win32\XBMC_PC.rc.in" > "%base_dir%\xbmc\win32\XBMC_PC.rc" +"%msys_bin_dir%\sed.exe" -e s/@APP_NAME@/%app_name%/g -e s/@COMPANY_NAME@/%company_name%/g -e s/@APP_VERSION_MAJOR@/%major%/g -e s/@APP_VERSION_MINOR@/%minor%/g -e s/@APP_VERSION_TAG@/%tag%/g -e s/@FILE_VERSION@/%file_version%/g -e s/@APP_VERSION@/%app_version%/g "%base_dir%\xbmc\win32\XBMC_PC.rc.in" > "%base_dir%\xbmc\win32\XBMC_PC.rc" diff --git a/xbmc/win32/XBMC_PC.rc.in b/xbmc/win32/XBMC_PC.rc.in index 7f215abbaf..b76f15dd04 100644 --- a/xbmc/win32/XBMC_PC.rc.in +++ b/xbmc/win32/XBMC_PC.rc.in @@ -71,12 +71,12 @@ BEGIN BEGIN VALUE "CompanyName", "@COMPANY_NAME@" VALUE "FileDescription", "@APP_NAME@" - VALUE "FileVersion", "@APP_VERSION_MAJOR@.@APP_VERSION_MINOR@-@APP_VERSION_TAG@" + VALUE "FileVersion", "@APP_VERSION@" VALUE "InternalName", "@APP_NAME@.exe" VALUE "LegalCopyright", "Copyright (c) @COMPANY_NAME@. All rights reserved." VALUE "OriginalFilename", "@APP_NAME@.exe" VALUE "ProductName", "@APP_NAME@ for Windows" - VALUE "ProductVersion", "@APP_VERSION_MAJOR@.@APP_VERSION_MINOR@-@APP_VERSION_TAG@" + VALUE "ProductVersion", "@APP_VERSION@" END END BLOCK "VarFileInfo" -- cgit v1.2.3