← Back to team overview

linuxdcpp-team team mailing list archive

[Branch ~dcplusplus-team/dc-plugin-sdk/trunk] Rev 13: Updated the .NET plugin references to new library path

 

------------------------------------------------------------
revno: 13
committer: Fredrik Ullner <ullner@xxxxxxxxx>
branch nick: dc-plugin-sdk
timestamp: Wed 2014-04-16 20:29:14 +0200
message:
  Updated the .NET plugin references to new library path
modified:
  Libraries/DotNetPlugin/CommandReferrer.cpp
  Libraries/DotNetPlugin/Marshalling.h
  Libraries/DotNetPlugin/NETPluginSink.cpp
  Libraries/DotNetPlugin/Plugin.cpp
  Libraries/DotNetPlugin/PluginBase.cpp
  Libraries/DotNetPlugin/PluginBase.h
  Libraries/DotNetPlugin/PluginHelper.cpp
  Libraries/DotNetPlugin/PluginInformation.h
  Libraries/DotNetPlugin/Win32/DotNetPlugin_vs2012.vcxproj
  Libraries/DotNetPlugin/Win32/DotNetPlugin_vs2012.vcxproj.filters
  Libraries/DotNetPlugin/stdafx.h


--
lp:dc-plugin-sdk
https://code.launchpad.net/~dcplusplus-team/dc-plugin-sdk/trunk

Your team Dcplusplus-team is subscribed to branch lp:dc-plugin-sdk.
To unsubscribe from this branch go to https://code.launchpad.net/~dcplusplus-team/dc-plugin-sdk/trunk/+edit-subscription
=== modified file 'Libraries/DotNetPlugin/CommandReferrer.cpp'
--- Libraries/DotNetPlugin/CommandReferrer.cpp	2013-08-11 13:29:19 +0000
+++ Libraries/DotNetPlugin/CommandReferrer.cpp	2014-04-16 18:29:14 +0000
@@ -4,7 +4,7 @@
 #include "CommandReferrer.h"
 #include "Marshalling.h"
 
-#include "pluginSDK\UI.h"
+#include "dcapi\UI.hpp"
 
 #include <functional>
 

=== modified file 'Libraries/DotNetPlugin/Marshalling.h'
--- Libraries/DotNetPlugin/Marshalling.h	2013-08-11 13:29:19 +0000
+++ Libraries/DotNetPlugin/Marshalling.h	2014-04-16 18:29:14 +0000
@@ -1,7 +1,7 @@
 
 #pragma once
 
-#include "pluginsdk\PluginDefs.h"
+#include "dcapi\PluginDefs.h"
 
 #include "PluginInformation.h"
 

=== modified file 'Libraries/DotNetPlugin/NETPluginSink.cpp'
--- Libraries/DotNetPlugin/NETPluginSink.cpp	2013-08-11 13:29:19 +0000
+++ Libraries/DotNetPlugin/NETPluginSink.cpp	2014-04-16 18:29:14 +0000
@@ -4,14 +4,14 @@
 #include "NETPluginSink.h"
 #include "Marshalling.h"
 
