[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=8c0e4c7

The following commit has been merged in the master branch:
commit 8c0e4c7c7e684e0272941516e81cff25b25800f4
Author: Robin Mills <robin at clanmills.com>
Date:   Tue Dec 7 21:01:21 2010 +0000

    msvc64: fixes (explicitly create some of the build directories in pre-build steps).
---
 msvc64/exiv2/exiv2.vcproj       | 9 ++++-----
 msvc64/exiv2lib/exiv2lib.vcproj | 8 ++++----
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/msvc64/exiv2/exiv2.vcproj b/msvc64/exiv2/exiv2.vcproj
index b0b55b0..afb1ff9 100644
--- a/msvc64/exiv2/exiv2.vcproj
+++ b/msvc64/exiv2/exiv2.vcproj
@@ -369,7 +369,7 @@
 			<Tool
 				Name="VCPreBuildEventTool"
 				Description="copy the dlls"
-				CommandLine="copy/y "$(SolutionDir)expat201\$(PlatformName)\$(ConfigurationName)\*.dll" "$(TargetDir)"&#x0D;&#x0A;copy/y "$(SolutionDir)zlib123\$(PlatformName)\$(ConfigurationName)\*.dll" "$(TargetDir)"&#x0D;&#x0A;copy/y "$(SolutionDir)exiv2lib\$(PlatformName)\$(ConfigurationName)\*.dll" "$(TargetDir)"&#x0D;&#x0A;"
+				CommandLine="if NOT EXIST "$(TargetDir)" mkdir "$(TargetDir)"&#x0D;&#x0A;copy/y "$(SolutionDir)expat201\$(PlatformName)\$(ConfigurationName)\*.dll" "$(TargetDir)"&#x0D;&#x0A;copy/y "$(SolutionDir)zlib123\$(PlatformName)\$(ConfigurationName)\*.dll" "$(TargetDir)"&#x0D;&#x0A;copy/y "$(SolutionDir)exiv2lib\$(PlatformName)\$(ConfigurationName)\*.dll" "$(TargetDir)"&#x0D;&#x0A;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -457,7 +457,7 @@
 			<Tool
 				Name="VCPreBuildEventTool"
 				Description="copy the dlls"
-				CommandLine="copy/y "$(SolutionDir)expat201\$(PlatformName)\$(ConfigurationName)\*.dll" "$(TargetDir)"&#x0D;&#x0A;copy/y "$(SolutionDir)zlib123\$(PlatformName)\$(ConfigurationName)\*.dll" "$(TargetDir)"&#x0D;&#x0A;copy/y "$(SolutionDir)exiv2lib\$(PlatformName)\$(ConfigurationName)\*.dll" "$(TargetDir)"&#x0D;&#x0A;"
+				CommandLine="if NOT EXIST "$(TargetDir)" mkdir "$(TargetDir)"&#x0D;&#x0A;copy/y "$(SolutionDir)expat201\$(PlatformName)\$(ConfigurationName)\*.dll" "$(TargetDir)"&#x0D;&#x0A;copy/y "$(SolutionDir)zlib123\$(PlatformName)\$(ConfigurationName)\*.dll" "$(TargetDir)"&#x0D;&#x0A;copy/y "$(SolutionDir)exiv2lib\$(PlatformName)\$(ConfigurationName)\*.dll" "$(TargetDir)"&#x0D;&#x0A;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -547,7 +547,7 @@
 			<Tool
 				Name="VCPreBuildEventTool"
 				Description="copy the dlls"
-				CommandLine="copy/y "$(SolutionDir)expat201\$(PlatformName)\$(ConfigurationName)\*.dll" "$(TargetDir)"&#x0D;&#x0A;copy/y "$(SolutionDir)zlib123\$(PlatformName)\$(ConfigurationName)\*.dll" "$(TargetDir)"&#x0D;&#x0A;copy/y "$(SolutionDir)exiv2lib\$(PlatformName)\$(ConfigurationName)\*.dll" "$(TargetDir)"&#x0D;&#x0A;"
+				CommandLine="if NOT EXIST "$(TargetDir)" mkdir "$(TargetDir)"&#x0D;&#x0A;copy/y "$(SolutionDir)expat201\$(PlatformName)\$(ConfigurationName)\*.dll" "$(TargetDir)"&#x0D;&#x0A;copy/y "$(SolutionDir)zlib123\$(PlatformName)\$(ConfigurationName)\*.dll" "$(TargetDir)"&#x0D;&#x0A;copy/y "$(SolutionDir)exiv2lib\$(PlatformName)\$(ConfigurationName)\*.dll" "$(TargetDir)"&#x0D;&#x0A;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -585,7 +585,6 @@
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
-				Description=""
 				CommandLine=""
 			/>
 			<Tool
@@ -636,7 +635,7 @@
 			<Tool
 				Name="VCPreBuildEventTool"
 				Description="copy the dlls"
-				CommandLine="copy/y "$(SolutionDir)expat201\$(PlatformName)\$(ConfigurationName)\*.dll" "$(TargetDir)"&#x0D;&#x0A;copy/y "$(SolutionDir)zlib123\$(PlatformName)\$(ConfigurationName)\*.dll" "$(TargetDir)"&#x0D;&#x0A;copy/y "$(SolutionDir)exiv2lib\$(PlatformName)\$(ConfigurationName)\*.dll" "$(TargetDir)"&#x0D;&#x0A;"
+				CommandLine="if NOT EXIST "$(TargetDir)" mkdir "$(TargetDir)"&#x0D;&#x0A;copy/y "$(SolutionDir)expat201\$(PlatformName)\$(ConfigurationName)\*.dll" "$(TargetDir)"&#x0D;&#x0A;copy/y "$(SolutionDir)zlib123\$(PlatformName)\$(ConfigurationName)\*.dll" "$(TargetDir)"&#x0D;&#x0A;copy/y "$(SolutionDir)exiv2lib\$(PlatformName)\$(ConfigurationName)\*.dll" "$(TargetDir)"&#x0D;&#x0A;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
diff --git a/msvc64/exiv2lib/exiv2lib.vcproj b/msvc64/exiv2lib/exiv2lib.vcproj
index 5853057..8c63673 100644
--- a/msvc64/exiv2lib/exiv2lib.vcproj
+++ b/msvc64/exiv2lib/exiv2lib.vcproj
@@ -309,7 +309,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;setlocal&#x0D;&#x0A;set X=$(OutDir)\&#x0D;&#x0A;if NOT EXIST "%X%" mkdir "%X%"&#x0D;&#x0A;copy/y "$(SolutionDir)expat201\$(PlatformName)\$(ConfigurationName)\*.dll" "%X%"&#x0D;&#x0A;copy/y "$(SolutionDir)zlib123\$(PlatformName)\$(ConfigurationName)\*.dll" "%X%"&#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"
@@ -393,7 +393,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;copy/y "$(SolutionDir)expat201\$(PlatformName)\$(ConfigurationName)\*.dll" $(OutDir)&#x0D;&#x0A;copy/y "$(SolutionDir)zlib123\$(PlatformName)\$(ConfigurationName)\*.dll" $(OutDir)&#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;&#x0D;&#x0A;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -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;copy/y "$(SolutionDir)expat201\$(PlatformName)\$(ConfigurationName)\*.dll" $(OutDir)&#x0D;&#x0A;copy/y "$(SolutionDir)zlib123\$(PlatformName)\$(ConfigurationName)\*.dll" $(OutDir)&#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;&#x0D;&#x0A;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -563,7 +563,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;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;&#x0D;&#x0A;&#x0D;&#x0A;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"

-- 
exiv2 packaging



More information about the pkg-kde-commits mailing list