Menu
▾
▴
[Mp-webinterface-svn] SF.net SVN: mp-webinterface: [17] trunk/source
|
From: <sam...@us...> - 2006-08-13 12:40:33
|
Revision: 17 Author: samuel337 Date: 2006-08-13 05:40:07 -0700 (Sun, 13 Aug 2006) ViewCVS: http://svn.sourceforge.net/mp-webinterface/?rev=17&view=rev Log Message: ----------- Fixed minor bug in LaunchMP function in WS; updated setup scripts and files Modified Paths: -------------- trunk/MPWebControl Setup Project/compress MPWebControl.bat trunk/MPWebControl Setup Project/install generation checklist.txt trunk/MPWebControl Setup Project/readme.txt trunk/MPWebControl Setup Project/setup.iss trunk/source/ECP2Plugin/ECP2Plugin.csproj trunk/source/ECP2Plugin/Properties/AssemblyInfo.cs trunk/source/ECP2WebService/App_Code/Service.cs trunk/source/ECP2WebService/Web.config trunk/source/MPW.suo Modified: trunk/MPWebControl Setup Project/compress MPWebControl.bat =================================================================== --- trunk/MPWebControl Setup Project/compress MPWebControl.bat 2006-06-19 12:31:08 UTC (rev 16) +++ trunk/MPWebControl Setup Project/compress MPWebControl.bat 2006-08-13 12:40:07 UTC (rev 17) @@ -1 +1 @@ -"c:\Program Files\7-Zip\7z" a -t7z -mx=7 -sfx"C:\Program Files\7-Zip\7zCon.sfx" ".\MPWebControl.exe" ".\MPWebControl\*" \ No newline at end of file +"c:\Program Files\7-Zip\7z" a -t7z -mx=7 -sfx"C:\Program Files\7-Zip\7zCon.sfx" -i!"MPWebControl\*" -xr!*\.svn\* ".\MPWebControl.exe" \ No newline at end of file Modified: trunk/MPWebControl Setup Project/install generation checklist.txt =================================================================== --- trunk/MPWebControl Setup Project/install generation checklist.txt 2006-06-19 12:31:08 UTC (rev 16) +++ trunk/MPWebControl Setup Project/install generation checklist.txt 2006-08-13 12:40:07 UTC (rev 17) @@ -2,6 +2,7 @@ - remove all MP assemblies from MPECP2WS's bin folder except DirectShowLib.dll (for GetChannel functions) - ensure latest versions of webscheduler, MPECP2WS, MPWApplication and MPWPathFix are in the MPWebControl folder - ensure httpd,conf, ssl,conf, php.ini, ECP2Assembly.dll.config have the PathFix variables in them +- swap over web.config in MPExtControlWS for release version? - compress MPWebControl using batch file (requires 7-Zip) - update readme file - build setup using Inno Setup 5.1.5 (check version details) Modified: trunk/MPWebControl Setup Project/readme.txt =================================================================== --- trunk/MPWebControl Setup Project/readme.txt 2006-06-19 12:31:08 UTC (rev 16) +++ trunk/MPWebControl Setup Project/readme.txt 2006-08-13 12:40:07 UTC (rev 17) @@ -1,6 +1,10 @@ -MediaPortal Webinterface by Maschine and Sam - Release 4 -======================================================== +MediaPortal Webinterface by Maschine and Sam - Release 5 Beta +============================================================= +The readme file below has not been edited for this new version - please ignore. + +------------------------------------------------------------------------------- + PLEASE NOTE: This release only works with MP 0.1.0.10 or above as the TVDatabase has changed. ALSO PLEASE NOTE: The default port has changed from port 80 to port 81. Therefore, to access the web interface, you need to goto http://<MP computer name>:81/ , e.g. if the MP computer name was MPComputer, then you would go to http://MPComputer:81 for the web interface. Modified: trunk/MPWebControl Setup Project/setup.iss =================================================================== --- trunk/MPWebControl Setup Project/setup.iss 2006-06-19 12:31:08 UTC (rev 16) +++ trunk/MPWebControl Setup Project/setup.iss 2006-08-13 12:40:07 UTC (rev 17) @@ -10,7 +10,7 @@ [Dirs] Name: {app}\MPWebControl [Run] -Filename: {app}\MPWebControl\MPWebControl.exe; WorkingDir: {app}\MPWebControl; StatusMsg: Extracting MediaPortal Web Control Files...; Flags: runminimized +Filename: {app}\MPWebControl\MPWebControl.exe; WorkingDir: {app}; StatusMsg: Extracting MediaPortal Web Control Files...; Flags: runminimized Filename: {app}\MPWebControl\passwordconfig.bat; WorkingDir: {app}\MPWebControl; StatusMsg: Adding password security to web server config file...; Flags: runminimized; Tasks: usepassword Filename: {app}\MPWebControl\resetpwd.bat; WorkingDir: {app}\MPWebControl; StatusMsg: Setting MP web interface security...; Tasks: usepassword; Flags: runmaximized Filename: {app}\MPWebControl\MPWPathFix.exe; Parameters: 81; WorkingDir: {app}\MPWebControl; StatusMsg: Configuring web server configuration files...; Flags: runminimized @@ -25,7 +25,7 @@ ReadyMemoDir=MediaPortal location: ConfirmUninstall=Are you sure you want to completely remove %1 and all of its components? Note that all files in the MPWebControl folder will be removed - so any changes would be lost (e.g. any alternate tv logos). [Setup] -OutputDir=C:\Documents and Settings\Sam\Desktop\MediaPortal stuff\MPWebControl Setup Project\Final +OutputDir=C:\Documents and Settings\Sam\Desktop\MediaPortal stuff\MPW\trunk\MPWebControl Setup Project\Final VersionInfoVersion=1.5.0 VersionInfoCompany=Maschine & Sam VersionInfoDescription=MediaPortal Web-Interface R5 Beta Modified: trunk/source/ECP2Plugin/ECP2Plugin.csproj =================================================================== --- trunk/source/ECP2Plugin/ECP2Plugin.csproj 2006-06-19 12:31:08 UTC (rev 16) +++ trunk/source/ECP2Plugin/ECP2Plugin.csproj 2006-08-13 12:40:07 UTC (rev 17) @@ -32,10 +32,6 @@ <SpecificVersion>False</SpecificVersion> <HintPath>..\..\..\..\MediaPortal Source\mediaportal\Core\bin\Debug\Core.dll</HintPath> </Reference> - <Reference Include="ECP2Assembly, Version=1.1.2.43068, Culture=neutral, processorArchitecture=MSIL"> - <SpecificVersion>False</SpecificVersion> - <HintPath>..\..\ECP2Assembly\ECP2Assembly\bin\Debug\ECP2Assembly.dll</HintPath> - </Reference> <Reference Include="System" /> <Reference Include="System.Data" /> <Reference Include="System.Drawing" /> @@ -61,6 +57,12 @@ <DependentUpon>frmSetup.cs</DependentUpon> </EmbeddedResource> </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\ECP2Assembly\ECP2Assembly.csproj"> + <Project>{718EDE2B-7FB8-4C40-8D32-0EED5C289B0F}</Project> + <Name>ECP2Assembly</Name> + </ProjectReference> + </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. Other similar extension points exist, see Microsoft.Common.targets. Modified: trunk/source/ECP2Plugin/Properties/AssemblyInfo.cs =================================================================== --- trunk/source/ECP2Plugin/Properties/AssemblyInfo.cs 2006-06-19 12:31:08 UTC (rev 16) +++ trunk/source/ECP2Plugin/Properties/AssemblyInfo.cs 2006-08-13 12:40:07 UTC (rev 17) @@ -31,5 +31,5 @@ // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.1.2.*")] -[assembly: AssemblyFileVersion("1.1.2.*")] +[assembly: AssemblyVersion("1.1.2.0")] +[assembly: AssemblyFileVersion("1.1.2.0")] Modified: trunk/source/ECP2WebService/App_Code/Service.cs =================================================================== --- trunk/source/ECP2WebService/App_Code/Service.cs 2006-06-19 12:31:08 UTC (rev 16) +++ trunk/source/ECP2WebService/App_Code/Service.cs 2006-08-13 12:40:07 UTC (rev 17) @@ -40,7 +40,7 @@ try { - xmlDoc.Load(ECP2Assembly.MPHandler.ConfigFileName); + xmlDoc.Load(Server.MapPath(@"config/ECP2Assembly.dll.config")); System.Xml.XmlNodeList xmlNodeList = xmlDoc.SelectNodes(@"configuration/appSettings/add[@key='MPDirectory']"); if (xmlNodeList.Count > 0) Modified: trunk/source/ECP2WebService/Web.config =================================================================== --- trunk/source/ECP2WebService/Web.config 2006-06-19 12:31:08 UTC (rev 16) +++ trunk/source/ECP2WebService/Web.config 2006-08-13 12:40:07 UTC (rev 17) @@ -27,7 +27,8 @@ <add assembly="System.Management, Version=2.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A"/> <add assembly="System.Design, Version=2.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A"/> <add assembly="Microsoft.VisualC, Version=8.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A"/> - <add assembly="System.ServiceProcess, Version=2.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A"/></assemblies></compilation> + <add assembly="System.ServiceProcess, Version=2.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A"/> + <add assembly="Microsoft.mshtml, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A"/></assemblies></compilation> <!-- The <authentication> section enables configuration of the security authentication mode used by Modified: trunk/source/MPW.suo =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
