linuxdcpp-team team mailing list archive

Thread
Date

[Branch ~dcplusplus-team/dc-plugin-sdk/trunk] Rev 32: x64 support

To: LinuxDC++ Team <linuxdcpp-team@xxxxxxxxxxxxxxxxxxx>
From: noreply@xxxxxxxxxxxxx
Date: Wed, 02 Jul 2014 20:28:23 -0000
Reply-to: noreply@xxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

------------------------------------------------------------
revno: 32
committer: Fredrik Ullner <ullner@xxxxxxxxx>
branch nick: dc-plugin-sdk
timestamp: Wed 2014-07-02 22:25:43 +0200
message:
  x64 support
added:
  Examples/Python-Skeleton/copy_34_x64.bat
  Examples/Python-Skeleton/info_27_x64.xml
  Examples/Python-Skeleton/info_34_x64.xml
  Examples/Python-Skeleton/python27_win32.dll
  Examples/Python-Skeleton/python34_win32.dll
  Examples/Python-Skeleton/python34_x64.dll
modified:
  Examples/Python-Skeleton/MyPlugin.py
  Examples/Python-Skeleton/copy.bat
  Examples/Python-Skeleton/copy_27.bat
  Examples/Python-Skeleton/copy_34.bat
  Examples/Python-Skeleton/info_27.xml
  Examples/Python-Skeleton/info_34.xml
  Libraries/PythonPlugin/PythonPlugin_27.vcxproj
  Libraries/PythonPlugin/PythonPlugin_34.vcxproj
  Libraries/PythonPlugin/version.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 'Examples/Python-Skeleton/MyPlugin.py'
--- Examples/Python-Skeleton/MyPlugin.py	2014-06-29 16:08:52 +0000
+++ Examples/Python-Skeleton/MyPlugin.py	2014-07-02 20:25:43 +0000
@@ -15,6 +15,6 @@
     def OnChatIncoming(self, hubData, paramData):
         if paramData == "test":
             self.LogMessage("Test? Here's a test for you. In Python!");
-            self.sink.SendMessage(hubData, "Test? Here's a test for you. In Python!", False);
+            self.sink.SendMessage(hubData, "Python Test? Here's a test for you. In Python!", False);
 
         return DCPluginBase.OnChatIncoming(self,hubData, paramData);

=== modified file 'Examples/Python-Skeleton/copy.bat'
--- Examples/Python-Skeleton/copy.bat	2014-06-30 18:28:14 +0000
+++ Examples/Python-Skeleton/copy.bat	2014-07-02 20:25:43 +0000
@@ -1,8 +1,9 @@
-mkdir MyPlugin_%1
-xcopy /y info_%1.xml MyPlugin_%1\
-xcopy /y MyPlugin.py MyPlugin_%1\
-xcopy /y ..\..\Libraries\PythonPlugin\Release\PythonPlugin_%1.dll MyPlugin_%1\
-xcopy /y ..\..\Libraries\PyPlugin.DataTypes\* MyPlugin_%1\
-xcopy /y C:\Windows\SysWOW64\Python%1.dll MyPlugin_%1\
-move /y MyPlugin_%1\info_%1.xml MyPlugin_%1\info.xml
-move /y MyPlugin_%1\PythonPlugin_%1.dll MyPlugin_%1\PythonPlugin.dll
+mkdir MyPlugin_%1_%2
+xcopy /y info_%1_%2.xml MyPlugin_%1_%2\
+xcopy /y MyPlugin.py MyPlugin_%1_%2\
+xcopy /y ..\..\Libraries\PythonPlugin\%2\Release\PythonPlugin_%1.dll MyPlugin_%1_%2\
+xcopy /y ..\..\Libraries\PyPlugin.DataTypes\* MyPlugin_%1_%2\
+xcopy /y Python%1_%2.dll MyPlugin_%1_%2\
+move /y MyPlugin_%1_%2\Python%1_%2.dll MyPlugin_%1_%2\Python%1.dll
+move /y MyPlugin_%1_%2\info_%1_%2.xml MyPlugin_%1_%2\info.xml
+move /y MyPlugin_%1_%2\PythonPlugin_%1.dll MyPlugin_%1_%2\PythonPlugin.dll

=== modified file 'Examples/Python-Skeleton/copy_27.bat'
--- Examples/Python-Skeleton/copy_27.bat	2014-06-30 18:14:06 +0000
+++ Examples/Python-Skeleton/copy_27.bat	2014-07-02 20:25:43 +0000
@@ -1,1 +1,1 @@
-copy.bat 27
\ No newline at end of file
+copy.bat 27 win32

