[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:42:10 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=5ead8bd
The following commit has been merged in the master branch:
commit 5ead8bdf11bdcd25ad18f3daafdec2dd7693552a
Author: Robin Mills <robin at clanmills.com>
Date: Mon Jan 3 02:10:02 2011 +0000
msvc64: adding tools/depends directory and code.
---
msvc64/tools/depends/Depends2.suo | Bin 0 -> 32768 bytes
msvc64/tools/depends/ReadMe.txt | 13 +
msvc64/tools/depends/depends.cpp | 12 +
msvc64/tools/depends/depends.sln | 25 ++
.../tools/depends/depends.vcproj | 175 +++++------
msvc64/tools/depends/include/DEPENDENCYLIST.H | 57 ++++
msvc64/tools/depends/include/EXEFILE.H | 54 ++++
msvc64/tools/depends/include/MEMORYMAPPEDFILE.H | 35 +++
msvc64/tools/depends/include/PEEXE.H | 98 +++++++
msvc64/tools/depends/include/modulefileinfo.h | 44 +++
msvc64/tools/depends/src/DEPENDENCYLIST.CPP | 187 ++++++++++++
msvc64/tools/depends/src/EXEFILE.CPP | 72 +++++
msvc64/tools/depends/src/MEMORYMAPPEDFILE.CPP | 75 +++++
msvc64/tools/depends/src/PEEXE.CPP | 99 +++++++
msvc64/tools/depends/src/depends.cpp | 321 +++++++++++++++++++++
msvc64/tools/depends/src/modulefileinfo.cpp | 42 +++
msvc64/tools/depends/stdafx.cpp | 8 +
msvc64/tools/depends/stdafx.h | 15 +
msvc64/tools/depends/targetver.h | 13 +
19 files changed, 1259 insertions(+), 86 deletions(-)
diff --git a/msvc64/tools/depends/Depends2.suo b/msvc64/tools/depends/Depends2.suo
new file mode 100644
index 0000000..f1ecba2
Binary files /dev/null and b/msvc64/tools/depends/Depends2.suo differ
diff --git a/msvc64/tools/depends/ReadMe.txt b/msvc64/tools/depends/ReadMe.txt
new file mode 100644
index 0000000..cb7ce89
--- /dev/null
+++ b/msvc64/tools/depends/ReadMe.txt
@@ -0,0 +1,13 @@
+Depends/ReadMe.txt
+------------------
+
+This project is "depends" and is code from MSJ (now MSDN) in 1997. I appreciate and respect the code provided by Matt Pietrik. I have made the following changes:
+1) Added the -q option
+2) Added the MSVC build environment (for 32bit and 64bit builds)
+3) Modified the default response to report 1 and 2.
+
+The projects builds depends32.exe and depends64.exe which are used by runner32.bat and runner64.bat to test dependancies post build.
+
+Robin Mills
+http://clanmills.com
+2011-01-02
diff --git a/msvc64/tools/depends/depends.cpp b/msvc64/tools/depends/depends.cpp
new file mode 100644
index 0000000..00f8324
--- /dev/null
+++ b/msvc64/tools/depends/depends.cpp
@@ -0,0 +1,12 @@
+// Depends2.cpp : Defines the entry point for the console application.
+//
+
+#include "stdafx.h"
+
+
+int main(int argc, char argv[])
+{
+ printf("hello world
") ;
+ return 0;
+}
+
diff --git a/msvc64/tools/depends/depends.sln b/msvc64/tools/depends/depends.sln
new file mode 100644
index 0000000..189a405
--- /dev/null
+++ b/msvc64/tools/depends/depends.sln
@@ -0,0 +1,25 @@
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "depends", "depends.vcproj", "{E24D66E3-65A9-4BEB-8579-039AD77C2EFF}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Win32 = Debug|Win32
+ Debug|x64 = Debug|x64
+ Release|Win32 = Release|Win32
+ Release|x64 = Release|x64
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {E24D66E3-65A9-4BEB-8579-039AD77C2EFF}.Debug|Win32.ActiveCfg = Debug|Win32
+ {E24D66E3-65A9-4BEB-8579-039AD77C2EFF}.Debug|Win32.Build.0 = Debug|Win32
+ {E24D66E3-65A9-4BEB-8579-039AD77C2EFF}.Debug|x64.ActiveCfg = Debug|x64
+ {E24D66E3-65A9-4BEB-8579-039AD77C2EFF}.Debug|x64.Build.0 = Debug|x64
+ {E24D66E3-65A9-4BEB-8579-039AD77C2EFF}.Release|Win32.ActiveCfg = Release|Win32
+ {E24D66E3-65A9-4BEB-8579-039AD77C2EFF}.Release|Win32.Build.0 = Release|Win32
+ {E24D66E3-65A9-4BEB-8579-039AD77C2EFF}.Release|x64.ActiveCfg = Release|x64
+ {E24D66E3-65A9-4BEB-8579-039AD77C2EFF}.Release|x64.Build.0 = Release|x64
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
diff --git a/msvc/organize/organize.vcproj b/msvc64/tools/depends/depends.vcproj
similarity index 52%
copy from msvc/organize/organize.vcproj
copy to msvc64/tools/depends/depends.vcproj
index 60efe68..ee26e25 100644
--- a/msvc/organize/organize.vcproj
+++ b/msvc64/tools/depends/depends.vcproj
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="7.10"
- Name="organize"
- ProjectGUID="{20B07B93-9177-407B-A111-24A9967183F8}"
- RootNamespace="organize"
+ Version="9.00"
+ Name="depends"
+ ProjectGUID="{E24D66E3-65A9-4BEB-8579-039AD77C2EFF}"
+ RootNamespace="depends"
Keyword="Win32Proj"
TargetFrameworkVersion="196613"
>
@@ -12,21 +12,22 @@
<Platform
Name="Win32"
/>
+ <Platform
+ Name="x64"
+ />
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)\"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
- CharacterSet="2"
- WholeProgramOptimization="0"
+ CharacterSet="0"
>
<Tool
Name="VCPreBuildEventTool"
- ExcludedFromBuild="true"
/>
<Tool
Name="VCCustomBuildTool"
@@ -43,16 +44,14 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="$(BOOST_ROOT);../include;../include/exiv2;../../../expat-2.0.1/lib;../../../zlib-1.2.3;"
+ AdditionalIncludeDirectories="include"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
- BrowseInformation="1"
WarningLevel="3"
- WarnAsError="true"
- DebugInformationFormat="3"
+ DebugInformationFormat="4"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -65,15 +64,11 @@
/>
<Tool
Name="VCLinkerTool"
- LinkLibraryDependencies="false"
- AdditionalOptions="/NODEFAULTLIB:MSVCRTD"
- AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2sd.lib ..\..\..\expat-2.0.1\win32in\debug\libexpatMT.lib ..\..\..\zlib-1.2.3\projects
isualc6\Win32_LIB_Debug\zlibd.lib"
- LinkIncremental="1"
- AdditionalLibraryDirectories="$(BOOST_ROOT)\lib "
+ AdditionalDependencies="version.lib"
+ OutputFile="$(OutDir)\$(ProjectName)32.exe"
+ LinkIncremental="2"
GenerateDebugInformation="true"
SubSystem="1"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -96,21 +91,18 @@
/>
<Tool
Name="VCPostBuildEventTool"
- Description="copy target to bin"
- CommandLine="copy/y "$(TargetPath)" "$(SolutionDir)in\$(ConfigurationName)""
/>
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)\"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
- CharacterSet="2"
- WholeProgramOptimization="0"
+ CharacterSet="0"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
- ExcludedFromBuild="true"
/>
<Tool
Name="VCCustomBuildTool"
@@ -128,14 +120,12 @@
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
- AdditionalIncludeDirectories="$(BOOST_ROOT);../include;../include/exiv2;../../../expat-2.0.1/lib;../../../zlib-1.2.3;"
+ AdditionalIncludeDirectories="include"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
- BrowseInformation="1"
WarningLevel="3"
- WarnAsError="true"
DebugInformationFormat="3"
/>
<Tool
@@ -149,17 +139,13 @@
/>
<Tool
Name="VCLinkerTool"
- LinkLibraryDependencies="false"
- AdditionalOptions="/NODEFAULTLIB:MSVCRT"
- AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2s.lib ..\..\..\expat-2.0.1\win32in
elease\libexpatMT.lib ..\..\..\zlib-1.2.3\projects
isualc6\Win32_LIB_Release\zlib.lib"
+ AdditionalDependencies="version.lib"
+ OutputFile="$(OutDir)\$(ProjectName)32.exe"
LinkIncremental="1"
- AdditionalLibraryDirectories="$(BOOST_ROOT)\lib "
GenerateDebugInformation="true"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -182,21 +168,17 @@
/>
<Tool
Name="VCPostBuildEventTool"
- Description="copy target to bin"
- CommandLine="copy/y "$(TargetPath)" "$(SolutionDir)in\$(ConfigurationName)""
/>
</Configuration>
<Configuration
- Name="DebugDLL|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
+ Name="Debug|x64"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)\"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1"
- CharacterSet="2"
- WholeProgramOptimization="0"
+ CharacterSet="0"
>
<Tool
Name="VCPreBuildEventTool"
- CommandLine="copy/y ..\..\..\expat-2.0.1\win32in\debug\*.dll "$(TargetDir)""
/>
<Tool
Name="VCCustomBuildTool"
@@ -209,19 +191,18 @@
/>
<Tool
Name="VCMIDLTool"
+ TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="$(BOOST_ROOT);../include;../include/exiv2;../../../expat-2.0.1/lib;../../../zlib-1.2.3;"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;EXV_HAVE_DLL"
+ AdditionalIncludeDirectories="include"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
- RuntimeLibrary="3"
+ RuntimeLibrary="1"
UsePrecompiledHeader="0"
- BrowseInformation="1"
WarningLevel="3"
- WarnAsError="true"
DebugInformationFormat="3"
/>
<Tool
@@ -232,21 +213,15 @@
/>
<Tool
Name="VCPreLinkEventTool"
- Description="copy the dlls"
- CommandLine="copy/y ..\exiv2lib\$(ConfigurationName)\*.dll "$(TargetDir)""
/>
<Tool
Name="VCLinkerTool"
- LinkLibraryDependencies="false"
- AdditionalOptions="/NODEFAULTLIB:LIBCMTD"
- AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2d.lib ..\..\..\expat-2.0.1\win32in\debug\libexpat.lib ..\..\..\zlib-1.2.3\projects
isualc6\Win32_DLL_Debug\zlib1d.lib"
- LinkIncremental="1"
- AdditionalLibraryDirectories="$(BOOST_ROOT)\lib "
+ AdditionalDependencies="version.lib"
+ OutputFile="$(OutDir)\$(ProjectName)64.exe"
+ LinkIncremental="2"
GenerateDebugInformation="true"
SubSystem="1"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
- TargetMachine="1"
+ TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
@@ -268,21 +243,18 @@
/>
<Tool
Name="VCPostBuildEventTool"
- Description="copy target to bin"
- CommandLine="copy/y "$(TargetPath)" "$(SolutionDir)in\$(ConfigurationName)"
copy/y ..\..\..\expat-2.0.1\win32in\Debug\libexpat.dll
"
/>
</Configuration>
<Configuration
- Name="ReleaseDLL|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
+ Name="Release|x64"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)\"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1"
- CharacterSet="2"
- WholeProgramOptimization="0"
+ CharacterSet="0"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
- CommandLine="copy/y ..\..\..\expat-2.0.1\win32in
elease\*.dll "$(TargetDir)""
/>
<Tool
Name="VCCustomBuildTool"
@@ -295,19 +267,18 @@
/>
<Tool
Name="VCMIDLTool"
+ TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
- AdditionalIncludeDirectories="$(BOOST_ROOT);../include;../include/exiv2;../../../expat-2.0.1/lib;../../../zlib-1.2.3;"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;EXV_HAVE_DLL"
- RuntimeLibrary="2"
+ AdditionalIncludeDirectories="include"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
- BrowseInformation="1"
WarningLevel="3"
- WarnAsError="true"
DebugInformationFormat="3"
/>
<Tool
@@ -318,23 +289,17 @@
/>
<Tool
Name="VCPreLinkEventTool"
- Description="copy the dlls"
- CommandLine="copy/y ..\exiv2lib\$(ConfigurationName)\*.dll "$(TargetDir)""
/>
<Tool
Name="VCLinkerTool"
- LinkLibraryDependencies="false"
- AdditionalOptions="/NODEFAULTLIB:LIBCMT"
- AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32in
elease\libexpat.lib ..\..\..\zlib-1.2.3\projects
isualc6\Win32_DLL_Release\zlib1.lib"
+ AdditionalDependencies="version.lib"
+ OutputFile="$(OutDir)\$(ProjectName)64.exe"
LinkIncremental="1"
- AdditionalLibraryDirectories="$(BOOST_ROOT)/lib "
GenerateDebugInformation="true"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
- TargetMachine="1"
+ TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
@@ -356,8 +321,6 @@
/>
<Tool
Name="VCPostBuildEventTool"
- Description="copy target to bin"
- CommandLine="copy/y "$(TargetPath)" "$(SolutionDir)in\$(ConfigurationName)"
copy/y ..\..\..\expat-2.0.1\win32in\Release\libexpat.dll
"
/>
</Configuration>
</Configurations>
@@ -370,15 +333,31 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
- RelativePath="..\..
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list