[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:09 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=7ff5074
The following commit has been merged in the master branch:
commit 7ff507467a08253e61d9279a949aaf0f682cca88
Author: Robin Mills <robin at clanmills.com>
Date: Tue Dec 21 05:19:04 2010 +0000
Adding support for zlib-1.2.5 (which is now default)
Documented procedure to build with zlib-1.2.3
Removed zlib.sln and expat.sln (these are development relics and no longer useful)
Fixed the post build step for exiv2lib DLL builds
---
msvc64/ReadMe.txt | 43 +++++++++---
msvc64/exiv2lib/exiv2lib.vcproj | 10 +--
msvc64/expat/expat.sln | 37 ----------
msvc64/zlib/zlib.sln | 38 ----------
msvc64/zlib/zlib.vcproj | 132 +++++++++++------------------------
msvc64/{zlib => zlib123}/zlib.vcproj | 0
6 files changed, 78 insertions(+), 182 deletions(-)
diff --git a/msvc64/ReadMe.txt b/msvc64/ReadMe.txt
index ecdc943..e680f32 100644
--- a/msvc64/ReadMe.txt
+++ b/msvc64/ReadMe.txt
@@ -8,12 +8,12 @@ However it is sufficiently robust to be in current use by a commercial licensee
1) Working
Build 32bit and 64bit builds of exiv2.exe (and libraries exiv2lib,expat,zlib,xmpsdk).
Builds with VS2005, 2008 and 2010.
+ Supports zlib-1.2.5 or zlib-1.2.3
2) TODO (in priority order)
- a) Provide support for zlib1.2.5
- b) Use .vsprop files to hold "common" project settings
- c) Build sample/test applications (exifprint etc)
- d) Provide a "runner.bat" build verification test script
+ a) Provide a "runner.bat" build verification test script
+ b) Build sample/test applications (exifprint etc)
+ c) Use .vsprop files to hold "common" project settings
Assistance appreciated if you wish to become involved.
@@ -28,6 +28,7 @@ T A B L E o f C O N T E N T S
1.1 Install zlib and expat sources.
1.2 Open exiv2\msvc64\exiv2.sln
1.3 What is build
+1.4 Building with zlib1.2.3
2 Design
2.1 Architecture
@@ -49,16 +50,21 @@ T A B L E o f C O N T E N T S
Directory of c:\gnu
2010-12-05 10:05 <DIR> exiv2 <--- this tree
2010-12-02 21:06 <DIR> expat-2.0.1 <--- "vanilla" expat 2.0.1 source tree
- 2010-12-02 20:58 <DIR> zlib-1.2.3 <--- "vanilla" zlib 1.2.3 source tree
+ 2010-12-02 20:58 <DIR> zlib-1.2.5 <--- "vanilla" zlib 1.2.5 source tree
+ 2010-12-02 20:58 <DIR> zlib-1.2.3 OPTIONAL <--- "vanilla" zlib 1.2.3 source tree
c:\gnu>
The URLs from which to obtain zlib and expat are documented in exiv2\msvc\README-MSVC.txt
+ expat-2.0.1 is available from http://voxel.dl.sourceforge.net/sourceforge/expat/expat-2.0.1.tar.gz
+ zlib-1.2.5 is available from http://zlib.net/zlib-1.2.5.tar.gz
1.2 Open exiv2\msvc64\exiv2.sln
Projects are zlib, expat, xmpsdk, exiv2lib, exiv2
Build/Batch build... Select All, Build
- - you will build 5 projects x 2 Platforms (x64|Win32) x 4 Configurations (Debug|Release|DebugDLL|ReleaseDLL)
- = 5x2*4 = 40 builds.
+ - 5 projects (zlib, expat, xmpsdk, exiv2lib, exiv2)
+ x 2 Platforms (x64|Win32)
+ x 4 Configurations (Debug|Release|DebugDLL|ReleaseDLL)
+ = 5x2x4 = 40 builds.
If you haven't installed the the x64 compiler available, don't select the 64 bit configurations!
@@ -68,6 +74,22 @@ T A B L E o f C O N T E N T S
The DLL builds use the DLL version of the C runtime libraries
The Debug|Release builds use static C runtime libraries
This is discussed in exiv2\msvc\README-MSVC.txt
+
+1.4 Building with zlib1.2.3
+ By default, msvc64 builds with zlib-1.2.5
+ You can build with zlib1.2.3. To do this:
+
+ 1) copy/y exiv2\msvc64\zlib123\zlib.vcproj exiv2\msvc64\zlib\zlib.vcproj
+
+ 2) You will need the sources in a directory parallel to exiv2
+ c:\gnu>dir
+ Directory of c:\gnu
+ 2010-12-05 10:05 <DIR> exiv2 <--- this tree
+ 2010-12-02 21:06 <DIR> expat-2.0.1 <--- "vanilla" expat 2.0.1 source tree
+ 2010-12-02 20:58 <DIR> zlib-1.2.5 <--- "vanilla" zlib 1.2.5 source tree
+ 2010-12-02 20:58 <DIR> zlib-1.2.3 OPTIONAL <--- "vanilla" zlib 1.2.3 source tree
+ c:\gnu>
+ Please see exiv2\msvc\README-MSVC.txt for information about obtaining zlib-1.2.3
2 Design
@@ -78,12 +100,12 @@ T A B L E o f C O N T E N T S
in a directory at the same level as exiv2.
I personally always build in the directory c:\gnu,
however the name/location/spaces of the build directory are all irrelevant,
- it's only the relative position of expat-2.0.1 and zlib-1.2.3 which matter.
- The names expat-2.0.1 and zlib-1.2.3 fixed (and used by the .vcproj files)
+ it's only the relative position of expat-2.0.1 and zlib-1.2.5 that matter.
+ The names expat-2.0.1 and zlib-1.2.5 fixed (and used by the .vcproj files)
zlib and expat
exiv2\msvc64\zlib\zlib.{sln|vcproj} DevStudio files
- ..\..\..\zlib-1.2.3\ Source code
+ ..\..\..\zlib-1.2.5\ Source code
exiv2\msvc64\expat\expat.sln expat.vcproj DevStudio files
..\..\..\expat-2.0.1\ Source code
@@ -117,6 +139,7 @@ T A B L E o f C O N T E N T S
6) msvc64 does not support the organize application
7) msvc64 does not build the sample/test applications (such as exfprint.exe)
8) msvc64 has no test/build verification scripts
+ 9) msvc64 supports building with zlib1.2.5 (default) or zlib1.2.3
msvc will continue to be supported for 32 bit builds using DevStudio 2003/05/08,
however there is no plan to enhance or develop msvc going forward.
diff --git a/msvc64/exiv2lib/exiv2lib.vcproj b/msvc64/exiv2lib/exiv2lib.vcproj
index 8a89456..e0e4f65 100644
--- a/msvc64/exiv2lib/exiv2lib.vcproj
+++ b/msvc64/exiv2lib/exiv2lib.vcproj
@@ -376,8 +376,8 @@
/>
<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)\"