=== modified file 'Examples/Python-Skeleton/copy_34.bat'
--- Examples/Python-Skeleton/copy_34.bat	2014-06-30 18:14:06 +0000
+++ Examples/Python-Skeleton/copy_34.bat	2014-07-02 20:25:43 +0000
@@ -1,1 +1,1 @@
-copy.bat 34
\ No newline at end of file
+copy.bat 34 win32

=== added file 'Examples/Python-Skeleton/copy_34_x64.bat'
--- Examples/Python-Skeleton/copy_34_x64.bat	1970-01-01 00:00:00 +0000
+++ Examples/Python-Skeleton/copy_34_x64.bat	2014-07-02 20:25:43 +0000
@@ -0,0 +1,1 @@
+copy.bat 34 x64

=== modified file 'Examples/Python-Skeleton/info_27.xml'
--- Examples/Python-Skeleton/info_27.xml	2014-06-29 22:11:44 +0000
+++ Examples/Python-Skeleton/info_27.xml	2014-07-02 20:25:43 +0000
@@ -19,7 +19,7 @@
 -->
 
 <dcext>
-	<UUID>...</UUID>
+	<UUID>replace_guid</UUID>
 	<Name>MyExamplePlugin</Name>
 	<Version>1</Version>
 	<ApiVersion>8</ApiVersion>

=== added file 'Examples/Python-Skeleton/info_27_x64.xml'
--- Examples/Python-Skeleton/info_27_x64.xml	1970-01-01 00:00:00 +0000
+++ Examples/Python-Skeleton/info_27_x64.xml	2014-07-02 20:25:43 +0000
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+
+<!--
+This file is an example info.xml to be included in the dcext package. For more
+information, read "Plugin format (dcext).txt" in the "Doc" directory.
+
+This file has been generated using the information filled in the src/version.h file.
+
+Edit the <Plugin> tags to include your plugin files.
+If you support Windows, include pe-x64 and pe-x86 platforms.
+If you support Linux, include elf-x64 and elf-x86 platforms.
+
+The <Files> tag is empty; should you want to distribute additional files, include them
+in there within <File> tags (again, more information in the above doc file).
+It is recommended you provide a .pdb file to ease debugging.
+
+When you are done editing this file, rename it to "info.xml", move the relevant files
+to this directory and zip them; rename that .zip to .dcext and you are done!
+-->
+
+<dcext>
+	<UUID>replace_guid</UUID>
+	<Name>MyExamplePlugin</Name>
+	<Version>1</Version>
+	<ApiVersion>8</ApiVersion>
+	<Author>...</Author>
+	<Description>...</Description>
+	<Website>N/A</Website>
+	<Plugin Platform="pe-x64">PythonPlugin.dll</Plugin>
+	<Files>
+    		<File Platform="pe-x64">__init__.py</File>
+    		<File Platform="pe-x64">DataTypes.py</File>
+    		<File Platform="pe-x64">DCPluginBase.py</File>
+    		<File Platform="pe-x64">DCPluginSinkProxy.py</File>
+    		<File Platform="pe-x64">Enumerations.py</File>
+    		<File Platform="pe-x64">IDCPlugin.py</File>
+    		<File Platform="pe-x64">IDCPluginSink.py</File>
+
+		    <File Platform="pe-x64">Python27.dll</File>
+  
+    		<File Platform="pe-x64">MyPlugin.py</File>
+	</Files>
+</dcext>

=== modified file 'Examples/Python-Skeleton/info_34.xml'
--- Examples/Python-Skeleton/info_34.xml	2014-06-29 21:56:27 +0000
+++ Examples/Python-Skeleton/info_34.xml	2014-07-02 20:25:43 +0000
@@ -19,7 +19,7 @@
 -->
 
 <dcext>
-	<UUID>...</UUID>
+	<UUID>replace_guid</UUID>
 	<Name>MyExamplePlugin</Name>
 	<Version>1</Version>
 	<ApiVersion>8</ApiVersion>

=== added file 'Examples/Python-Skeleton/info_34_x64.xml'
--- Examples/Python-Skeleton/info_34_x64.xml	1970-01-01 00:00:00 +0000
+++ Examples/Python-Skeleton/info_34_x64.xml	2014-07-02 20:25:43 +0000
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+
+<!--
+This file is an example info.xml to be included in the dcext package. For more
+information, read "Plugin format (dcext).txt" in the "Doc" directory.
+
+This file has been generated using the information filled in the src/version.h file.
+
+Edit the <Plugin> tags to include your plugin files.
+If you support Windows, include pe-x64 and pe-x86 platforms.
+If you support Linux, include elf-x64 and elf-x86 platforms.
+
+The <Files> tag is empty; should you want to distribute additional files, include them
+in there within <File> tags (again, more information in the above doc file).
+It is recommended you provide a .pdb file to ease debugging.
+
+When you are done editing this file, rename it to "info.xml", move the relevant files
+to this directory and zip them; rename that .zip to .dcext and you are done!
+-->
+
+<dcext>
+	<UUID>replace_guid</UUID>
+	<Name>MyExamplePlugin</Name>
+	<Version>1</Version>
+	<ApiVersion>8</ApiVersion>
+	<Author>...</Author>
+	<Description>...</Description>
+	<Website>N/A</Website>
+	<Plugin Platform="pe-x64">PythonPlugin.dll</Plugin>
+	<Files>
+    		<File Platform="pe-x64">__init__.py</File>
+    		<File Platform="pe-x64">DataTypes.py</File>
+    		<File Platform="pe-x64">DCPluginBase.py</File>
+    		<File Platform="pe-x64">DCPluginSinkProxy.py</File>
+    		<File Platform="pe-x64">Enumerations.py</File>
+    		<File Platform="pe-x64">IDCPlugin.py</File>
+    		<File Platform="pe-x64">IDCPluginSink.py</File>
+
+        <File Platform="pe-x64">Python34.dll</File>
+  
+    		<File Platform="pe-x64">MyPlugin.py</File>
+	</Files>
+</dcext>

=== added file 'Examples/Python-Skeleton/python27_win32.dll'
Binary files Examples/Python-Skeleton/python27_win32.dll	1970-01-01 00:00:00 +0000 and Examples/Python-Skeleton/python27_win32.dll	2014-07-02 20:25:43 +0000 differ
=== added file 'Examples/Python-Skeleton/python34_win32.dll'
Binary files Examples/Python-Skeleton/python34_win32.dll	1970-01-01 00:00:00 +0000 and Examples/Python-Skeleton/python34_win32.dll	2014-07-02 20:25:43 +0000 differ
=== added file 'Examples/Python-Skeleton/python34_x64.dll'
Binary files Examples/Python-Skeleton/python34_x64.dll	1970-01-01 00:00:00 +0000 and Examples/Python-Skeleton/python34_x64.dll	2014-07-02 20:25:43 +0000 differ
=== modified file 'Libraries/PythonPlugin/PythonPlugin_27.vcxproj'
--- Libraries/PythonPlugin/PythonPlugin_27.vcxproj	2014-06-30 18:28:14 +0000
+++ Libraries/PythonPlugin/PythonPlugin_27.vcxproj	2014-07-02 20:25:43 +0000
@@ -69,14 +69,17 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
+    <OutDir>$(SolutionDir)$(Platform)$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)$(Platform)\$(Configuration)\Temp\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <IntDir>$(Configuration)\Temp\</IntDir>
+    <IntDir>$(SolutionDir)$(Platform)\$(Configuration)\Temp\</IntDir>
     <TargetName>$(ProjectName)</TargetName>
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>

=== modified file 'Libraries/PythonPlugin/PythonPlugin_34.vcxproj'
--- Libraries/PythonPlugin/PythonPlugin_34.vcxproj	2014-06-30 18:28:14 +0000
+++ Libraries/PythonPlugin/PythonPlugin_34.vcxproj	2014-07-02 20:25:43 +0000
@@ -70,17 +70,22 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
     <TargetName>PythonPlugin</TargetName>
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)$(Platform)\$(Configuration)\Temp\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
+    <IntDir>$(SolutionDir)$(Platform)\$(Configuration)\Temp\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <IntDir>$(Configuration)\Temp\</IntDir>
+    <IntDir>$(SolutionDir)$(Platform)\$(Configuration)\Temp\</IntDir>
     <TargetName>$(ProjectName)</TargetName>
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
+    <IntDir>$(SolutionDir)$(Platform)\$(Configuration)\Temp\</IntDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -105,12 +110,12 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>DCAPI_HOST;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>C:\Python34\include;..\;.\</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>C:\Python34_64\include;..\;.\</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalLibraryDirectories>C:\Python34\libs</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>C:\Python34_64\libs</AdditionalLibraryDirectories>
       <AdditionalDependencies>python34.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
@@ -143,14 +148,14 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>DCAPI_HOST;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>C:\Python34\include;..\;.\</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>C:\Python34_64\include;..\;.\</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>C:\Python34\libs</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>C:\Python34_64\libs</AdditionalLibraryDirectories>
       <AdditionalDependencies>python34.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>

=== modified file 'Libraries/PythonPlugin/version.h'
--- Libraries/PythonPlugin/version.h	2014-06-29 22:11:44 +0000
+++ Libraries/PythonPlugin/version.h	2014-07-02 20:25:43 +0000
@@ -5,7 +5,7 @@
 #define PLUGIN_VERSION_H
 
 /* UUID/GUID for this plugin project */
-#define PLUGIN_GUID "..."
+#define PLUGIN_GUID "replace_guid"
 
 /* Name of the plugin */
 #define PLUGIN_NAME "MyExamplePlugin"