diff options
| -rw-r--r-- | project/Win32BuildSetup/BuildSetup.bat | 57 | ||||
| -rw-r--r-- | project/Win32BuildSetup/XBMC for Windows.nsi | 16 | ||||
| -rw-r--r-- | version.txt | 1 |
3 files changed, 32 insertions, 42 deletions
diff --git a/project/Win32BuildSetup/BuildSetup.bat b/project/Win32BuildSetup/BuildSetup.bat index 70b4e02d28..a8d3989aba 100644 --- a/project/Win32BuildSetup/BuildSetup.bat +++ b/project/Win32BuildSetup/BuildSetup.bat @@ -1,5 +1,18 @@ @ECHO OFF SETLOCAL ENABLEDELAYEDEXPANSION +REM setup all paths +SET cur_dir=%CD% +SET base_dir=%cur_dir%\..\.. +SET builddeps_dir=%cur_dir%\..\..\project\BuildDependencies +SET bin_dir=%builddeps_dir%\bin +SET msys_bin_dir=%builddeps_dir%\msys\bin +REM read the version values from version.txt +FOR /f %%i IN ('%msys_bin_dir%\awk.exe "/APP_NAME/ {print $2}" %base_dir%\version.txt') DO SET APP_NAME=%%i +FOR /f %%i IN ('%msys_bin_dir%\awk.exe "/COMPANY_NAME/ {print $2}" %base_dir%\version.txt') DO SET COMPANY=%%i +FOR /f %%i IN ('%msys_bin_dir%\awk.exe "/WEBSITE/ {print $2}" %base_dir%\version.txt') DO SET WEBSITE=%%i +rem Temporary set back to XBMC due to compiling +SET APP_NAME=XBMC + rem ----Usage---- rem BuildSetup [clean|noclean] rem clean to force a full rebuild @@ -8,9 +21,9 @@ rem noprompt to avoid all prompts rem nomingwlibs to skip building all libs built with mingw CLS COLOR 1B -TITLE XBMC for Windows Build Script +TITLE %APP_NAME% for Windows Build Script rem ----PURPOSE---- -rem - Create a working XBMC build with a single click +rem - Create a working application build with a single click rem ------------------------------------------------------------- rem Config rem If you get an error that Visual studio was not found, SET your path for VSNET main executable. @@ -49,34 +62,14 @@ set WORKSPACE=%CD%\..\.. goto DIE ) - set EXE= "..\VS2010Express\XBMC\%buildconfig%\XBMC.exe" - set PDB= "..\VS2010Express\XBMC\%buildconfig%\XBMC.pdb" + set EXE= "..\VS2010Express\XBMC\%buildconfig%\%APP_NAME%.exe" + set PDB= "..\VS2010Express\XBMC\%buildconfig%\%APP_NAME%.pdb" :: sets the BRANCH env var call getbranch.bat rem CONFIG END rem ------------------------------------------------------------- - - echo : - echo ::: - echo :::: - echo :::: - echo ::::::: ::::::::::::::::: :::::: :::::: ::::::: - echo ::::::::: :::::::::::::::::::: :::::::::: :::::::::: ::::::::: - echo ::::::::: :::::::::::::::::::::: :::::::::::::::::::::::: ::::::::: - echo ::::::::: ::: ::::: ::::: :::::::: :::: ::::: - echo :::::: :::: :::: :::: ::::: ::::::: - echo ::::: :::: ::::::: ::::: :::::: - echo ::::: ::: :::::: ::: :::::: - echo :::: ::: :::::: :::: :::::: - echo :::: ::: ::::::: :::: :::::: - echo ::::: :::: ::::::: :::: :::::: - echo ::::::: :::: :::::::: ::: ::::::: - echo ::::::::::::::: ::::: ::::: ::: ::: ::::::::: - echo ::::::::: ::::::::: ::::::::::: ::: ::: ::: ::::::::: - echo :::::::: ::::::::: ::::::::: ::: ::: ::: :::::::: - echo :::::: ::::::: ::::: : :: :: :::::: goto EXE_COMPILE :EXE_COMPILE @@ -131,10 +124,10 @@ set WORKSPACE=%CD%\..\.. ECHO ------------------------------------------------------------ ECHO Cleaning Solution... %NET% %CLEAN_EXE% - ECHO Compiling XBMC branch %BRANCH%... + ECHO Compiling %APP_NAME% branch %BRANCH%... %NET% %OPTS_EXE% IF %errorlevel%==1 ( - set DIETEXT="XBMC.EXE failed to build! See %CD%\..\vs2010express\XBMC\%buildconfig%\objs\XBMC.log" + set DIETEXT="%APP_NAME%.EXE failed to build! See %CD%\..\vs2010express\XBMC\%buildconfig%\objs\XBMC.log" IF %promptlevel%==noprompt ( type "%CD%\..\vs2010express\XBMC\%buildconfig%\objs\XBMC.log" ) @@ -148,10 +141,10 @@ set WORKSPACE=%CD%\..\.. :COMPILE_NO_CLEAN_EXE ECHO Wait while preparing the build. ECHO ------------------------------------------------------------ - ECHO Compiling XBMC branch %BRANCH%... + ECHO Compiling %APP_NAME% branch %BRANCH%... %NET% %OPTS_EXE% IF %errorlevel%==1 ( - set DIETEXT="XBMC.EXE failed to build! See %CD%\..\vs2010express\XBMC\%buildconfig%\objs\XBMC.log" + set DIETEXT="%APP_NAME%.EXE failed to build! See %CD%\..\vs2010express\XBMC\%buildconfig%\objs\XBMC.log" IF %promptlevel%==noprompt ( type "%CD%\..\vs2010express\XBMC\%buildconfig%\objs\XBMC.log" ) @@ -252,7 +245,7 @@ set WORKSPACE=%CD%\..\.. rem restore color and title, some scripts mess these up COLOR 1B - TITLE XBMC for Windows Build Script + TITLE %APP_NAME% for Windows Build Script IF EXIST exclude.txt del exclude.txt > NUL del /s /q /f BUILD_WIN32\application\*.so > NUL @@ -272,8 +265,8 @@ set WORKSPACE=%CD%\..\.. ECHO ------------------------------------------------------------ call getdeploydependencies.bat CALL extract_git_rev.bat > NUL - SET APP_SETUPFILE=XBMCSetup-%GIT_REV%-%BRANCH%.exe - SET APP_PDBFILE=XBMCSetup-%GIT_REV%-%BRANCH%.pdb + SET APP_SETUPFILE=%APP_NAME%Setup-%GIT_REV%-%BRANCH%.exe + SET APP_PDBFILE=%APP_NAME%Setup-%GIT_REV%-%BRANCH%.pdb ECHO Creating installer %APP_SETUPFILE%... IF EXIST %APP_SETUPFILE% del %APP_SETUPFILE% > NUL rem get path to makensis.exe from registry, first try tab delim @@ -312,7 +305,7 @@ set WORKSPACE=%CD%\..\.. ) SET NSISExe=%NSISExePath%\makensis.exe - "%NSISExe%" /V1 /X"SetCompressor /FINAL lzma" /Dapp_root="%CD%\BUILD_WIN32" /Dapp_revision="%GIT_REV%" /Dapp_target="%target%" /Dapp_branch="%BRANCH%" "XBMC for Windows.nsi" + "%NSISExe%" /V1 /X"SetCompressor /FINAL lzma" /Dapp_root="%CD%\BUILD_WIN32" /DAPP_NAME="%APP_NAME%" /DCOMPANY="%COMPANY%" /DWEBSITE="%WEBSITE%" /Dapp_revision="%GIT_REV%" /Dapp_target="%target%" /Dapp_branch="%BRANCH%" "XBMC for Windows.nsi" IF NOT EXIST "%APP_SETUPFILE%" ( set DIETEXT=Failed to create %APP_SETUPFILE%. NSIS installed? goto DIE diff --git a/project/Win32BuildSetup/XBMC for Windows.nsi b/project/Win32BuildSetup/XBMC for Windows.nsi index 2e810512d3..e9cf6232ab 100644 --- a/project/Win32BuildSetup/XBMC for Windows.nsi +++ b/project/Win32BuildSetup/XBMC for Windows.nsi @@ -11,10 +11,6 @@ !include "WinVer.nsh" ;-------------------------------- -;define global used name - !define APP_NAME "XBMC" - -;-------------------------------- ;General ;Name and file @@ -48,8 +44,8 @@ !define MUI_HEADERIMAGE_BITMAP "..\..\tools\windows\packaging\media\installer\header.bmp" !define MUI_WELCOMEFINISHPAGE_BITMAP "..\..\tools\windows\packaging\media\installer\welcome-left.bmp" !define MUI_COMPONENTSPAGE_SMALLDESC - !define MUI_FINISHPAGE_LINK "Please visit http://xbmc.org for more information." - !define MUI_FINISHPAGE_LINK_LOCATION "http://xbmc.org" + !define MUI_FINISHPAGE_LINK "Please visit ${WEBSITE} for more information." + !define MUI_FINISHPAGE_LINK_LOCATION "${WEBSITE}" !define MUI_FINISHPAGE_RUN "$INSTDIR\${APP_NAME}.exe" !define MUI_FINISHPAGE_RUN_NOTCHECKED !define MUI_ABORTWARNING @@ -144,7 +140,7 @@ Section "XBMC" SecAPP "" "$INSTDIR\Uninstall.exe" 0 SW_SHOWNORMAL \ "" "Uninstall ${APP_NAME}." - WriteINIStr "$SMPROGRAMS\$StartMenuFolder\Visit ${APP_NAME} Online.url" "InternetShortcut" "URL" "http://xbmc.org" + WriteINIStr "$SMPROGRAMS\$StartMenuFolder\Visit ${APP_NAME} Online.url" "InternetShortcut" "URL" "${WEBSITE}" !insertmacro MUI_STARTMENU_WRITE_END ;add entry to add/remove programs @@ -161,11 +157,11 @@ Section "XBMC" SecAPP WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}" \ "DisplayIcon" "$INSTDIR\${APP_NAME}.exe,0" WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}" \ - "Publisher" "Team XBMC" + "Publisher" "${COMPANY}" WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}" \ - "HelpLink" "http://xbmc.org/support" + "HelpLink" "${WEBSITE}" WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}" \ - "URLInfoAbout" "http://xbmc.org" + "URLInfoAbout" "${WEBSITE}" SectionEnd diff --git a/version.txt b/version.txt index f1632f63e6..f5176637fb 100644 --- a/version.txt +++ b/version.txt @@ -1,5 +1,6 @@ APP_NAME Kodi COMPANY_NAME Team-Kodi +WEBSITE http://kodi.tv VERSION_MAJOR 14 VERSION_MINOR 0 VERSION_TAG ALPHA4 |