merge of h++ compilation changes

6 files changed, 67 insertions, 69 deletions

diff --git a/plugins/HistoryPlusPlus/historypp.dpr b/plugins/HistoryPlusPlus/historypp.dpr
index 746459a1a6..e773410a07 100644
--- a/plugins/HistoryPlusPlus/historypp.dpr
+++ b/plugins/HistoryPlusPlus/historypp.dpr
@@ -26,7 +26,7 @@ library historypp;
 {$IMAGEBASE $02630000}

 

 {$R 'hpp_resource.res' 'hpp_resource.rc'}

-{$R 'hpp_res_ver.res' 'hpp_res_ver.rc'}

+{$R 'version.res'}

 {$R 'hpp_opt_dialog.res' 'hpp_opt_dialog.rc'}

 

 uses

diff --git a/plugins/HistoryPlusPlus/historypp.dproj b/plugins/HistoryPlusPlus/historypp.dproj
index 311d51f48a..94c2a85041 100644
--- a/plugins/HistoryPlusPlus/historypp.dproj
+++ b/plugins/HistoryPlusPlus/historypp.dproj
@@ -148,9 +148,6 @@
 			<RcCompile Include="hpp_resource.rc">

 				<Form>hpp_resource.res</Form>

 			</RcCompile>

-			<RcCompile Include="hpp_res_ver.rc">

-				<Form>hpp_res_ver.res</Form>

-			</RcCompile>

 			<RcCompile Include="hpp_opt_dialog.rc">

 				<Form>hpp_opt_dialog.res</Form>

 			</RcCompile>

@@ -212,45 +209,8 @@
 			</BuildConfiguration>

 		</ItemGroup>

 		<ProjectExtensions>

-			<Borland.Personality>Delphi.Personality.12</Borland.Personality>

 			<Borland.ProjectType/>

 			<BorlandProject>

-				<Delphi.Personality>

-					<Source>

-						<Source Name="MainSource">historypp.dpr</Source>

-					</Source>

-					<VersionInfo>

-						<VersionInfo Name="IncludeVerInfo">False</VersionInfo>

-						<VersionInfo Name="AutoIncBuild">False</VersionInfo>

-						<VersionInfo Name="MajorVer">1</VersionInfo>

-						<VersionInfo Name="MinorVer">0</VersionInfo>

-						<VersionInfo Name="Release">0</VersionInfo>

-						<VersionInfo Name="Build">0</VersionInfo>

-						<VersionInfo Name="Debug">False</VersionInfo>

-						<VersionInfo Name="PreRelease">False</VersionInfo>

-						<VersionInfo Name="Special">False</VersionInfo>

-						<VersionInfo Name="Private">False</VersionInfo>

-						<VersionInfo Name="DLL">False</VersionInfo>

-						<VersionInfo Name="Locale">1049</VersionInfo>

-						<VersionInfo Name="CodePage">1251</VersionInfo>

-					</VersionInfo>

-					<VersionInfoKeys>

-						<VersionInfoKeys Name="CompanyName"/>

-						<VersionInfoKeys Name="FileDescription"/>

-						<VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys>

-						<VersionInfoKeys Name="InternalName"/>

-						<VersionInfoKeys Name="LegalCopyright"/>

-						<VersionInfoKeys Name="LegalTrademarks"/>

-						<VersionInfoKeys Name="OriginalFilename"/>

-						<VersionInfoKeys Name="ProductName"/>

-						<VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys>

-						<VersionInfoKeys Name="Comments"/>

-					</VersionInfoKeys>

-					<Excluded_Packages>

-						<Excluded_Packages Name="$(BDSBIN)\dcloffice2k160.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>

-						<Excluded_Packages Name="$(BDSBIN)\dclofficexp160.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>

-					</Excluded_Packages>

-				</Delphi.Personality>

 				<Platforms>

 					<Platform value="Win64">True</Platform>

 					<Platform value="Win32">True</Platform>

diff --git a/plugins/HistoryPlusPlus/hpp_res_ver.rc b/plugins/HistoryPlusPlus/hpp_res_ver.rc
deleted file mode 100644
index b8b6e1929d..0000000000
--- a/plugins/HistoryPlusPlus/hpp_res_ver.rc
+++ /dev/null
@@ -1,28 +0,0 @@
-1 VERSIONINFO

-FILEVERSION 1, 5, 1, 5

-PRODUCTVERSION 1, 5, 1, 5

-FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

-FILEOS VOS__WINDOWS32

-FILETYPE VFT_DLL

-{

-  BLOCK "StringFileInfo"

-  {

-    BLOCK "000004b0"

-    {

-      VALUE "CompanyName", "Miranda Open Source Project\000"

-      VALUE "FileDescription", "History++ plugin for Miranda NG\000"

-      VALUE "FileVersion", "1.5.1.5\000"

-      VALUE "InternalName", "historypp\000"

-      VALUE "LegalCopyright", "© 2006-2009 theMIROn, 2003-2006 Art Fedorov.\000"

-      VALUE "LegalTrademarks", "Gnu General Public License V2\000"

-      VALUE "OriginalFilename", "historypp.dll\000"

-      VALUE "ProductName", "History PlusPlus Module\000"

-      VALUE "ProductVersion", "1.5.1.5\000"

-      VALUE "Comments", "Easy, fast and feature complete history viewer\000"

-    }

-  }

-  BLOCK "VarFileInfo"

-  {

-    VALUE "Translation", 0x0, 1200

-  }

-}
\ No newline at end of file
diff --git a/plugins/HistoryPlusPlus/make.bat b/plugins/HistoryPlusPlus/make.bat
new file mode 100644
index 0000000000..ff67906b34
--- /dev/null
+++ b/plugins/HistoryPlusPlus/make.bat
@@ -0,0 +1,8 @@
+@echo off
+
+set tp=%1
+if "%tp%"=="" (echo "please specify target platform 32 or 64!" && pause && goto :EOF)
+
+rc version.rc
+
+MsBuild.exe historypp.dproj /t:Rebuild /p:Configuration=Release;Platform=Win%tp% /fileLogger /fileLoggerParameters:LogFile=Logs\icons%tp%.log;errorsonly;warningsonly;summary
diff --git a/plugins/HistoryPlusPlus/version.rc b/plugins/HistoryPlusPlus/version.rc
new file mode 100644
index 0000000000..85f82592df
--- /dev/null
+++ b/plugins/HistoryPlusPlus/version.rc
@@ -0,0 +1,53 @@
+// Microsoft Visual C++ generated resource script.
+//
+#ifdef APSTUDIO_INVOKED
+#error this file is not editable by Microsoft Visual C++
+#endif //APSTUDIO_INVOKED
+
+#include "..\..\include\m_version.h"
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+#pragma code_page(1252)
+#endif //_WIN32
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 1,5,1,5
+ PRODUCTVERSION MIRANDA_VERSION_COREVERSION
+ FILEFLAGSMASK 0x17L
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "000004b0"
+        BEGIN
+            VALUE "CompanyName", "Miranda Open Source Project\000"
+            VALUE "FileDescription", "History++ plugin for Miranda NG\000"
+            VALUE "FileVersion", "1.5.1.5\000"
+            VALUE "InternalName", "historypp\000"
+            VALUE "LegalCopyright", "© 2006-2009 theMIROn, 2003-2006 Art Fedorov.\000"
+            VALUE "LegalTrademarks", "Gnu General Public License V2\000"
+            VALUE "OriginalFilename", "historypp.dll\000"
+            VALUE "ProductName", "History PlusPlus Module\000"
+            VALUE "ProductVersion", "1.5.1.5\000"
+            VALUE "Comments", "Easy, fast and feature complete history viewer\000"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x0, 1200
+    END
+END
+
+#endif    // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
diff --git a/tools/build_scripts/z1_ReBuild_Full.bat b/tools/build_scripts/z1_ReBuild_Full.bat
index daef07a8d9..1bdcfcda74 100644
--- a/tools/build_scripts/z1_ReBuild_Full.bat
+++ b/tools/build_scripts/z1_ReBuild_Full.bat
@@ -36,6 +36,11 @@ MsBuild.exe "mir_full.sln" /m /t:Rebuild /p:Configuration=Release;Platform="%ptr
 MsBuild.exe "mir_icons.sln" /m /t:Rebuild /p:Configuration=Release;Platform="%ptr%" /fileLogger /fileLoggerParameters:LogFile=Logs\icons%tp%.log;errorsonly;warningsonly;summary
 
 call pascal%tp%.bat
+
+pushd ..\plugins\HistoryPlusPlus
+call make.bat %tp%
+popd
+
 pushd ..\plugins\NotifyAnything\SendLog 
 call compile%tp%.bat "%comp%"
 popd