[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\&#x0D;&#x0A;copy/y "$(TargetPath)" ..in\Debug\$(TargetFileName)&#x0D;&#x0A;"
+				CommandLine="setlocal&#x0D;&#x0A;set "X=..in\$(PlatformName)\$(ConfigurationName)\"&#x0D;&#x0A;if NOT EXIST "%X%" mkdir "%X%" &#x0D;&#x0A;copy/y "$(TargetPath)" "%X%"&#x0D;&#x0A;"
 			/>
 		</Configuration>
 		<Configuration
@@ -159,7 +159,7 @@
 			<Tool
 				Name="VCPostBuildEventTool"
 				Description="create the bin (delivery) directory"
-				CommandLine="mkdir ..in\Debug\&#x0D;&#x0A;copy/y "$(TargetPath)" ..in\Debug\$(TargetFileName)&#x0D;&#x0A;"
+				CommandLine="setlocal&#x0D;&#x0A;set "X=..in\$(PlatformName)\$(ConfigurationName)\"&#x0D;&#x0A;if NOT EXIST "%X%" mkdir "%X%" &#x0D;&#x0A;copy/y "$(TargetPath)" "%X%"&#x0D;&#x0A;"
 			/>
 		</Configuration>
 		<Configuration
@@ -227,7 +227,7 @@
 			<Tool
 				Name="VCPostBuildEventTool"
 				Description="create the bin (delivery) directory"
-				CommandLine="mkdir ..in\Release\&#x0D;&#x0A;copy/y "$(TargetPath)" ..in\$(ConfigurationName)\$(TargetFileName)&#x0D;&#x0A;&#x0D;&#x0A;"
+				CommandLine="setlocal&#x0D;&#x0A;set "X=..in\$(PlatformName)\$(ConfigurationName)\"&#x0D;&#x0A;if NOT EXIST "%X%" mkdir "%X%" &#x0D;&#x0A;copy/y "$(TargetPath)" "%X%"&#x0D;&#x0A;"
 			/>
 		</Configuration>
 		<Configuration
@@ -296,7 +296,7 @@
 			<Tool
 				Name="VCPostBuildEventTool"
 				Description="create the bin (delivery) directory"
-				CommandLine="mkdir ..in\Release\&#x0D;&#x0A;copy/y "$(TargetPath)" ..in\$(ConfigurationName)\$(TargetFileName)&#x0D;&#x0A;&#x0D;&#x0A;"
+				CommandLine="setlocal&#x0D;&#x0A;set "X=..in\$(PlatformName)\$(ConfigurationName)\"&#x0D;&#x0A;if NOT EXIST "%X%" mkdir "%X%" &#x0D;&#x0A;copy/y "$(TargetPath)" "%X%"&#x0D;&#x0A;&#x0D;&#x0A;"
 			/>
 		</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\"&#x0D;&#x0A;copy/y ..\..\..\expat-2.0.1\win32in\Debug\libexpat.dll "$(SolutionDir)bin\$(ConfigurationName)"&#x0D;&#x0A;copy/y "$(TargetPath)" "$(SolutionDir)bin\$(ConfigurationName)\$(TargetFileName)"&#x0D;&#x0A;copy/y "$(TargetDir)\*.dll" "$(SolutionDir)bin\$(ConfigurationName)\"&#x0D;&#x0A;copy/y "$(TargetDir)\*.lib" "$(SolutionDir)bin\$(ConfigurationName)\"&#x0D;&#x0A;&#x0D;&#x0A;"
+				CommandLine="setlocal&#x0D;&#x0A;set X=$(TargetDir)&#x0D;&#x0A;copy/y "$(SolutionDir)expat201\$(PlatformName)\$(ConfigurationName)\*.dll" "%X%"&#x0D;&#x0A;copy/y "$(SolutionDir)expat201\$(PlatformName)\$(ConfigurationName)\*.lib" "%X%"&#x0D;&#x0A;copy/y "$(SolutionDir)zlib123\$(PlatformName)\$(ConfigurationName)\*.dll" "%X%"&#x0D;&#x0A;copy/y "$(SolutionDir)zlib123\$(PlatformName)\$(ConfigurationName)\*.lib" "%X%"&#x0D;&#x0A;&#x0D;&#x0A;&#x0D;&#x0A;"
 			/>
 		</Configuration>
 		<Configuration
@@ -465,8 +465,8 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				Description="copy dlls to the build directory"
-				CommandLine="setlocal&#x0D;&#x0A;set X=$(TargetDir)&#x0D;&#x0A;copy/y "$(SolutionDir)expat201\$(PlatformName)\$(ConfigurationName)\*.dll" "%X%"&#x0D;&#x0A;copy/y "$(SolutionDir)expat201\$(PlatformName)\$(ConfigurationName)\*.lib" "%X%"&#x0D;&#x0A;copy/y "$(SolutionDir)zlib123\$(PlatformName)\$(ConfigurationName)\*.dll" "%X%"&#x0D;&#x0A;copy/y "$(SolutionDir)zlib123\$(PlatformName)\$(ConfigurationName)\*.lib" "%X%"&#x0D;&#x0A;&#x0D;&#x0A;"
+				Description="create the bin (delivery) directorie"
+				CommandLine="setlocal&#x0D;&#x0A;set X=$(TargetDir)&#x0D;&#x0A;copy/y "$(SolutionDir)expat201\$(PlatformName)\$(ConfigurationName)\*.dll" "%X%"&#x0D;&#x0A;copy/y "$(SolutionDir)expat201\$(PlatformName)\$(ConfigurationName)\*.lib" "%X%"&#x0D;&#x0A;copy/y "$(SolutionDir)zlib123\$(PlatformName)\$(ConfigurationName)\*.dll" "%X%"&#x0D;&#x0A;copy/y "$(SolutionDir)zlib123\$(PlatformName)\$(ConfigurationName)\*.lib" "%X%"&#x0D;&#x0A;&#x0D;&#x0A;&#x0D;&#x0A;"
 			/>
 		</Configuration>
 		<Configuration
@@ -479,7 +479,7 @@
 			<Tool
 				Name="VCPreBuildEventTool"
 				Description="copy expat and zlib dlls"
-				CommandLine="if exist ..\include\exiv2 goto :jail&#x0D;&#x0A;mkdir ..\include\exiv2\&#x0D;&#x0A;copy/y ..\..\src\*.h ..\include\exiv2\&#x0D;&#x0A;copy/y ..\..\src\*.hpp ..\include\exiv2\&#x0D;&#x0A;cd ..\include\exiv2&#x0D;&#x0A;del *_int.hpp&#x0D;&#x0A;cd ..\..\exiv2lib&#x0D;&#x0A;:jail&#x0D;&#x0A;if NOT EXIST "$(OutDir)" mkdir "$(OutDir)"&#x0D;&#x0A;copy/y "$(SolutionDir)expat201\$(PlatformName)\$(ConfigurationName)\*.dll" "$(OutDir)"&#x0D;&#x0A;copy/y "$(SolutionDir)zlib123\$(PlatformName)\$(ConfigurationName)\*.dll" "$(OutDir)"&#x0D;&#x0A;&#x0D;&#x0A;"
+				CommandLine="if exist ..\include\exiv2 goto :jail&#x0D;&#x0A;mkdir ..\include\exiv2\&#x0D;&#x0A;copy/y ..\..\src\*.h ..\include\exiv2\&#x0D;&#x0A;copy/y ..\..\src\*.hpp ..\include\exiv2\&#x0D;&#x0A;cd ..\include\exiv2&#x0D;&#x0A;del *_int.hpp&#x0D;&#x0A;cd ..\..\exiv2lib&#x0D;&#x0A;:jail&#x0D;&#x0A;if NOT EXIST "$(OutDir)" mkdir "$(OutDir)"&#x0D;&#x0A;copy/y "$(SolutionDir)expat201\$(PlatformName)\$(ConfigurationName)\*.dll" "$(OutDir)"&#x0D;&#x0A;copy/y "$(SolutionDir)zlib123\$(PlatformName)\$(ConfigurationName)\*.dll" "$(OutDir)"&#x0D;&#x0A;"
 			/>
 			<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