Merge pull request #5185 from MartijnKaijser/win32_rebrand

[win32] Rebrand win32 BuildSetup and installer files

18 files changed, 32 insertions, 32 deletions

diff --git a/project/BuildDependencies/DownloadBuildDeps.bat b/project/BuildDependencies/DownloadBuildDeps.bat
index ed76ec7dc0..81df45a4bc 100644
--- a/project/BuildDependencies/DownloadBuildDeps.bat
+++ b/project/BuildDependencies/DownloadBuildDeps.bat
@@ -3,7 +3,7 @@
 SETLOCAL
 
 SET CUR_PATH=%CD%
-SET XBMC_PATH=%CD%\..\..
+SET APP_PATH=%CD%\..\..
 SET TMP_PATH=%CD%\scripts\tmp
 
 rem can't run rmdir and md back to back. access denied error otherwise.
diff --git a/project/BuildDependencies/DownloadMingwBuildEnv.bat b/project/BuildDependencies/DownloadMingwBuildEnv.bat
index fa5ca42d16..793309f5b7 100644
--- a/project/BuildDependencies/DownloadMingwBuildEnv.bat
+++ b/project/BuildDependencies/DownloadMingwBuildEnv.bat
@@ -6,7 +6,7 @@ SET MSYS_INSTALL_PATH="%CD%\msys"
 SET MINGW_INSTALL_PATH="%CD%\msys\mingw"
 
 SET CUR_PATH=%CD%
-SET XBMC_PATH=%CD%\..\..
+SET APP_PATH=%CD%\..\..
 SET TMP_PATH=%CD%\scripts\tmp
 
 rem can't run rmdir and md back to back. access denied error otherwise.
@@ -41,7 +41,7 @@ SET FSTAB=%MINGW_INSTALL_PATH%
 SET FSTAB=%FSTAB:\=/%
 SET FSTAB=%FSTAB:"=%
 ECHO %FSTAB% /mingw>>"%MSYS_INSTALL_PATH%\etc\fstab"
-SET FSTAB=%XBMC_PATH%
+SET FSTAB=%APP_PATH%
 SET FSTAB=%FSTAB:\=/%
 SET FSTAB=%FSTAB:"=%
 ECHO %FSTAB% /xbmc>>"%MSYS_INSTALL_PATH%\etc\fstab"
diff --git a/project/BuildDependencies/scripts/1_copy_deps_d.bat b/project/BuildDependencies/scripts/1_copy_deps_d.bat
index f6aaa3396c..d52304fbf5 100644
--- a/project/BuildDependencies/scripts/1_copy_deps_d.bat
+++ b/project/BuildDependencies/scripts/1_copy_deps_d.bat
@@ -1,12 +1,12 @@
 @ECHO OFF
 
-IF EXIST "%XBMC_PATH%\system\webserver" rmdir "%XBMC_PATH%\system\webserver" /S /Q
-IF EXIST "%XBMC_PATH%\system\airplay" rmdir "%XBMC_PATH%\system\airplay" /S /Q
+IF EXIST "%APP_PATH%\system\webserver" rmdir "%APP_PATH%\system\webserver" /S /Q
+IF EXIST "%APP_PATH%\system\airplay" rmdir "%APP_PATH%\system\airplay" /S /Q
 
 rem create directories