"
+ Description="copy dlls to the build directory"
+ CommandLine="setlocal
set X=$(TargetDir)
copy/y "$(SolutionDir)expat\$(PlatformName)\$(ConfigurationName)\*.dll" "%X%"
copy/y "$(SolutionDir)expat\$(PlatformName)\$(ConfigurationName)\*.lib" "%X%"
copy/y "$(SolutionDir)zlib\$(PlatformName)\$(ConfigurationName)\*.dll" "%X%"
copy/y "$(SolutionDir)zlib\$(PlatformName)\$(ConfigurationName)\*.lib" "%X%"


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

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



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




"
/>
</Configuration>
</Configurations>
diff --git a/msvc64/expat/expat.sln b/msvc64/expat/expat.sln
deleted file mode 100644
index 0c06978..0000000
--- a/msvc64/expat/expat.sln
+++ /dev/null
@@ -1,37 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "expat", ".\expat.vcproj", "{6C4C06A3-6F8F-4067-AA4C-D5F41E1FFF9A}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- DebugDLL|Win32 = DebugDLL|Win32
- DebugDLL|x64 = DebugDLL|x64
- ReleaseDLL|Win32 = ReleaseDLL|Win32
- ReleaseDLL|x64 = ReleaseDLL|x64
- Debug|Win32 = Debug|Win32
- Debug|x64 = Debug|x64
- Release|Win32 = Release|Win32
- Release|x64 = Release|x64
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {6C4C06A3-6F8F-4067-AA4C-D5F41E1FFF9A}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32
- {6C4C06A3-6F8F-4067-AA4C-D5F41E1FFF9A}.DebugDLL|Win32.Build.0 = DebugDLL|Win32
- {6C4C06A3-6F8F-4067-AA4C-D5F41E1FFF9A}.DebugDLL|x64.ActiveCfg = DebugDLL|x64
- {6C4C06A3-6F8F-4067-AA4C-D5F41E1FFF9A}.DebugDLL|x64.Build.0 = DebugDLL|x64
- {6C4C06A3-6F8F-4067-AA4C-D5F41E1FFF9A}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32
- {6C4C06A3-6F8F-4067-AA4C-D5F41E1FFF9A}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32
- {6C4C06A3-6F8F-4067-AA4C-D5F41E1FFF9A}.ReleaseDLL|x64.ActiveCfg = ReleaseDLL|x64
- {6C4C06A3-6F8F-4067-AA4C-D5F41E1FFF9A}.ReleaseDLL|x64.Build.0 = ReleaseDLL|x64
- {6C4C06A3-6F8F-4067-AA4C-D5F41E1FFF9A}.Debug|Win32.ActiveCfg = Debug|Win32
- {6C4C06A3-6F8F-4067-AA4C-D5F41E1FFF9A}.Debug|Win32.Build.0 = Debug|Win32
- {6C4C06A3-6F8F-4067-AA4C-D5F41E1FFF9A}.Debug|x64.ActiveCfg = Debug|x64
- {6C4C06A3-6F8F-4067-AA4C-D5F41E1FFF9A}.Debug|x64.Build.0 = Debug|x64
- {6C4C06A3-6F8F-4067-AA4C-D5F41E1FFF9A}.Release|Win32.ActiveCfg = Release|Win32
- {6C4C06A3-6F8F-4067-AA4C-D5F41E1FFF9A}.Release|Win32.Build.0 = Release|Win32
- {6C4C06A3-6F8F-4067-AA4C-D5F41E1FFF9A}.Release|x64.ActiveCfg = Release|x64
- {6C4C06A3-6F8F-4067-AA4C-D5F41E1FFF9A}.Release|x64.Build.0 = Release|x64
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
diff --git a/msvc64/zlib/zlib.sln b/msvc64/zlib/zlib.sln
deleted file mode 100644
index b4a248c..0000000
--- a/msvc64/zlib/zlib.sln
+++ /dev/null
@@ -1,38 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "zlib.vcproj", "{8308C68D-E12B-4C71-96F4-7137F6BEB654}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- DebugDLL|x64 = DebugDLL|x64
- ReleaseDLL|x64 = ReleaseDLL|x64
- Debug|x64 = Debug|x64
- Release|x64 = Release|x64
- DebugDLL|Win32 = DebugDLL|Win32
- ReleaseDLL|Win32 = ReleaseDLL|Win32
- Debug|Win32 = Debug|Win32
- Release|Win32 = Release|Win32
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {8308C68D-E12B-4C71-96F4-7137F6BEB654}.DebugDLL|x64.ActiveCfg = DebugDLL|x64
- {8308C68D-E12B-4C71-96F4-7137F6BEB654}.DebugDLL|x64.Build.0 = DebugDLL|x64
- {8308C68D-E12B-4C71-96F4-7137F6BEB654}.ReleaseDLL|x64.ActiveCfg = ReleaseDLL|x64
- {8308C68D-E12B-4C71-96F4-7137F6BEB654}.ReleaseDLL|x64.Build.0 = ReleaseDLL|x64
- {8308C68D-E12B-4C71-96F4-7137F6BEB654}.Debug|x64.ActiveCfg = Debug|x64
- {8308C68D-E12B-4C71-96F4-7137F6BEB654}.Debug|x64.Build.0 = Debug|x64
- {8308C68D-E12B-4C71-96F4-7137F6BEB654}.Release|x64.ActiveCfg = Release|x64
- {8308C68D-E12B-4C71-96F4-7137F6BEB654}.Release|x64.Build.0 = Release|x64
- {8308C68D-E12B-4C71-96F4-7137F6BEB654}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32
- {8308C68D-E12B-4C71-96F4-7137F6BEB654}.DebugDLL|Win32.Build.0 = DebugDLL|Win32
- {8308C68D-E12B-4C71-96F4-7137F6BEB654}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32
- {8308C68D-E12B-4C71-96F4-7137F6BEB654}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32
- {8308C68D-E12B-4C71-96F4-7137F6BEB654}.Debug|Win32.ActiveCfg = Debug|Win32
- {8308C68D-E12B-4C71-96F4-7137F6BEB654}.Debug|Win32.Build.0 = Debug|Win32
- {8308C68D-E12B-4C71-96F4-7137F6BEB654}.Release|Win32.ActiveCfg = Release|Win32
- {8308C68D-E12B-4C71-96F4-7137F6BEB654}.Release|Win32.Build.0 = Release|Win32
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
diff --git a/msvc64/zlib/zlib.vcproj b/msvc64/zlib/zlib.vcproj
index 68442db..bff2505 100644
--- a/msvc64/zlib/zlib.vcproj
+++ b/msvc64/zlib/zlib.vcproj
@@ -75,7 +75,7 @@
AdditionalDependencies=""
LinkIncremental="1"
SuppressStartupBanner="true"
- ModuleDefinitionFile="..\..\..\zlib-1.2.3\win32\zlib.def"
+ ModuleDefinitionFile="..\..\..\zlib-1.2.5\win32\zlib.def"
TargetMachine="17"
/>
<Tool
@@ -161,7 +161,7 @@
AdditionalOptions=""/IMPLIB:$(TargetDir)\zlib1.lib""
LinkIncremental="1"
SuppressStartupBanner="true"
- ModuleDefinitionFile="..\..\..\zlib-1.2.3\win32\zlib.def"
+ ModuleDefinitionFile="..\..\..\zlib-1.2.5\win32\zlib.def"
TargetMachine="1"
/>
<Tool
@@ -388,7 +388,7 @@
OutputFile="$(OutDir)\$(ProjectName)d.dll"
LinkIncremental="2"
SuppressStartupBanner="true"
- ModuleDefinitionFile="..\..\..\zlib-1.2.3\win32\zlib.def"
+ ModuleDefinitionFile="..\..\..\zlib-1.2.5\win32\zlib.def"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)/$(ProjectName).pdb"
TargetMachine="17"
@@ -478,7 +478,7 @@
OutputFile="$(OutDir)\$(ProjectName)d.dll"
LinkIncremental="2"
SuppressStartupBanner="true"
- ModuleDefinitionFile="..\..\..\zlib-1.2.3\win32\zlib.def"
+ ModuleDefinitionFile="..\..\..\zlib-1.2.5\win32\zlib.def"
GenerateDebugInformation="true"
TargetMachine="1"
/>
@@ -653,7 +653,7 @@
Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
>
<File
- RelativePath="..\..\..\zlib-1.2.3dler32.c"
+ RelativePath="..\..\..\zlib-1.2.5dler32.c"
>
<FileConfiguration
Name="DLL Release|Win32"
@@ -721,7 +721,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\..\zlib-1.2.3
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list