-#include <pluginsdk\Config.h>
-#include <pluginsdk\Core.h>
-#include <pluginsdk\Logger.h>
-#include <pluginsdk\Queue.h>
-#include <pluginsdk\UI.h>
-#include <pluginsdk\Connections.h>
-#include <pluginsdk\Tagger.h>
-#include <pluginsdk\Hubs.h>
+#include <dcapi\Config.hpp>
+#include <dcapi\Core.hpp>
+#include <dcapi\Logger.hpp>
+#include <dcapi\Queue.hpp>
+#include <dcapi\UI.hpp>
+#include <dcapi\Connections.hpp>
+#include <dcapi\Tagger.hpp>
+#include <dcapi\Hubs.hpp>
 
 dcapi::CNETPluginSink::CNETPluginSink()
 {

=== modified file 'Libraries/DotNetPlugin/Plugin.cpp'
--- Libraries/DotNetPlugin/Plugin.cpp	2013-08-11 13:29:19 +0000
+++ Libraries/DotNetPlugin/Plugin.cpp	2014-04-16 18:29:14 +0000
@@ -8,9 +8,9 @@
 #include "Marshalling.h"
 #include "MetaDataParser.h"
 
-#include "PluginSDK\Core.h"
-#include "PluginSDK\Logger.h"
-#include "PluginSDK\Util.h"
+#include "dcapi\Core.hpp"
+#include "dcapi\Logger.hpp"
+#include "dcapi\Util.hpp"
 
 #include <iostream>
 #include <windows.h>

=== modified file 'Libraries/DotNetPlugin/PluginBase.cpp'
--- Libraries/DotNetPlugin/PluginBase.cpp	2013-08-11 13:29:19 +0000
+++ Libraries/DotNetPlugin/PluginBase.cpp	2014-04-16 18:29:14 +0000
@@ -3,16 +3,16 @@
 
 #include "PluginBase.h"
 
-#include <pluginsdk/Config.h>
-#include <pluginsdk/Connections.h>
-#include <pluginsdk/Core.h>
-#include <pluginsdk/Hooks.h>
-#include <pluginsdk/Hubs.h>
-#include <pluginsdk/Logger.h>
-#include <pluginsdk/Queue.h>
-#include <pluginsdk/Tagger.h>
-#include <pluginsdk/UI.h>
-#include <pluginsdk/Util.h>
+#include <dcapi/Config.hpp>
+#include <dcapi/Connections.hpp>
+#include <dcapi/Core.hpp>
+#include <dcapi/Hooks.hpp>
+#include <dcapi/Hubs.hpp>
+#include <dcapi/Logger.hpp>
+#include <dcapi/Queue.hpp>
+#include <dcapi/Tagger.hpp>
+#include <dcapi/UI.hpp>
+#include <dcapi/Util.hpp>
 
 bool dcapi::CPluginBase::Initialize(dcapi::CPluginInformation* pPluginInformation, DCCorePtr core, bool, bool)
 {

=== modified file 'Libraries/DotNetPlugin/PluginBase.h'
--- Libraries/DotNetPlugin/PluginBase.h	2013-08-11 13:29:19 +0000
+++ Libraries/DotNetPlugin/PluginBase.h	2014-04-16 18:29:14 +0000
@@ -3,7 +3,7 @@
 
 #include "PluginInformation.h"
 
-#include <pluginsdk/PluginDefs.h>
+#include <dcapi/PluginDefs.h>
 
 namespace dcapi {
 

=== modified file 'Libraries/DotNetPlugin/PluginHelper.cpp'
--- Libraries/DotNetPlugin/PluginHelper.cpp	2013-08-11 13:29:19 +0000
+++ Libraries/DotNetPlugin/PluginHelper.cpp	2014-04-16 18:29:14 +0000
@@ -7,8 +7,8 @@
 #include "AssemblyLoader.h"
 #include "NETPluginSink.h"
 
-#include "pluginsdk\PluginDefs.h"
-#include "PluginSDK\Logger.h"
+#include "dcapi\PluginDefs.h"
+#include "dcapi\Logger.hpp"
 
 bool dcapi::CPluginHelper::Initialize(CPluginInformation* pPluginInformation, DCCorePtr core, bool install, bool runtime)
 {

=== modified file 'Libraries/DotNetPlugin/PluginInformation.h'
--- Libraries/DotNetPlugin/PluginInformation.h	2013-08-11 13:29:19 +0000
+++ Libraries/DotNetPlugin/PluginInformation.h	2014-04-16 18:29:14 +0000
@@ -3,7 +3,7 @@
 
 #include "version.h"
 
-#include <pluginsdk/PluginDefs.h>
+#include <dcapi/PluginDefs.h>
 
 #include <string>
 #include <map>

=== modified file 'Libraries/DotNetPlugin/Win32/DotNetPlugin_vs2012.vcxproj'
--- Libraries/DotNetPlugin/Win32/DotNetPlugin_vs2012.vcxproj	2013-08-11 13:29:19 +0000
+++ Libraries/DotNetPlugin/Win32/DotNetPlugin_vs2012.vcxproj	2014-04-16 18:29:14 +0000
@@ -95,7 +95,7 @@
       <WarningLevel>Level4</WarningLevel>
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>.\;..\;..\..\;</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\;..\;..\..\;..\..\dcapi</AdditionalIncludeDirectories>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <PreprocessorDefinitions>DCAPI_HOST;_WINDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
@@ -135,7 +135,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>.\;..\;..\..\;</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\;..\;..\..\;..\..\dcapi</AdditionalIncludeDirectories>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <PreprocessorDefinitions>DCAPI_HOST;_WINDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
@@ -175,16 +175,16 @@
     </ProjectReference>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\cpp\PluginSDK\Config.cpp" />
-    <ClCompile Include="..\..\..\cpp\PluginSDK\Connections.cpp" />
-    <ClCompile Include="..\..\..\cpp\PluginSDK\Core.cpp" />
-    <ClCompile Include="..\..\..\cpp\PluginSDK\Hooks.cpp" />
-    <ClCompile Include="..\..\..\cpp\PluginSDK\Hubs.cpp" />
-    <ClCompile Include="..\..\..\cpp\PluginSDK\Logger.cpp" />
-    <ClCompile Include="..\..\..\cpp\PluginSDK\Queue.cpp" />
-    <ClCompile Include="..\..\..\cpp\PluginSDK\Tagger.cpp" />
-    <ClCompile Include="..\..\..\cpp\PluginSDK\UI.cpp" />
-    <ClCompile Include="..\..\..\cpp\PluginSDK\Util.cpp" />
+    <ClCompile Include="..\..\dcapi\Config.cpp" />
+    <ClCompile Include="..\..\dcapi\Connections.cpp" />
+    <ClCompile Include="..\..\dcapi\Core.cpp" />
+    <ClCompile Include="..\..\dcapi\Hooks.cpp" />
+    <ClCompile Include="..\..\dcapi\Hubs.cpp" />
+    <ClCompile Include="..\..\dcapi\Logger.cpp" />
+    <ClCompile Include="..\..\dcapi\Queue.cpp" />
+    <ClCompile Include="..\..\dcapi\Tagger.cpp" />
+    <ClCompile Include="..\..\dcapi\UI.cpp" />
+    <ClCompile Include="..\..\dcapi\Util.cpp" />
     <ClCompile Include="..\AssemblyLoader.cpp" />
     <ClCompile Include="..\AssemblyManager.cpp" />
     <ClCompile Include="..\AssemblyResolver.cpp" />
@@ -199,17 +199,17 @@
     <ClCompile Include="..\stdafx.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\cpp\PluginSDK\Config.h" />
-    <ClInclude Include="..\..\..\cpp\PluginSDK\Connections.h" />
-    <ClInclude Include="..\..\..\cpp\PluginSDK\Core.h" />
-    <ClInclude Include="..\..\..\cpp\PluginSDK\Hooks.h" />
-    <ClInclude Include="..\..\..\cpp\PluginSDK\Hubs.h" />
-    <ClInclude Include="..\..\..\cpp\PluginSDK\Logger.h" />
-    <ClInclude Include="..\..\..\cpp\PluginSDK\PluginDefs.h" />
-    <ClInclude Include="..\..\..\cpp\PluginSDK\Queue.h" />
-    <ClInclude Include="..\..\..\cpp\PluginSDK\Tagger.h" />
-    <ClInclude Include="..\..\..\cpp\PluginSDK\UI.h" />
-    <ClInclude Include="..\..\..\cpp\PluginSDK\Util.h" />
+    <ClInclude Include="..\..\dcapi\Config.hpp" />
+    <ClInclude Include="..\..\dcapi\Connections.hpp" />
+    <ClInclude Include="..\..\dcapi\Core.hpp" />
+    <ClInclude Include="..\..\dcapi\Hooks.hpp" />
+    <ClInclude Include="..\..\dcapi\Hubs.hpp" />
+    <ClInclude Include="..\..\dcapi\Logger.hpp" />
+    <ClInclude Include="..\..\dcapi\PluginDefs.h" />
+    <ClInclude Include="..\..\dcapi\Queue.hpp" />
+    <ClInclude Include="..\..\dcapi\Tagger.hpp" />
+    <ClInclude Include="..\..\dcapi\UI.hpp" />
+    <ClInclude Include="..\..\dcapi\Util.hpp" />
     <ClInclude Include="..\AssemblyLoader.h" />
     <ClInclude Include="..\AssemblyManager.h" />
     <ClInclude Include="..\AssemblyResolver.h" />

=== modified file 'Libraries/DotNetPlugin/Win32/DotNetPlugin_vs2012.vcxproj.filters'
--- Libraries/DotNetPlugin/Win32/DotNetPlugin_vs2012.vcxproj.filters	2013-08-11 13:29:19 +0000
+++ Libraries/DotNetPlugin/Win32/DotNetPlugin_vs2012.vcxproj.filters	2014-04-16 18:29:14 +0000
@@ -13,12 +13,12 @@
       <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
     </Filter>
-    <Filter Include="Header Files\PluginSDK">
-      <UniqueIdentifier>{9f77d782-450d-4c59-b798-5ecbfd9bd929}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\PluginSDK">
+    <Filter Include="Source Files\dcapi">
       <UniqueIdentifier>{eb310ede-eb0d-42bb-8d9c-ffc61a02bc6d}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Header Files\dcapi">
+      <UniqueIdentifier>{91eab6cd-1b1b-493d-a6e4-6d7dd9a3e701}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\AssemblyLoader.cpp">
@@ -57,35 +57,35 @@
     <ClCompile Include="..\MetaDataParser.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\cpp\PluginSDK\Config.cpp">
-      <Filter>Source Files\PluginSDK</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\cpp\PluginSDK\Connections.cpp">
-      <Filter>Source Files\PluginSDK</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\cpp\PluginSDK\Core.cpp">
-      <Filter>Source Files\PluginSDK</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\cpp\PluginSDK\Hooks.cpp">
-      <Filter>Source Files\PluginSDK</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\cpp\PluginSDK\Hubs.cpp">
-      <Filter>Source Files\PluginSDK</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\cpp\PluginSDK\Logger.cpp">
-      <Filter>Source Files\PluginSDK</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\cpp\PluginSDK\Queue.cpp">
-      <Filter>Source Files\PluginSDK</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\cpp\PluginSDK\Tagger.cpp">
-      <Filter>Source Files\PluginSDK</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\cpp\PluginSDK\UI.cpp">
-      <Filter>Source Files\PluginSDK</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\cpp\PluginSDK\Util.cpp">
-      <Filter>Source Files\PluginSDK</Filter>
+    <ClCompile Include="..\..\dcapi\Config.cpp">
+      <Filter>Source Files\dcapi</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\dcapi\Connections.cpp">
+      <Filter>Source Files\dcapi</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\dcapi\Core.cpp">
+      <Filter>Source Files\dcapi</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\dcapi\Hooks.cpp">
+      <Filter>Source Files\dcapi</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\dcapi\Hubs.cpp">
+      <Filter>Source Files\dcapi</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\dcapi\Logger.cpp">
+      <Filter>Source Files\dcapi</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\dcapi\Queue.cpp">
+      <Filter>Source Files\dcapi</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\dcapi\Tagger.cpp">
+      <Filter>Source Files\dcapi</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\dcapi\UI.cpp">
+      <Filter>Source Files\dcapi</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\dcapi\Util.cpp">
+      <Filter>Source Files\dcapi</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
@@ -131,38 +131,38 @@
     <ClInclude Include="..\NETPluginSink.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\cpp\PluginSDK\Config.h">
-      <Filter>Header Files\PluginSDK</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\cpp\PluginSDK\Connections.h">
-      <Filter>Header Files\PluginSDK</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\cpp\PluginSDK\Core.h">
-      <Filter>Header Files\PluginSDK</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\cpp\PluginSDK\Hooks.h">
-      <Filter>Header Files\PluginSDK</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\cpp\PluginSDK\Hubs.h">
-      <Filter>Header Files\PluginSDK</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\cpp\PluginSDK\Logger.h">
-      <Filter>Header Files\PluginSDK</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\cpp\PluginSDK\Queue.h">
-      <Filter>Header Files\PluginSDK</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\cpp\PluginSDK\PluginDefs.h">
-      <Filter>Header Files\PluginSDK</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\cpp\PluginSDK\Tagger.h">
-      <Filter>Header Files\PluginSDK</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\cpp\PluginSDK\UI.h">
-      <Filter>Header Files\PluginSDK</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\cpp\PluginSDK\Util.h">
-      <Filter>Header Files\PluginSDK</Filter>
+    <ClInclude Include="..\..\dcapi\Config.hpp">
+      <Filter>Header Files\dcapi</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\dcapi\Connections.hpp">
+      <Filter>Header Files\dcapi</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\dcapi\Core.hpp">
+      <Filter>Header Files\dcapi</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\dcapi\Hooks.hpp">
+      <Filter>Header Files\dcapi</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\dcapi\Hubs.hpp">
+      <Filter>Header Files\dcapi</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\dcapi\Logger.hpp">
+      <Filter>Header Files\dcapi</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\dcapi\PluginDefs.h">
+      <Filter>Header Files\dcapi</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\dcapi\Queue.hpp">
+      <Filter>Header Files\dcapi</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\dcapi\Tagger.hpp">
+      <Filter>Header Files\dcapi</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\dcapi\UI.hpp">
+      <Filter>Header Files\dcapi</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\dcapi\Util.hpp">
+      <Filter>Header Files\dcapi</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>

=== modified file 'Libraries/DotNetPlugin/stdafx.h'
--- Libraries/DotNetPlugin/stdafx.h	2013-08-11 13:29:19 +0000
+++ Libraries/DotNetPlugin/stdafx.h	2014-04-16 18:29:14 +0000
@@ -17,7 +17,7 @@
 #include <cstdint>
 #include <string>
 
-#include "pluginsdk/PluginDefs.h"
+#include "dcapi/PluginDefs.h"
 
 #include "version.h"