-IF NOT EXIST "%XBMC_PATH%\system\players\paplayer" md "%XBMC_PATH%\system\players\paplayer"
-IF NOT EXIST "%XBMC_PATH%\project\VS2010Express\XBMC\Debug (DirectX)" md "%XBMC_PATH%\project\VS2010Express\XBMC\Debug (DirectX)"
-IF NOT EXIST "%XBMC_PATH%\system\webserver" md "%XBMC_PATH%\system\webserver"
-IF NOT EXIST "%XBMC_PATH%\system\airplay" md "%XBMC_PATH%\system\airplay"
-IF NOT EXIST "%XBMC_PATH%\project\Win32BuildSetup\dependencies" md "%XBMC_PATH%\project\Win32BuildSetup\dependencies"
-IF NOT EXIST "%XBMC_PATH%\system\cdrip" md "%XBMC_PATH%\system\cdrip"
\ No newline at end of file
+IF NOT EXIST "%APP_PATH%\system\players\paplayer" md "%APP_PATH%\system\players\paplayer"
+IF NOT EXIST "%APP_PATH%\project\VS2010Express\Application\Debug" md "%APP_PATH%\project\VS2010Express\Application\Debug"
+IF NOT EXIST "%APP_PATH%\system\webserver" md "%APP_PATH%\system\webserver"
+IF NOT EXIST "%APP_PATH%\system\airplay" md "%APP_PATH%\system\airplay"
+IF NOT EXIST "%APP_PATH%\project\Win32BuildSetup\dependencies" md "%APP_PATH%\project\Win32BuildSetup\dependencies"
+IF NOT EXIST "%APP_PATH%\system\cdrip" md "%APP_PATH%\system\cdrip"
\ No newline at end of file
diff --git a/project/BuildDependencies/scripts/PIL_d.bat b/project/BuildDependencies/scripts/PIL_d.bat
index 5042ffc373..1f5eac21e9 100644
--- a/project/BuildDependencies/scripts/PIL_d.bat
+++ b/project/BuildDependencies/scripts/PIL_d.bat
@@ -2,7 +2,7 @@
 
 SET LOC_PATH=%CD%
 SET FILES=%LOC_PATH%\PIL_d.txt
-SET OUTDIR="%XBMC_PATH%\addons\script.module.pil\lib\PIL"
+SET OUTDIR="%APP_PATH%\addons\script.module.pil\lib\PIL"
 
 CALL dlextract.bat PIL %FILES%
 
diff --git a/project/BuildDependencies/scripts/fontconfig_d.bat b/project/BuildDependencies/scripts/fontconfig_d.bat
index 51c1e440ce..e8543f0bd5 100644
--- a/project/BuildDependencies/scripts/fontconfig_d.bat
+++ b/project/BuildDependencies/scripts/fontconfig_d.bat
@@ -10,7 +10,7 @@ cd %TMP_PATH%
 xcopy include\fontconfig "%CUR_PATH%\include\fontconfig" /E /Q /I /Y
 copy lib\fontconfig.lib "%CUR_PATH%\lib\" /Y
 rem libfontconfig-1.dll requires libexpat-1.dll which is copied by libexpat_d.bat
-copy bin\libfontconfig-1.dll "%XBMC_PATH%\system\players\dvdplayer\"
-copy freetype-2.4.6-1-win32\bin\freetype6.dll "%XBMC_PATH%\system\players\dvdplayer\"
+copy bin\libfontconfig-1.dll "%APP_PATH%\system\players\dvdplayer\"
+copy freetype-2.4.6-1-win32\bin\freetype6.dll "%APP_PATH%\system\players\dvdplayer\"
 
 cd %LOC_PATH%
diff --git a/project/BuildDependencies/scripts/get_formed.cmd b/project/BuildDependencies/scripts/get_formed.cmd
index a3f630fac4..ffe44c10e2 100644
--- a/project/BuildDependencies/scripts/get_formed.cmd
+++ b/project/BuildDependencies/scripts/get_formed.cmd
@@ -51,7 +51,7 @@ FOR /F %%f IN ('dir /B /A:-D "%~n1\*.*"') DO (del "%~n1\%%f" /F /Q || EXIT /B 4)
 
 CALL :setSubStageName Copying %1 to build tree...
 REM Copy only content of extracted ".\packagename\"
