[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:07 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=9540ea7
The following commit has been merged in the master branch:
commit 9540ea76f0cd7aae3c143d2d8e806e9ffca60dfa
Author: Robin Mills <robin at clanmills.com>
Date: Wed Dec 8 20:00:17 2010 +0000
msvc64: fixing issues with the 32 bit build.
---
msvc64/exiv2lib/exiv2lib.vcproj | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/msvc64/exiv2lib/exiv2lib.vcproj b/msvc64/exiv2lib/exiv2lib.vcproj
index 8c63673..ef21797 100644
--- a/msvc64/exiv2lib/exiv2lib.vcproj
+++ b/msvc64/exiv2lib/exiv2lib.vcproj
@@ -87,7 +87,7 @@
<Tool
Name="VCPostBuildEventTool"
Description="create the bin (delivery) directory"
- CommandLine="mkdir ..in\Debug\
copy/y "$(TargetPath)" ..in\Debug\$(TargetFileName)
"
+ CommandLine="setlocal
set "X=..in\$(PlatformName)\$(ConfigurationName)\"
if NOT EXIST "%X%" mkdir "%X%" 
copy/y "$(TargetPath)" "%X%"
"
/>
</Configuration>
<Configuration
@@ -159,7 +159,7 @@
<Tool
Name="VCPostBuildEventTool"
Description="create the bin (delivery) directory"
- CommandLine="mkdir ..in\Debug\
copy/y "$(TargetPath)" ..in\Debug\$(TargetFileName)
"
+ CommandLine="setlocal
set "X=..in\$(PlatformName)\$(ConfigurationName)\"
if NOT EXIST "%X%" mkdir "%X%" 
copy/y "$(TargetPath)" "%X%"
"
/>
</Configuration>
<Configuration
@@ -227,7 +227,7 @@
<Tool
Name="VCPostBuildEventTool"
Description="create the bin (delivery) directory"
- CommandLine="mkdir ..in\Release\
copy/y "$(TargetPath)" ..in\$(ConfigurationName)\$(TargetFileName)

"
+ CommandLine="setlocal
set "X=..in\$(PlatformName)\$(ConfigurationName)\"
if NOT EXIST "%X%" mkdir "%X%" 
copy/y "$(TargetPath)" "%X%"
"
/>
</Configuration>
<Configuration
@@ -296,7 +296,7 @@
<Tool
Name="VCPostBuildEventTool"
Description="create the bin (delivery) directory"
- CommandLine="mkdir ..in\Release\
copy/y "$(TargetPath)" ..in\$(ConfigurationName)\$(TargetFileName)

"
+ CommandLine="setlocal
set "X=..in\$(PlatformName)\$(ConfigurationName)\"
if NOT EXIST "%X%" mkdir "%X%" 
copy/y "$(TargetPath)" "%X%"

"
/>
</Configuration>
<Configuration
@@ -351,7 +351,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions="/NODEFAULTLIB:LIBMTD"
- AdditionalDependencies="..\xmpsdk\DebugDLL\xmpsdk.lib ..\..\..\expat-2.0.1\win32in\debug\libexpat.lib ..\..\..\zlib-1.2.3\projects
isualc6\Win32_DLL_Debug\zlib1d.lib"
+ AdditionalDependencies="..\xmpsdk\$(PlatformName)\$(ConfigurationName)\xmpsdk.lib ..\expat201\$(PlatformName)\$(ConfigurationName)\libexpat.lib ..\zlib123\$(PlatformName)\$(ConfigurationName)\zlib1d.lib"
OutputFile="$(OutDir)\exiv2d.dll"
GenerateDebugInformation="true"
RandomizedBaseAddress="1"
@@ -380,7 +380,7 @@
<Tool
Name="VCPostBuildEventTool"
Description="create the bin (delivery) directorie"
- CommandLine="mkdir "$(SolutionDir)bin\DebugDLL\"
copy/y ..\..\..\expat-2.0.1\win32in\Debug\libexpat.dll "$(SolutionDir)bin\$(ConfigurationName)"
copy/y "$(TargetPath)" "$(SolutionDir)bin\$(ConfigurationName)\$(TargetFileName)"
copy/y "$(TargetDir)\*.dll" "$(SolutionDir)bin\$(ConfigurationName)\"
copy/y "$(TargetDir)\*.lib" "$(SolutionDir)bin\$(ConfigurationName)\"

"
+ CommandLine="setlocal
set X=$(TargetDir)
copy/y "$(SolutionDir)expat201\$(PlatformName)\$(ConfigurationName)\*.dll" "%X%"
copy/y "$(SolutionDir)expat201\$(PlatformName)\$(ConfigurationName)\*.lib" "%X%"
copy/y "$(SolutionDir)zlib123\$(PlatformName)\$(ConfigurationName)\*.dll" "%X%"
copy/y "$(SolutionDir)zlib123\$(PlatformName)\$(ConfigurationName)\*.lib" "%X%"


"
/>
</Configuration>
<Configuration
@@ -465,8 +465,8 @@
/>
<Tool
Name="VCPostBuildEventTool"
- Description="copy dlls to the build directory"
- CommandLine="setlocal
set X=$(TargetDir)
copy/y "$(SolutionDir)expat201\$(PlatformName)\$(ConfigurationName)\*.dll" "%X%"
copy/y "$(SolutionDir)expat201\$(PlatformName)\$(ConfigurationName)\*.lib" "%X%"
copy/y "$(SolutionDir)zlib123\$(PlatformName)\$(ConfigurationName)\*.dll" "%X%"
copy/y "$(SolutionDir)zlib123\$(PlatformName)\$(ConfigurationName)\*.lib" "%X%"

"
+ Description="create the bin (delivery) directorie"
+ CommandLine="setlocal
set X=$(TargetDir)
copy/y "$(SolutionDir)expat201\$(PlatformName)\$(ConfigurationName)\*.dll" "%X%"
copy/y "$(SolutionDir)expat201\$(PlatformName)\$(ConfigurationName)\*.lib" "%X%"
copy/y "$(SolutionDir)zlib123\$(PlatformName)\$(ConfigurationName)\*.dll" "%X%"
copy/y "$(SolutionDir)zlib123\$(PlatformName)\$(ConfigurationName)\*.lib" "%X%"


"
/>
</Configuration>
<Configuration
@@ -479,7 +479,7 @@
<Tool
Name="VCPreBuildEventTool"
Description="copy expat and zlib dlls"
- CommandLine="if exist ..\include\exiv2 goto :jail
mkdir ..\include\exiv2\
copy/y ..\..\src\*.h ..\include\exiv2\
copy/y ..\..\src\*.hpp ..\include\exiv2\
cd ..\include\exiv2
del *_int.hpp
cd ..\..\exiv2lib
:jail
if NOT EXIST "$(OutDir)" mkdir "$(OutDir)"
copy/y "$(SolutionDir)expat201\$(PlatformName)\$(ConfigurationName)\*.dll" "$(OutDir)"
copy/y "$(SolutionDir)zlib123\$(PlatformName)\$(ConfigurationName)\*.dll" "$(OutDir)"

"
+ CommandLine="if exist ..\include\exiv2 goto :jail
mkdir ..\include\exiv2\
copy/y ..\..\src\*.h ..\include\exiv2\
copy/y ..\..\src\*.hpp ..\include\exiv2\
cd ..\include\exiv2
del *_int.hpp
cd ..\..\exiv2lib
:jail
if NOT EXIST "$(OutDir)" mkdir "$(OutDir)"
copy/y "$(SolutionDir)expat201\$(PlatformName)\$(ConfigurationName)\*.dll" "$(OutDir)"
copy/y "$(SolutionDir)zlib123\$(PlatformName)\$(ConfigurationName)\*.dll" "$(OutDir)"
"
/>
<Tool
Name="VCCustomBuildTool"
@@ -521,7 +521,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions="/NODEFAULTLIB:LIBCMT"
- AdditionalDependencies="..\xmpsdk\ReleaseDLL\xmpsdk.lib ..\..\..\expat-2.0.1\win32in
elease\libexpat.lib ..\..\..\zlib-1.2.3\projects
isualc6\Win32_DLL_Release\zlib1.lib"
+ AdditionalDependencies="..\xmpsdk\$(PlatformName)\$(ConfigurationName)\xmpsdk.lib ..\expat201\$(PlatformName)\$(ConfigurationName)\libexpat.lib ..\zlib123\$(PlatformName)\$(ConfigurationName)\zlib1.lib"
OutputFile="$(OutDir)\exiv2.dll"
GenerateDebugInformation="false"
RandomizedBaseAddress="1"
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list