Merge authors:
poy (poy)
------------------------------------------------------------
revno: 38 [merge]
committer: poy <p...@123gen.com>
branch nick: DescriptionRotator
timestamp: Tue 2013-06-18 23:20:58 +0200
message:
merge & version increase
modified:
packaging/info.xml
packaging/make_dcext.bat
packaging/packager/packager.cpp
projects/make/Makefile
projects/vs2012/Plugin.vcxproj
src/resource.h
src/resource.rc
src/stdafx.h
src/version.h
--
lp:~dcplusplus-team/dcpp-plugin-sdk-cpp/DescriptionRotator
https://code.launchpad.net/~dcplusplus-team/dcpp-plugin-sdk-cpp/DescriptionRotator
Your team Dcplusplus-team is subscribed to branch
lp:~dcplusplus-team/dcpp-plugin-sdk-cpp/DescriptionRotator.
To unsubscribe from this branch go to
https://code.launchpad.net/~dcplusplus-team/dcpp-plugin-sdk-cpp/DescriptionRotator/+edit-subscription
=== modified file 'packaging/info.xml'
--- packaging/info.xml 2013-06-08 11:49:39 +0000
+++ packaging/info.xml 2013-06-18 21:20:58 +0000
@@ -21,10 +21,10 @@
<dcext>
<UUID>{f2a7dea1-d6bf-4759-8b46-86857c117052}</UUID>
<Name>Description rotator</Name>
- <Version>1</Version>
+ <Version>2</Version>
<ApiVersion>8</ApiVersion>
<Author>DC++</Author>
- <Description>Rotate between multiple descriptions.</Description>
+ <Description>Rotate between multiple descriptions, show the online time.</Description>
<Website>http://dcplusplus.sourceforge.net/</Website>
<Plugin Platform="pe-x64">DescriptionRotator-x64.dll</Plugin>
<Plugin Platform="pe-x86">DescriptionRotator-x86.dll</Plugin>
=== modified file 'packaging/make_dcext.bat'
--- packaging/make_dcext.bat 2013-06-08 11:49:39 +0000
+++ packaging/make_dcext.bat 2013-06-18 21:20:58 +0000
@@ -10,10 +10,10 @@
cd ..\..\packaging
-copy ..\projects\make\build-mingw-x64\%PLUGIN_NAME%.dll %PLUGIN_NAME%-x64.dll
-copy ..\projects\make\build-mingw-x64\%PLUGIN_NAME%.pdb %PLUGIN_NAME%-x64.pdb
-copy ..\projects\make\build-mingw-x86\%PLUGIN_NAME%.dll %PLUGIN_NAME%-x86.dll
-copy ..\projects\make\build-mingw-x86\%PLUGIN_NAME%.pdb %PLUGIN_NAME%-x86.pdb
+copy ..\projects\make\build-mingw-x64\%PLUGIN_NAME%-x64.dll %PLUGIN_NAME%-x64.dll
+copy ..\projects\make\build-mingw-x64\%PLUGIN_NAME%-x64.pdb %PLUGIN_NAME%-x64.pdb
+copy ..\projects\make\build-mingw-x86\%PLUGIN_NAME%-x86.dll %PLUGIN_NAME%-x86.dll
+copy ..\projects\make\build-mingw-x86\%PLUGIN_NAME%-x86.pdb %PLUGIN_NAME%-x86.pdb
set PATH=C:\Cygwin\bin
zip -9 %PLUGIN_NAME%.dcext info.xml %PLUGIN_NAME%-x64.dll %PLUGIN_NAME%-x86.dll %PLUGIN_NAME%-x64.pdb %PLUGIN_NAME%-x86.pdb %PLUGIN_NAME%.ico
=== modified file 'packaging/packager/packager.cpp'
--- packaging/packager/packager.cpp 2013-06-03 16:30:05 +0000
+++ packaging/packager/packager.cpp 2013-06-16 18:30:11 +0000
@@ -1,11 +1,9 @@
// Generate an info.xml template from the version.h file.
+#include <src/stdafx.h>
+
#include <fstream>
#include <iostream>
-#include <string>
-
-#include <pluginsdk/PluginDefs.h>
-#include <src/version.h>
using namespace std;
=== modified file 'projects/make/Makefile'
--- projects/make/Makefile 2013-06-08 11:49:39 +0000
+++ projects/make/Makefile 2013-06-18 21:20:58 +0000
@@ -54,8 +54,10 @@
ifeq ($(findstring x86_64, $(COMPILER_SPEC)),)
CPPFLAGS += -march=i686
OUTPUT_DIR := $(OUTPUT_DIR)-x86
+ TARGET := $(TARGET)-x86
else
OUTPUT_DIR := $(OUTPUT_DIR)-x64
+ TARGET := $(TARGET)-x64
endif
ifeq ($(OS), Windows_NT)
@@ -112,6 +114,8 @@
PDB =
else
PDB := $(OUTPUT_DIR)/$(TARGET).pdb
+ RCFLAGS := -DPLUGIN_FILE_NAME="\\\"$(TARGET)\\\"" \
+ -DPLUGIN_FILE_NAME_EXT="\\\"$(TARGET)$(LIBEXT)\\\""
endif
TARGET := $(OUTPUT_DIR)/$(TARGET)$(LIBEXT)
@@ -142,8 +146,10 @@
$(OUTPUT_DIR)/%.o: %.cpp
$(COMPILE.cpp) $< $(OUTPUT_OPTION)
+ifneq ($(findstring mingw, $(COMPILER_SPEC)),)
$(OUTPUT_DIR)/%.o: %.rc
- windres $< $(OUTPUT_OPTION)
+ windres $< $(RCFLAGS) $(OUTPUT_OPTION)
+endif
$(OBJS): | $(OUTPUT_DIR)
=== modified file 'projects/vs2012/Plugin.vcxproj'
--- projects/vs2012/Plugin.vcxproj 2013-06-08 11:49:39 +0000
+++ projects/vs2012/Plugin.vcxproj 2013-06-18 21:20:58 +0000
@@ -65,19 +65,19 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
- <TargetName>DescriptionRotator</TargetName>
+ <TargetName>DescriptionRotator-$(PROCESSOR_ARCHITECTURE)</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
- <TargetName>MyPlugin</TargetName>
+ <TargetName>MyPlugin-$(PROCESSOR_ARCHITECTURE)</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>true</LinkIncremental>
- <TargetName>DescriptionRotator</TargetName>
+ <TargetName>DescriptionRotator-$(PROCESSOR_ARCHITECTURE)</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>true</LinkIncremental>
- <TargetName>MyPlugin</TargetName>
+ <TargetName>MyPlugin-$(PROCESSOR_ARCHITECTURE)</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
@@ -96,6 +96,9 @@
<AdditionalOptions>/EXPORT:pluginInit %(AdditionalOptions)</AdditionalOptions>
<AdditionalDependencies>comctl32.lib;shlwapi.lib;uxtheme.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
+ <ResourceCompile>
+ <PreprocessorDefinitions>PLUGIN_FILE_NAME="\"$(TargetName)\"";PLUGIN_FILE_NAME_EXT="\"$(TargetFileName)\"";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ResourceCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
@@ -112,6 +115,9 @@
<SubSystem>Windows</SubSystem>
<AdditionalOptions>/EXPORT:pluginInit %(AdditionalOptions)</AdditionalOptions>
</Link>
+ <ResourceCompile>
+ <PreprocessorDefinitions>PLUGIN_FILE_NAME="\"$(TargetName)\"";PLUGIN_FILE_NAME_EXT="\"$(TargetFileName)\"";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ResourceCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
@@ -131,6 +137,9 @@
<AdditionalOptions>/EXPORT:pluginInit %(AdditionalOptions)</AdditionalOptions>
<AdditionalDependencies>comctl32.lib;shlwapi.lib;uxtheme.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
+ <ResourceCompile>
+ <PreprocessorDefinitions>PLUGIN_FILE_NAME="\"$(TargetName)\"";PLUGIN_FILE_NAME_EXT="\"$(TargetFileName)\"";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ResourceCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
@@ -148,6 +157,9 @@
<OptimizeReferences>true</OptimizeReferences>
<AdditionalOptions>/EXPORT:pluginInit %(AdditionalOptions)</AdditionalOptions>
</Link>
+ <ResourceCompile>
+ <PreprocessorDefinitions>PLUGIN_FILE_NAME="\"$(TargetName)\"";PLUGIN_FILE_NAME_EXT="\"$(TargetFileName)\"";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ResourceCompile>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\dwt\src\Application.cpp" />
@@ -268,4 +280,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
=== modified file 'src/resource.h'
--- src/resource.h 2012-11-15 18:17:16 +0000
+++ src/resource.h 2013-06-16 18:30:11 +0000
@@ -2,7 +2,6 @@
// Microsoft Visual C++ generated include file.
// Used by resource.rc
//
-#define VERSION_INFO 1
// Next default values for new objects
//
=== modified file 'src/resource.rc'
--- src/resource.rc 2013-06-08 11:49:39 +0000
+++ src/resource.rc 2013-06-18 21:20:58 +0000
@@ -8,6 +8,7 @@
// Generated from the TEXTINCLUDE 2 resource.
//
#include "afxres.h"
+#include "version.h"
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
@@ -33,26 +34,68 @@
2 TEXTINCLUDE
BEGIN
"#include ""afxres.h""\r\n"
+ "#include ""version.h""\r\n"
"\0"
END
3 TEXTINCLUDE
BEGIN
+ "#define str_(x) #x\r\n"
+ "#define str(x) str_(x)\r\n"
"\r\n"
+ "1 VERSIONINFO\r\n"
+ " FILEVERSION PLUGIN_VERSION_MAJOR,PLUGIN_VERSION_MINOR,0,0\r\n"
+ " PRODUCTVERSION PLUGIN_VERSION_MAJOR,PLUGIN_VERSION_MINOR,0,0\r\n"
+ " FILEFLAGSMASK 0x17L\r\n"
+ "#ifdef _DEBUG\r\n"
+ " FILEFLAGS 0x1L\r\n"
+ "#else\r\n"
+ " FILEFLAGS 0x0L\r\n"
+ "#endif\r\n"
+ " FILEOS 0x4L\r\n"
+ " FILETYPE 0x2L\r\n"
+ " FILESUBTYPE 0x0L\r\n"
+ "BEGIN\r\n"
+ " BLOCK ""StringFileInfo""\r\n"
+ " BEGIN\r\n"
+ " BLOCK ""080004b0""\r\n"
+ " BEGIN\r\n"
+ " VALUE ""Comments"", PLUGIN_WEB\r\n"
+ " VALUE ""FileDescription"", PLUGIN_NAME\r\n"
+ " VALUE ""FileVersion"", str(PLUGIN_VERSION_MAJOR) "", "" str(PLUGIN_VERSION_MINOR) "", 0, 0""\r\n"
+ " VALUE ""InternalName"", PLUGIN_FILE_NAME\r\n"
+ " VALUE ""LegalCopyright"", PLUGIN_AUTHOR\r\n"
+ " VALUE ""OriginalFilename"", PLUGIN_FILE_NAME_EXT\r\n"
+ " VALUE ""ProductName"", PLUGIN_NAME\r\n"
+ " VALUE ""ProductVersion"", str(PLUGIN_VERSION_MAJOR) "", "" str(PLUGIN_VERSION_MINOR) "", 0, 0""\r\n"
+ " END\r\n"
+ " END\r\n"
+ " BLOCK ""VarFileInfo""\r\n"
+ " BEGIN\r\n"
+ " VALUE ""Translation"", 0x800, 1200\r\n"
+ " END\r\n"
+ "END\r\n"
"\0"
END
#endif // APSTUDIO_INVOKED
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,0
- PRODUCTVERSION 1,0,0,0
+#endif // English (United States) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+#define str_(x) #x
+#define str(x) str_(x)
+
+1 VERSIONINFO
+ FILEVERSION PLUGIN_VERSION_MAJOR,PLUGIN_VERSION_MINOR,0,0
+ PRODUCTVERSION PLUGIN_VERSION_MAJOR,PLUGIN_VERSION_MINOR,0,0
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -67,14 +110,14 @@
BEGIN
BLOCK "080004b0"
BEGIN
- VALUE "Comments", "http://dcplusplus.sourceforge.net";
- VALUE "FileDescription", "Description rotator for DC++"
- VALUE "FileVersion", "1, 0, 0, 0"
- VALUE "InternalName", "DescriptionRotator"
- VALUE "LegalCopyright", "Copyright (C) 2012-2013 Jacek Sieka"
- VALUE "OriginalFilename", "DescriptionRotator.dll"
- VALUE "ProductName", "Description rotator for DC++"
- VALUE "ProductVersion", "1, 0, 0, 0"
+ VALUE "Comments", PLUGIN_WEB
+ VALUE "FileDescription", PLUGIN_NAME
+ VALUE "FileVersion", str(PLUGIN_VERSION_MAJOR) ", " str(PLUGIN_VERSION_MINOR) ", 0, 0"
+ VALUE "InternalName", PLUGIN_FILE_NAME
+ VALUE "LegalCopyright", PLUGIN_AUTHOR
+ VALUE "OriginalFilename", PLUGIN_FILE_NAME_EXT
+ VALUE "ProductName", PLUGIN_NAME
+ VALUE "ProductVersion", str(PLUGIN_VERSION_MAJOR) ", " str(PLUGIN_VERSION_MINOR) ", 0, 0"
END
END
BLOCK "VarFileInfo"
@@ -83,18 +126,6 @@
END
END
-#endif // English (United States) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED
=== modified file 'src/stdafx.h'
--- src/stdafx.h 2013-06-08 11:49:39 +0000
+++ src/stdafx.h 2013-06-18 21:20:58 +0000
@@ -39,6 +39,9 @@
#include "version.h"
+#define PLUGIN_VERSION (PLUGIN_VERSION_MAJOR + (PLUGIN_VERSION_MINOR >= 10 ? PLUGIN_VERSION_MINOR >= 100 ? \
+ PLUGIN_VERSION_MINOR / 1000. : PLUGIN_VERSION_MINOR / 100. : PLUGIN_VERSION_MINOR / 10.))
+
#ifdef _UNICODE
typedef std::wstring tstring;
#else
=== modified file 'src/version.h'
--- src/version.h 2013-06-18 21:14:12 +0000
+++ src/version.h 2013-06-18 21:20:58 +0000
@@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-/* Information about the plugin - fill this out! Don't forget to edit the resource file as well. */
+/* Information about the plugin - fill this out! */
#ifndef PLUGIN_VERSION_H
#define PLUGIN_VERSION_H
@@ -34,7 +34,8 @@
#define PLUGIN_DESC "Rotate between multiple descriptions, show the online time."
/* Version of the plugin (note: not API version) */
-#define PLUGIN_VERSION 1.0
+#define PLUGIN_VERSION_MAJOR 2
+#define PLUGIN_VERSION_MINOR 0
/* Plugin website, set to "N/A" if none */
#define PLUGIN_WEB "http://dcplusplus.sourceforge.net/";
_______________________________________________
Mailing list: https://launchpad.net/~linuxdcpp-team
Post to : linuxdcpp-team@lists.launchpad.net
Unsubscribe : https://launchpad.net/~linuxdcpp-team
More help : https://help.launchpad.net/ListHelp