-XCOPY "%~n1\*" "%XBMC_PATH%\" /E /I /Y /F /R /H /K || EXIT /B 5
+XCOPY "%~n1\*" "%APP_PATH%\" /E /I /Y /F /R /H /K || EXIT /B 5
 
 dir /A:-D * >NUL 2>NUL && (
 CALL :setSubStageName Post-Cleaning %1...
diff --git a/project/BuildDependencies/scripts/get_mingw_env.bat b/project/BuildDependencies/scripts/get_mingw_env.bat
index b071f56ff9..9228100350 100644
--- a/project/BuildDependencies/scripts/get_mingw_env.bat
+++ b/project/BuildDependencies/scripts/get_mingw_env.bat
@@ -25,6 +25,6 @@ copy xasm.exe "%MINGW_INSTALL_PATH%\bin\xasm.exe" /Y
 copy mads.exe "%MINGW_INSTALL_PATH%\bin\mads.exe" /Y
 rem copy "%MINGW_INSTALL_PATH%\bin\mingw32-make.exe" "%MINGW_INSTALL_PATH%\bin\make.exe" /Y
 rem xcopy curl-7.21.0-devel-mingw32\include\curl "%CUR_PATH%\include\curl" /E /Q /I /Y
-rem copy curl-7.21.0-devel-mingw32\bin\*.dll "%XBMC_PATH%\system\" /Y
+rem copy curl-7.21.0-devel-mingw32\bin\*.dll "%APP_PATH%\system\" /Y
 
 cd %LOC_PATH%
diff --git a/project/BuildDependencies/scripts/libcdio_d.bat b/project/BuildDependencies/scripts/libcdio_d.bat
index 0104c6838f..550150771f 100644
--- a/project/BuildDependencies/scripts/libcdio_d.bat
+++ b/project/BuildDependencies/scripts/libcdio_d.bat
@@ -9,7 +9,7 @@ cd %TMP_PATH%
 
 xcopy libcdio-0.83-win32\include\* "%CUR_PATH%\include\" /E /Q /I /Y
 copy libcdio-0.83-win32\lib\libcdio.dll.lib "%CUR_PATH%\lib\" /Y
-copy libcdio-0.83-win32\bin\libcdio-13.dll "%XBMC_PATH%\project\Win32BuildSetup\dependencies\" /Y
-copy libcdio-0.83-win32\bin\libiconv-2.dll "%XBMC_PATH%\project\Win32BuildSetup\dependencies\" /Y
+copy libcdio-0.83-win32\bin\libcdio-13.dll "%APP_PATH%\project\Win32BuildSetup\dependencies\" /Y
+copy libcdio-0.83-win32\bin\libiconv-2.dll "%APP_PATH%\project\Win32BuildSetup\dependencies\" /Y
 
 cd %LOC_PATH%
diff --git a/project/BuildDependencies/scripts/libcec_d.bat b/project/BuildDependencies/scripts/libcec_d.bat
index 0b41b8a8ec..b5104c3cf4 100644
--- a/project/BuildDependencies/scripts/libcec_d.bat
+++ b/project/BuildDependencies/scripts/libcec_d.bat
@@ -10,6 +10,6 @@ cd %TMP_PATH%
 mkdir "%CUR_PATH%\include\libcec"
 xcopy libcec\include\* "%CUR_PATH%\include\libcec\." /E /Q /I /Y
 
-copy libcec\libcec.dll "%XBMC_PATH%\system\."
+copy libcec\libcec.dll "%APP_PATH%\system\."
 
 cd %LOC_PATH%
diff --git a/project/BuildDependencies/scripts/libcurl_d.bat b/project/BuildDependencies/scripts/libcurl_d.bat
index ed08aa9d62..5de849bc63 100644
--- a/project/BuildDependencies/scripts/libcurl_d.bat
+++ b/project/BuildDependencies/scripts/libcurl_d.bat
@@ -12,6 +12,6 @@ rem I found no reference to zlib1.dll in any curl dll
 del curl-7.21.6-devel-mingw32\bin\zlib1.dll
 
 xcopy curl-7.21.6-devel-mingw32\include\curl "%CUR_PATH%\include\curl" /E /Q /I /Y
-copy curl-7.21.6-devel-mingw32\bin\*.dll "%XBMC_PATH%\system\" /Y
+copy curl-7.21.6-devel-mingw32\bin\*.dll "%APP_PATH%\system\" /Y
 
 cd %LOC_PATH%
diff --git a/project/BuildDependencies/scripts/libexpat_d.bat b/project/BuildDependencies/scripts/libexpat_d.bat
index b14bf04c8a..4d5cb61dcd 100644
--- a/project/BuildDependencies/scripts/libexpat_d.bat
+++ b/project/BuildDependencies/scripts/libexpat_d.bat
@@ -9,8 +9,8 @@ cd %TMP_PATH%
 
 copy include\* "%CUR_PATH%\include\" /Y
 copy lib\expat.lib "%CUR_PATH%\lib\libexpat.lib" /Y
-copy bin\libexpat-1.dll "%XBMC_PATH%\system\libexpat.dll"
+copy bin\libexpat-1.dll "%APP_PATH%\system\libexpat.dll"
 rem libexpat-1.dll for libfontconfig-1.dll which is needed for libass.dll
-copy bin\libexpat-1.dll "%XBMC_PATH%\system\players\dvdplayer\"
+copy bin\libexpat-1.dll "%APP_PATH%\system\players\dvdplayer\"
 
 cd %LOC_PATH%
diff --git a/project/BuildDependencies/scripts/libflac_d.bat b/project/BuildDependencies/scripts/libflac_d.bat
index 88ef08dd62..17ac8de62b 100644
--- a/project/BuildDependencies/scripts/libflac_d.bat
+++ b/project/BuildDependencies/scripts/libflac_d.bat
@@ -8,7 +8,7 @@ CALL dlextract.bat libflac %FILES%
 cd %TMP_PATH%
 
 xcopy include\FLAC "%CUR_PATH%\include\FLAC" /E /Q /I /Y
-copy lib\libFLAC.dll "%XBMC_PATH%\system\players\paplayer\" /Y
+copy lib\libFLAC.dll "%APP_PATH%\system\players\paplayer\" /Y
 
 IF EXIST "include\FLAC++" rmdir "include\FLAC++" /S /Q
 IF EXIST "include\ogg" rmdir "include\ogg" /S /Q
diff --git a/project/BuildDependencies/scripts/libmicrohttpd_d.bat b/project/BuildDependencies/scripts/libmicrohttpd_d.bat
index 595e5a7462..7076c87507 100644
--- a/project/BuildDependencies/scripts/libmicrohttpd_d.bat
+++ b/project/BuildDependencies/scripts/libmicrohttpd_d.bat
@@ -8,7 +8,7 @@ CALL dlextract.bat libmicrohttpd %FILES%
 cd %TMP_PATH%
 
 xcopy libmicrohttpd-0.4.5-win32\include\* "%CUR_PATH%\include" /E /Q /I /Y
-xcopy libmicrohttpd-0.4.5-win32\bin\*.dll "%XBMC_PATH%\system\webserver" /E /Q /I /Y
+xcopy libmicrohttpd-0.4.5-win32\bin\*.dll "%APP_PATH%\system\webserver" /E /Q /I /Y
 copy libmicrohttpd-0.4.5-win32\lib\libmicrohttpd.dll.lib "%CUR_PATH%\lib\" /Y
 
 cd %LOC_PATH%
diff --git a/project/BuildDependencies/scripts/liboggvorbis_d.bat b/project/BuildDependencies/scripts/liboggvorbis_d.bat
index 4abf6d9b9a..0de23091dd 100644
--- a/project/BuildDependencies/scripts/liboggvorbis_d.bat
+++ b/project/BuildDependencies/scripts/liboggvorbis_d.bat
@@ -9,8 +9,8 @@ cd %TMP_PATH%
 
 xcopy include\ogg "%CUR_PATH%\include\ogg" /E /Q /I /Y
 xcopy include\vorbis "%CUR_PATH%\include\vorbis" /E /Q /I /Y
-copy bin\ogg.dll "%XBMC_PATH%\system\cdrip\" /Y
-copy bin\vorbis.dll "%XBMC_PATH%\system\cdrip\" /Y
-copy bin\vorbisfile.dll "%XBMC_PATH%\system\players\paplayer\" /Y
+copy bin\ogg.dll "%APP_PATH%\system\cdrip\" /Y
+copy bin\vorbis.dll "%APP_PATH%\system\cdrip\" /Y
+copy bin\vorbisfile.dll "%APP_PATH%\system\players\paplayer\" /Y
 
 cd %LOC_PATH%
diff --git a/project/BuildDependencies/scripts/libplist_d.bat b/project/BuildDependencies/scripts/libplist_d.bat
index f0061b6e5c..53e3c60809 100644
--- a/project/BuildDependencies/scripts/libplist_d.bat
+++ b/project/BuildDependencies/scripts/libplist_d.bat
@@ -8,6 +8,6 @@ CALL dlextract.bat libplist %FILES%
 cd %TMP_PATH%
 
 xcopy libplist-1.7-win32-2\include\* "%CUR_PATH%\include\" /E /Q /I /Y
-xcopy libplist-1.7-win32-2\bin\* "%XBMC_PATH%\system\" /E /Q /I /Y
+xcopy libplist-1.7-win32-2\bin\* "%APP_PATH%\system\" /E /Q /I /Y
 
 cd %LOC_PATH%
diff --git a/project/BuildDependencies/scripts/librtmp_d.bat b/project/BuildDependencies/scripts/librtmp_d.bat
index 717332f68f..c99e1d6d58 100644
--- a/project/BuildDependencies/scripts/librtmp_d.bat
+++ b/project/BuildDependencies/scripts/librtmp_d.bat
@@ -8,6 +8,6 @@ CALL dlextract.bat librtmp %FILES%
 cd %TMP_PATH%
 
 xcopy librtmp-20110723-git-b627335-win32\include\*.h "%CUR_PATH%\include\librtmp\" /E /Q /I /Y
-xcopy librtmp-20110723-git-b627335-win32\lib\*.dll "%XBMC_PATH%\system\players\dvdplayer\" /E /Q /I /Y
+xcopy librtmp-20110723-git-b627335-win32\lib\*.dll "%APP_PATH%\system\players\dvdplayer\" /E /Q /I /Y
 
 cd %LOC_PATH%
diff --git a/project/BuildDependencies/scripts/libsdl_d.bat b/project/BuildDependencies/scripts/libsdl_d.bat
index a308333aef..601a58e5d9 100644
--- a/project/BuildDependencies/scripts/libsdl_d.bat
+++ b/project/BuildDependencies/scripts/libsdl_d.bat
@@ -10,9 +10,9 @@ cd %TMP_PATH%
 xcopy SDL-1.2.14\include\* "%CUR_PATH%\include\SDL\" /E /Q /I /Y
 copy SDL-1.2.14\lib\SDL.lib "%CUR_PATH%\lib\SDL.lib" /Y
 
-copy SDL-1.2.14\lib\SDL.dll "%XBMC_PATH%\tools\TexturePacker\SDL.dll"
+copy SDL-1.2.14\lib\SDL.dll "%APP_PATH%\tools\TexturePacker\SDL.dll"
 copy SDL_image-1.2.10\include\SDL_image.h "%CUR_PATH%\include\SDL\"
-copy SDL_image-1.2.10\lib\*.dll "%XBMC_PATH%\tools\TexturePacker\"
+copy SDL_image-1.2.10\lib\*.dll "%APP_PATH%\tools\TexturePacker\"
 copy SDL_image-1.2.10\lib\SDL_image.lib "%CUR_PATH%\lib\SDL_image.lib" /Y
 
 
diff --git a/project/BuildDependencies/scripts/zlib_d.bat b/project/BuildDependencies/scripts/zlib_d.bat
index c3ee5ee752..a472ff593e 100644
--- a/project/BuildDependencies/scripts/zlib_d.bat
+++ b/project/BuildDependencies/scripts/zlib_d.bat
@@ -9,6 +9,6 @@ cd %TMP_PATH%
 
 xcopy include\* "%CUR_PATH%\include\" /E /Q /I /Y
 copy lib\zlib.lib "%CUR_PATH%\lib\" /Y
-copy bin\zlib1.dll "%XBMC_PATH%\system\" /Y
+copy bin\zlib1.dll "%APP_PATH%\system\" /Y
 
 cd %LOC_PATH%