From: <hor...@us...> - 2012-01-28 09:51:02
|
Revision: 4427 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4427&view=rev Author: horned-reaper Date: 2012-01-28 09:50:54 +0000 (Sat, 28 Jan 2012) Log Message: ----------- Modified Paths: -------------- trunk/plugins/FritzBox/Build/Build FritzBoxManager.bat trunk/plugins/FritzBox/Build/Build.log trunk/plugins/FritzBox/FritzBox/bin/Release/FritzBox.dll trunk/plugins/FritzBox/FritzBox/bin/Release/FritzBox.pdb trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.dll trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.pdb trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2 trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBox.dll trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBox.pdb trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.exe trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.pdb trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.exe trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.pdb trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/ResolveAssemblyReference.cache trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBox.dll trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBox.pdb trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.exe trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.pdb trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.csproj.FileListAbsolute.txt trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.exe trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.pdb trunk/plugins/FritzBox/releases/update.xml Added Paths: ----------- trunk/plugins/FritzBox/Build/Commit FritzBoxManager.bat trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/GenerateResource.read.7.tlog trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/GenerateResource.write.7.tlog trunk/plugins/FritzBox/releases/FritzBox_v0.4.1.4426.mpe1 Removed Paths: ------------- trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/GenerateResource.read.6.tlog trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/GenerateResource.write.6.tlog Modified: trunk/plugins/FritzBox/Build/Build FritzBoxManager.bat =================================================================== --- trunk/plugins/FritzBox/Build/Build FritzBoxManager.bat 2012-01-28 08:48:41 UTC (rev 4426) +++ trunk/plugins/FritzBox/Build/Build FritzBoxManager.bat 2012-01-28 09:50:54 UTC (rev 4427) @@ -3,5 +3,65 @@ D: cd \FritzBox\Build +REM Set program path based on current machine environment +set ProgramDir=%ProgramFiles% +if not "%ProgramFiles(x86)%".=="". set ProgramDir=%ProgramFiles(x86)% + +REM Set build path +set BuildPath=..\FritzBox\bin\Release + +REM Set plugin DLL path +set PluginDLL=%BuildPath%\FritzBox.dll + +REM Set log file where the infos are written to, and clear that file +set LOG=Build.log +echo. > %LOG% + +echo. +echo -= Build FRITZ!Box Manager =- +echo -===========================- +echo. + +echo. echo Updating SVN path... -TortoiseProc.exe /path:".." /command:commit /closeonend:1 +TortoiseProc.exe /path:".." /command:update /closeonend:1 + +echo. +echo Writing SVN revision assemblies... +DeployVersionSVN.exe /svn=".." >> %LOG% + +echo. +echo Building FRITZ!Box Manager... +"%WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBUILD.exe" /target:Rebuild /property:Configuration=Release;AllowUnsafeBlocks=true "..\FritzBox.sln" >> %LOG% + +echo. +echo Reverting assemblies... +DeployVersionSVN.exe /svn=".." /revert >> %LOG% + +rmdir /S /Q ..\_release +xcopy "%PluginDLL%" ..\_release\plugins\windows\ >> %LOG% +xcopy ..\FritzBox\Resources\speexdec.exe ..\_release\base\ >> %LOG% +xcopy ..\FritzBox\Skin ..\_release\skin /S /I >> %LOG% +xcopy ..\FritzBox\Languages ..\_release\language /S /I >> %LOG% + +echo. +echo Reading the version number... +if not exist "%PluginDLL%" goto version_error +for /f "Tokens=5" %%a in ('filever "%PluginDLL%"') do set version=%%a +goto :version_done +:version_error +echo FritzBox.dll not found. version could not be read >> %LOG% +echo FritzBox.dll not found. version could not be read. Build is cancelled +pause +goto :EOF +:version_done + +echo. +echo Building MpeExtension package including update.xml... +del "..\MpeRelease\update.xml" /Q +"%ProgramDir%\Team MediaPortal\MediaPortal\MpeMaker.exe" "..\MpeRelease\FritzBox.xmp2" /V=%version% /B /UpdateXML >> %LOG% + +echo. +echo Move installer and update.xml files to the releases folder +move /Y "..\MpeRelease\FritzBox.mpe1" "..\releases\FritzBox_v%Version%.mpe1" +move /Y "..\MpeRelease\update.xml" "..\releases\update.xml" Modified: trunk/plugins/FritzBox/Build/Build.log =================================================================== --- trunk/plugins/FritzBox/Build/Build.log 2012-01-28 08:48:41 UTC (rev 4426) +++ trunk/plugins/FritzBox/Build/Build.log 2012-01-28 09:50:54 UTC (rev 4427) @@ -1,6 +1,6 @@ Running : C:\Program Files\TortoiseSVN\bin\SubWCRev.exe -SVN Version: 4415 +SVN Version: 4426 Updating: D:\FritzBox\FritzBox\Properties\AssemblyInfo.cs Updating: D:\FritzBox\MP2version\Listeners\FritzBox\Properties\AssemblyInfo.cs Updating: D:\FritzBox\MP2version\Properties\AssemblyInfo.cs @@ -10,7 +10,7 @@ [Microsoft .NET Framework, Version 4.0.30319.239] Copyright (C) Microsoft Corporation 2007. All rights reserved. -Build started 21.01.2012 11:32:07. +Build started 28.01.2012 10:49:53. Project "D:\FritzBox\FritzBox.sln" on node 1 (Rebuild target(s)). ValidateSolutionConfiguration: Building solution configuration "Release|Mixed Platforms". @@ -195,7 +195,7 @@ 0 Warning(s) 0 Error(s) -Time Elapsed 00:00:02.53 +Time Elapsed 00:00:03.29 Reverting to build 0 Updating: D:\FritzBox\FritzBox\Properties\AssemblyInfo.cs Updating: D:\FritzBox\MP2version\Listeners\FritzBox\Properties\AssemblyInfo.cs @@ -280,7 +280,7 @@ ..\FritzBox\Languages\Unsupported\strings_zh-CN.xml 36 File(s) copied MpeMaker version: 1.2.1.0 -Build started at 11:32:12 +Build started at 10:50:00 Building "D:\FritzBox\MpeRelease\FritzBox.xmp2" Output: "..\MpeRelease\FritzBox.mpe1" Writing UpdateXML to "update.xml" Added: trunk/plugins/FritzBox/Build/Commit FritzBoxManager.bat =================================================================== --- trunk/plugins/FritzBox/Build/Commit FritzBoxManager.bat (rev 0) +++ trunk/plugins/FritzBox/Build/Commit FritzBoxManager.bat 2012-01-28 09:50:54 UTC (rev 4427) @@ -0,0 +1,12 @@ +@echo off + +D: +cd \FritzBox\Build + +echo. +echo -= Commit FRITZ!Box Manager =- +echo -============================- +echo. + +echo Committing SVN path... +TortoiseProc.exe /path:".." /command:commit /closeonend:1 Modified: trunk/plugins/FritzBox/FritzBox/bin/Release/FritzBox.dll =================================================================== (Binary files differ) Modified: trunk/plugins/FritzBox/FritzBox/bin/Release/FritzBox.pdb =================================================================== (Binary files differ) Modified: trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.dll =================================================================== (Binary files differ) Modified: trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.pdb =================================================================== (Binary files differ) Modified: trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2 =================================================================== --- trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2 2012-01-28 08:48:41 UTC (rev 4426) +++ trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2 2012-01-28 09:50:54 UTC (rev 4427) @@ -559,7 +559,7 @@ <Items> <CompatibleVersionItem> <MinRequiredVersion>1.1.0.0</MinRequiredVersion> - <DesignedForVersion>1.1.7.4415</DesignedForVersion> + <DesignedForVersion>1.1.7.4426</DesignedForVersion> </CompatibleVersionItem> </Items> </CompatibleVersion> @@ -582,7 +582,7 @@ <Major>0</Major> <Minor>4</Minor> <Build>1</Build> - <Revision>4415</Revision> + <Revision>4426</Revision> </Version> <ExtensionDescription>With FRITZ!Box Manager you can access several AVM FRITZ!Box informations from MediaPortal. @@ -596,7 +596,7 @@ <VersionDescription /> <DevelopmentStatus>Stable</DevelopmentStatus> <OnlineLocation>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=118&cf_id=24</OnlineLocation> - <ReleaseDate>2012-01-21T11:32:12.5286188+01:00</ReleaseDate> + <ReleaseDate>2012-01-28T10:50:00.643857+01:00</ReleaseDate> <Tags>fritzbox, fritzbox manager, callmonitor</Tags> <Location>..\MpeRelease\FritzBox.mpe1</Location> <Params> Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBox.dll =================================================================== (Binary files differ) Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBox.pdb =================================================================== (Binary files differ) Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.exe =================================================================== (Binary files differ) Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.pdb =================================================================== (Binary files differ) Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.exe =================================================================== (Binary files differ) Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.pdb =================================================================== (Binary files differ) Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/ResolveAssemblyReference.cache =================================================================== (Binary files differ) Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBox.dll =================================================================== (Binary files differ) Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBox.pdb =================================================================== (Binary files differ) Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.exe =================================================================== (Binary files differ) Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.pdb =================================================================== (Binary files differ) Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.csproj.FileListAbsolute.txt =================================================================== --- trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.csproj.FileListAbsolute.txt 2012-01-28 08:48:41 UTC (rev 4426) +++ trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.csproj.FileListAbsolute.txt 2012-01-28 09:50:54 UTC (rev 4427) @@ -23,5 +23,5 @@ D:\FritzBox\Tools\FritzBoxDebugger\bin\Release\log4net.dll D:\FritzBox\Tools\FritzBoxDebugger\bin\Release\Ionic.Zip.dll D:\FritzBox\Tools\FritzBoxDebugger\bin\Release\FritzBox.pdb -D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\GenerateResource.read.6.tlog -D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\GenerateResource.write.6.tlog +D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\GenerateResource.read.7.tlog +D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\GenerateResource.write.7.tlog Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.exe =================================================================== (Binary files differ) Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.pdb =================================================================== (Binary files differ) Deleted: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/GenerateResource.read.6.tlog =================================================================== (Binary files differ) Added: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/GenerateResource.read.7.tlog =================================================================== (Binary files differ) Property changes on: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/GenerateResource.read.7.tlog ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Deleted: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/GenerateResource.write.6.tlog =================================================================== (Binary files differ) Added: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/GenerateResource.write.7.tlog =================================================================== (Binary files differ) Property changes on: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/GenerateResource.write.7.tlog ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/FritzBox/releases/FritzBox_v0.4.1.4426.mpe1 =================================================================== (Binary files differ) Property changes on: trunk/plugins/FritzBox/releases/FritzBox_v0.4.1.4426.mpe1 ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/plugins/FritzBox/releases/update.xml =================================================================== --- trunk/plugins/FritzBox/releases/update.xml 2012-01-28 08:48:41 UTC (rev 4426) +++ trunk/plugins/FritzBox/releases/update.xml 2012-01-28 09:50:54 UTC (rev 4427) @@ -88,7 +88,7 @@ <Items> <CompatibleVersionItem> <MinRequiredVersion>1.1.0.0</MinRequiredVersion> - <DesignedForVersion>1.1.7.4415</DesignedForVersion> + <DesignedForVersion>1.1.7.4426</DesignedForVersion> </CompatibleVersionItem> </Items> </CompatibleVersion> @@ -111,7 +111,7 @@ <Major>0</Major> <Minor>4</Minor> <Build>1</Build> - <Revision>4415</Revision> + <Revision>4426</Revision> </Version> <ExtensionDescription>With FRITZ!Box Manager you can access several AVM FRITZ!Box informations from MediaPortal. @@ -125,7 +125,7 @@ <VersionDescription /> <DevelopmentStatus>Stable</DevelopmentStatus> <OnlineLocation>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=118&cf_id=24</OnlineLocation> - <ReleaseDate>2012-01-21T11:32:12.5286188+01:00</ReleaseDate> + <ReleaseDate>2012-01-28T10:50:00.643857+01:00</ReleaseDate> <Tags>fritzbox, fritzbox manager, callmonitor</Tags> <Location>..\MpeRelease\FritzBox.mpe1</Location> <Params> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |