linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 28
committer: Fredrik Ullner <ullner@xxxxxxxxx>
branch nick: dc-plugin-sdk
timestamp: Mon 2014-06-30 00:11:44 +0200
message:
  Python 2.7 vs 3.4 fixes
renamed:
  Examples/Python-Skeleton/copy.bat => Examples/Python-Skeleton/copy_27.bat
  Examples/Python-Skeleton/info.xml => Examples/Python-Skeleton/info_27.xml
modified:
  Examples/Python-Skeleton/copy_34.bat
  Libraries/PythonPlugin/PythonPlugin_27.vcxproj
  Libraries/PythonPlugin/PythonPlugin_34.vcxproj
  Libraries/PythonPlugin/version.h
  Examples/Python-Skeleton/copy_27.bat


--
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

=== renamed file 'Examples/Python-Skeleton/copy.bat' => 'Examples/Python-Skeleton/copy_27.bat'
--- Examples/Python-Skeleton/copy.bat	2014-06-29 17:06:46 +0000
+++ Examples/Python-Skeleton/copy_27.bat	2014-06-29 22:11:44 +0000
@@ -1,6 +1,6 @@
-mkdir MyPlugin
-xcopy /y info.xml MyPlugin\
-xcopy /y MyPlugin.py MyPlugin\
-xcopy /y ..\..\Libraries\PythonPlugin\Release\PythonPlugin.dll MyPlugin\
-xcopy /y ..\..\Libraries\PyPlugin.DataTypes\* MyPlugin\
-xcopy /y C:\Windows\SysWOW64\Python27.dll MyPlugin\
\ No newline at end of file
+mkdir MyPlugin_27
+xcopy /y info.xml MyPlugin_27\
+xcopy /y MyPlugin.py MyPlugin_27\
+xcopy /y ..\..\Libraries\PythonPlugin\Release\PythonPlugin_27.dll MyPlugin_27\
+xcopy /y ..\..\Libraries\PyPlugin.DataTypes\* MyPlugin_27\
+xcopy /y C:\Windows\SysWOW64\Python27.dll MyPlugin_27\

=== modified file 'Examples/Python-Skeleton/copy_34.bat'
--- Examples/Python-Skeleton/copy_34.bat	2014-06-29 21:56:27 +0000
+++ Examples/Python-Skeleton/copy_34.bat	2014-06-29 22:11:44 +0000
@@ -1,6 +1,6 @@
-mkdir MyPlugin
-xcopy /y info.xml MyPlugin\
-xcopy /y MyPlugin.py MyPlugin\
-xcopy /y ..\..\Libraries\PythonPlugin\Release\PythonPlugin.dll MyPlugin\
-xcopy /y ..\..\Libraries\PyPlugin.DataTypes\* MyPlugin\
-xcopy /y C:\Windows\SysWOW64\Python34.dll MyPlugin\
+mkdir MyPlugin_34
+xcopy /y info_34.xml MyPlugin_34\
+xcopy /y MyPlugin.py MyPlugin_34\
+xcopy /y ..\..\Libraries\PythonPlugin\Release\PythonPlugin_34.dll MyPlugin_34\
+xcopy /y ..\..\Libraries\PyPlugin.DataTypes\* MyPlugin_34\
+xcopy /y C:\Windows\SysWOW64\Python34.dll MyPlugin_34\

=== renamed file 'Examples/Python-Skeleton/info.xml' => 'Examples/Python-Skeleton/info_27.xml'
=== modified file 'Libraries/PythonPlugin/PythonPlugin_27.vcxproj'
--- Libraries/PythonPlugin/PythonPlugin_27.vcxproj	2014-06-29 21:56:27 +0000
+++ Libraries/PythonPlugin/PythonPlugin_27.vcxproj	2014-06-29 22:11:44 +0000
@@ -21,8 +21,8 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{471BB329-FEAF-4A74-B99A-FF5E69DAD595}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
-    <RootNamespace>PythonPlugin</RootNamespace>
-    <ProjectName>PythonPlugin</ProjectName>
+    <RootNamespace>PythonPlugin_27</RootNamespace>
+    <ProjectName>PythonPlugin_27</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -76,6 +76,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
     <IntDir>$(Configuration)\Temp\</IntDir>
+    <TargetName>$(ProjectName)</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>

=== modified file 'Libraries/PythonPlugin/PythonPlugin_34.vcxproj'
--- Libraries/PythonPlugin/PythonPlugin_34.vcxproj	2014-06-29 21:56:27 +0000
+++ Libraries/PythonPlugin/PythonPlugin_34.vcxproj	2014-06-29 22:11:44 +0000
@@ -21,8 +21,8 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{471BB329-FEAF-4A74-B99A-FF5E69DAD596}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
-    <RootNamespace>PythonPlugin</RootNamespace>
-    <ProjectName>PythonPlugin</ProjectName>
+    <RootNamespace>PythonPlugin_34</RootNamespace>
+    <ProjectName>PythonPlugin_34</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -69,6 +69,7 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
+    <TargetName>PythonPlugin</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
@@ -76,6 +77,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
     <IntDir>$(Configuration)\Temp\</IntDir>
+    <TargetName>$(ProjectName)</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>

=== modified file 'Libraries/PythonPlugin/version.h'
--- Libraries/PythonPlugin/version.h	2014-06-29 21:56:27 +0000
+++ Libraries/PythonPlugin/version.h	2014-06-29 22:11:44 +0000
@@ -5,7 +5,7 @@
 #define PLUGIN_VERSION_H
 
 /* UUID/GUID for this plugin project */
-#define PLUGIN_GUID "{4A7A90C0-3FEE-42A4-AE1E-F8A2FA0644D9}"
+#define PLUGIN_GUID "..."
 
 /* Name of the plugin */
 #define PLUGIN_NAME "MyExamplePlugin"