diff options
| author | Tobias Arrskog <topfs2@xbmc.org> | 2014-12-22 12:45:19 +0100 |
|---|---|---|
| committer | Tobias Arrskog <topfs2@xbmc.org> | 2014-12-22 21:03:34 +0100 |
| commit | c8a2a6bbb711ada6ef2c406971c1f9c57b129467 (patch) | |
| tree | a9ab2f1af8c36c43afbf2b5414bb834b222998bf /tools/windows | |
| parent | 4aa343d4331bfec7868f81b874ba5445baa43a20 (diff) | |
Made versiontag optional
Diffstat (limited to 'tools/windows')
| -rw-r--r-- | tools/windows/CompileInfo.bat | 7 |
1 files changed, 6 insertions, 1 deletions
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" |