Commits

Oliver Schneider committed 09ec9e7

- Still struggling with the bloody Manifest tool, otherwise works fine ...

  • Participants
  • Parent commits baff498

Comments (0)

Files changed (7)

File bsdiff.vs8.vcproj

 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories=".;bzip2"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;PROJNAME=$(ProjectName)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 			<Tool
 				Name="VCResourceCompilerTool"
 				AdditionalOptions="/nologo"
+				PreprocessorDefinitions="PROJNAME=$(ProjectName)"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
 				Name="VCManifestTool"
+				AdditionalManifestFiles="$(ProjectName).xml"
+				VerboseOutput="true"
 			/>
 			<Tool
 				Name="VCXDCMakeTool"
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories=".;bzip2"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;PROJNAME=$(ProjectName)"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 			<Tool
 				Name="VCResourceCompilerTool"
 				AdditionalOptions="/nologo"
+				PreprocessorDefinitions="PROJNAME=$(ProjectName)"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
 				Name="VCManifestTool"
+				AdditionalManifestFiles="$(ProjectName).xml"
+				VerboseOutput="true"
 			/>
 			<Tool
 				Name="VCXDCMakeTool"

File bsdiff.vs9.vcproj

 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories=".;bzip2"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;PROJNAME=$(ProjectName)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 			<Tool
 				Name="VCResourceCompilerTool"
 				AdditionalOptions="/nologo"
+				PreprocessorDefinitions="PROJNAME=$(ProjectName)"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
 				Name="VCManifestTool"
+				AdditionalManifestFiles="$(ProjectName).xml"
+				VerboseOutput="true"
 			/>
 			<Tool
 				Name="VCXDCMakeTool"
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories=".;bzip2"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;PROJNAME=$(ProjectName)"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 			<Tool
 				Name="VCResourceCompilerTool"
 				AdditionalOptions="/nologo"
+				PreprocessorDefinitions="PROJNAME=$(ProjectName)"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
 				Name="VCManifestTool"
+				AdditionalManifestFiles="$(ProjectName).xml"
+				VerboseOutput="true"
 			/>
 			<Tool
 				Name="VCXDCMakeTool"
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+	<description>bsdiff</description>
+	<assemblyIdentity version="4.3.0.0" name="bsdiff" type="win32"/>
+	<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+		<application>
+			<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
+			<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+			<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+		</application>
+	</compatibility>
+	<ms_asmv2:trustInfo xmlns:ms_asmv2="urn:schemas-microsoft-com:asm.v2">
+		<ms_asmv2:security>
+			<ms_asmv2:requestedPrivileges>
+				<ms_asmv2:requestedExecutionLevel level="asInvoker">
+				</ms_asmv2:requestedExecutionLevel>
+			</ms_asmv2:requestedPrivileges>
+		</ms_asmv2:security>
+	</ms_asmv2:trustInfo>
+</assembly>

File bspatch.vs8.vcproj

 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories=".;bzip2"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;PROJNAME=$(ProjectName)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 			<Tool
 				Name="VCResourceCompilerTool"
 				AdditionalOptions="/nologo"
+				PreprocessorDefinitions="PROJNAME=$(ProjectName)"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
 				Name="VCManifestTool"
+				AdditionalManifestFiles="$(ProjectName).xml"
+				VerboseOutput="true"
 			/>
 			<Tool
 				Name="VCXDCMakeTool"
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories=".;bzip2"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;PROJNAME=$(ProjectName)"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 			<Tool
 				Name="VCResourceCompilerTool"
 				AdditionalOptions="/nologo"
+				PreprocessorDefinitions="PROJNAME=$(ProjectName)"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
 				Name="VCManifestTool"
+				AdditionalManifestFiles="$(ProjectName).xml"
+				VerboseOutput="true"
 			/>
 			<Tool
 				Name="VCXDCMakeTool"

File bspatch.vs9.vcproj

 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories=".;bzip2"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;PROJNAME=$(ProjectName)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 			<Tool
 				Name="VCResourceCompilerTool"
 				AdditionalOptions="/nologo"
+				PreprocessorDefinitions="PROJNAME=$(ProjectName)"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
 				Name="VCManifestTool"
+				AdditionalManifestFiles="$(ProjectName).xml"
+				VerboseOutput="true"
 			/>
 			<Tool
 				Name="VCXDCMakeTool"
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories=".;bzip2"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;PROJNAME=$(ProjectName)"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 			<Tool
 				Name="VCResourceCompilerTool"
 				AdditionalOptions="/nologo"
+				PreprocessorDefinitions="PROJNAME=$(ProjectName)"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
 				Name="VCManifestTool"
+				AdditionalManifestFiles="$(ProjectName).xml"
+				VerboseOutput="true"
 			/>
 			<Tool
 				Name="VCXDCMakeTool"
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+	<description>bspatch</description>
+	<assemblyIdentity version="4.3.0.0" name="bspatch" type="win32"/>
+	<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+		<application>
+			<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
+			<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+			<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+		</application>
+	</compatibility>
+	<ms_asmv2:trustInfo xmlns:ms_asmv2="urn:schemas-microsoft-com:asm.v2">
+		<ms_asmv2:security>
+			<ms_asmv2:requestedPrivileges>
+				<ms_asmv2:requestedExecutionLevel level="asInvoker">
+				</ms_asmv2:requestedExecutionLevel>
+			</ms_asmv2:requestedPrivileges>
+		</ms_asmv2:security>
+	</ms_asmv2:trustInfo>
+</assembly>

File exeversion.h

 ///
 ///////////////////////////////////////////////////////////////////////////////
 #ifndef __EXEVERSION_H_VERSION__
-#define __EXEVERSION_H_VERSION__ 2012121901
+#define __EXEVERSION_H_VERSION__ 2012121904
 
 #if defined(_MSC_VER) && (_MSC_VER >= 1020)
 #pragma once
 #define FILE_MAJVER            4 // major file version
 #define FILE_MINVER            3 // minor file version
 #define FILE_BUILD             _FILE_VERSION_BUILD // build number
-#define EXE_YEAR               2003-2005 // current year or timespan (e.g. 2003-2007)
 #define TEXT_WEBSITE           http:/##/www.daemonology.net/bsdiff/ // website
-#define TEXT_PRODUCTNAME       bsdiff // product's name
-#define TEXT_FILEDESC          Binary differ // component description
+#define TEXT_PRODUCTNAME       PROJNAME // product's name
+#define TEXT_FILEDESC          Binary delta algorithm bsdiff/bspatch, originally written for FreeBSD, ported to Win32 (Unicode) // component description
 #define TEXT_COMPANY           Oliver Schneider (assarbad.net) // company
-#define TEXT_MODULE            bsdiff // module name
-#define TEXT_COPYRIGHT         Copyright EXE_YEAR TEXT_COMPANY // copyright information
-#define TEXT_INTERNALNAME      bsdiff.exe // copyright information
+#define TEXT_MODULE            PROJNAME // module name
+#define TEXT_COPYRIGHT         Copyright 2003-2005 Colin Percival, Portions Copyright 1996-2010 Julian R Seward [bzip2], 2012 Oliver Schneider [bsdiff Win32 port] // copyright information
+#define TEXT_INTERNALNAME      PROJNAME##.exe // copyright information
 
 #endif // __EXEVERSION_H_VERSION__