[Mp-plugins-svn] SF.net SVN: mp-plugins:[4044] trunk/plugins/IR Server Suite/setup

[<che...@us...>]

Revision: 4044
          http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4044&view=rev
Author:   chef_koch
Date:     2010-12-18 03:20:43 +0000 (Sat, 18 Dec 2010)

Log Message:
-----------
updated install path for default input mapping
updated mpdirs header to latest from mp svn

Modified Paths:
--------------
    trunk/plugins/IR Server Suite/setup/include/MediaPortalDirectories.nsh
    trunk/plugins/IR Server Suite/setup/setup.nsi

Modified: trunk/plugins/IR Server Suite/setup/include/MediaPortalDirectories.nsh
===================================================================
--- trunk/plugins/IR Server Suite/setup/include/MediaPortalDirectories.nsh	2010-12-18 02:28:02 UTC (rev 4043)
+++ trunk/plugins/IR Server Suite/setup/include/MediaPortalDirectories.nsh	2010-12-18 03:20:43 UTC (rev 4044)
@@ -61,8 +61,6 @@
 Var MPdir.Config
 Var MPdir.Plugins
 Var MPdir.Log
-Var MPdir.CustomInputDevice
-Var MPdir.CustomInputDefault
 Var MPdir.Skin
 Var MPdir.Language
 Var MPdir.Database
@@ -122,8 +120,6 @@
 
   StrCpy $MPdir.Plugins             "$MPdir.Base\plugins"
   StrCpy $MPdir.Log                 "$MPdir.Config\log"
-  StrCpy $MPdir.CustomInputDevice   "$MPdir.Config\InputDeviceMappings"
-  StrCpy $MPdir.CustomInputDefault  "$MPdir.Base\InputDeviceMappings\defaults"
   StrCpy $MPdir.Skin                "$MPdir.Config\skin"
   StrCpy $MPdir.Language            "$MPdir.Config\language"
   StrCpy $MPdir.Database            "$MPdir.Config\database"
@@ -165,8 +161,6 @@
   ${ReadMPdir} Config
   ${ReadMPdir} Plugins
   ${ReadMPdir} Log
-  ${ReadMPdir} CustomInputDevice
-  ${ReadMPdir} CustomInputDefault
   ${ReadMPdir} Skin
   ${ReadMPdir} Language
   ${ReadMPdir} Database
@@ -236,8 +230,6 @@
   ${LOG_TEXT} "INFO" "          Config:  $MPdir.Config"
   ${LOG_TEXT} "INFO" "          Plugins: $MPdir.Plugins"
   ${LOG_TEXT} "INFO" "          Log: $MPdir.Log"
-  ${LOG_TEXT} "INFO" "          CustomInputDevice: $MPdir.CustomInputDevice"
-  ${LOG_TEXT} "INFO" "          CustomInputDefault: $MPdir.CustomInputDefault"
   ${LOG_TEXT} "INFO" "          Skin: $MPdir.Skin"
   ${LOG_TEXT} "INFO" "          Language: $MPdir.Language"
   ${LOG_TEXT} "INFO" "          Database: $MPdir.Database"

Modified: trunk/plugins/IR Server Suite/setup/setup.nsi
===================================================================
--- trunk/plugins/IR Server Suite/setup/setup.nsi	2010-12-18 02:28:02 UTC (rev 4043)
+++ trunk/plugins/IR Server Suite/setup/setup.nsi	2010-12-18 03:20:43 UTC (rev 4044)
@@ -480,8 +480,8 @@
   SetOutPath "$MPdir.Plugins\Process"
   File "..\MediaPortal Plugins\MediaPortal Plugins\MP Control Plugin\bin\${Build_Type}\MPControlPlugin.*"
 
-  ; Write input mapping
-  SetOutPath "$MPdir.CustomInputDefault"
+  ; Write default input mapping
+  SetOutPath "$MPdir.Base\defaults\InputDeviceMappings"
   File "..\MediaPortal Plugins\MediaPortal Plugins\MP Control Plugin\InputMapping\MPControlPlugin.xml"
 
   ; Write app data
@@ -498,7 +498,11 @@
 !macro Remove_${SectionMPControlPlugin}
   ${LOG_TEXT} "INFO" "MP Control Plugin..."
 
+  ; Delete plugin dll
   Delete "$MPdir.Plugins\Process\MPControlPlugin.*"
+
+  ; Delete default input mapping
+  Delete "$MPdir.Base\defaults\InputDeviceMappings\MPControlPlugin.xml"
 !macroend
 
 ;======================================


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.