[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:45:18 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=4edb432
The following commit has been merged in the master branch:
commit 4edb43290d4b3ac2a27539602fe4afd12cd58126
Author: Robin Mills <robin at clanmills.com>
Date: Wed May 6 22:02:15 2015 +0000
msvc2005/configure.py: Work in progress. Generate new UIDs for all projects and solutions.
Still to:
1) write include\exiv2\exv_msvc_configure.h
2) parse in dependency from existing solution files
3) test remove
4) test combinations of options
---
msvc2005/configure.py | 107 ++++++++++++++++++++++++++------------------------
1 file changed, 56 insertions(+), 51 deletions(-)
diff --git a/msvc2005/configure.py b/msvc2005/configure.py
index b4a807d..5f13f39 100755
--- a/msvc2005/configure.py
+++ b/msvc2005/configure.py
@@ -6,68 +6,28 @@ import optparse
import xml.dom.minidom
import datetime
import platform
+import uuid
global empty # set: empty
-global strings # dict: Visual Studio Strings
global uid # dict: UID of every projects
global project # dict: dependency sets for every project
+global strings # dict: Visual Studio Strings
global ignore # set: projects/directories to ignore
empty=set([])
-ignore=set(['webready','expat','expat201','expat210','zlib123','zlib125','zlib127','tools'])
-
-strings = {}
-strings['Begin']='''Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-''' + '# Created by:%s at:%s using:%s on:%s in:%s
' % (sys.argv[0], datetime.datetime.now().time(), platform.node(), platform.platform(), os.path.abspath('.'))
-strings['End'] = ''
-
-strings['globalBegin'] = 'Global'
-strings['globalEnd' ] = 'EndGlobal'
-
-strings['platforms'] = '''
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Win32 = Debug|Win32
- Debug|x64 = Debug|x64
- DebugDLL|Win32 = DebugDLL|Win32
- DebugDLL|x64 = DebugDLL|x64
- Release|Win32 = Release|Win32
- Release|x64 = Release|x64
- ReleaseDLL|Win32 = ReleaseDLL|Win32
- ReleaseDLL|x64 = ReleaseDLL|x64
- EndGlobalSection
-'''
-strings['postSolutionBegin'] = ' GlobalSection(ProjectConfigurationPlatforms) = postSolution
'
-strings['postSolutionEnd' ] = ' EndGlobalSection
'
-
-strings['preSolution'] = ''' GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-'''
+ignore=set(['webready','expat','expat201','expat210','zlib123','zlib125','zlib127','tools','exiv2lib'])
##
# build dict:uid - hunt the tree for .vcproj files
+# we should read the .vcproj and build the dependency set
uid = {}
for d in os.listdir('.'):
if os.path.isdir(d) & (not d in ignore):
for root, dirs, files in os.walk(d):
for file in files:
ext = ".vcproj"
- if file.endswith(ext) & (file.find('_configure') < 0):
- path=os.path.join(root, file)
- stub=file[0:-len(ext)]
- for line in xml.dom.minidom.parse(path).toprettyxml().split('
'):
- if ( line.find('RootNamespace') >= 0 ):
- start = 'ProjectGUID="{'
- start = line.find(start) + len(start)
- uid[d] = line[start:line.find('}',start)-1]
-
-##
-# Remove feature
-remove={}
-for p in uid:
- remove[p]=empty
-remove['zlib'] = set([ 'pngimage' ])
+ if file.endswith(ext) & (file.find('configure') < 0):
+ uid[d]=str(uuid.uuid1())
##
# define project dependances
@@ -84,7 +44,7 @@ project['openssl' ] = set(['webready' ])
project['xmpparser-test' ] = set(['libexiv2','xmpsdk' ])
project['xmpsample' ] = set(['libexiv2','xmpsdk' ])
project['xmpsdk' ] = set(['libexpat' ])
-project['libexiv2' ] = set(['zlib' ,'libexpat','xmpsdk','libcurl','libeay32','ssleay32','openssl','libssh'])
+project['libexiv2' ] = set(['zlib' ,'libexpat','xmpsdk'])
project['geotag' ] = set(['libexiv2','libexpat' ])
# all others depend on libexiv2
for p in uid:
@@ -92,6 +52,46 @@ for p in uid:
project[p]=set(['libexiv2'])
##
+# Remove feature
+remove={}
+for p in uid:
+ remove[p]=empty
+remove['zlib'] = set([ 'pngimage' ])
+
+
+strings = {}
+strings['UID'] = str(uuid.uuid1())
+
+strings['Begin']='''Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+''' + '# Created by:%s at:%s using:%s on:%s in:%s
' % (sys.argv[0], datetime.datetime.now().time(), platform.node(), platform.platform(), os.path.abspath('.'))
+strings['End'] = ''
+
+strings['globalBegin'] = 'Global'
+strings['globalEnd' ] = 'EndGlobal'
+
+strings['platforms'] = '''
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Win32 = Debug|Win32
+ Debug|x64 = Debug|x64
+ DebugDLL|Win32 = DebugDLL|Win32
+ DebugDLL|x64 = DebugDLL|x64
+ Release|Win32 = Release|Win32
+ Release|x64 = Release|x64
+ ReleaseDLL|Win32 = ReleaseDLL|Win32
+ ReleaseDLL|x64 = ReleaseDLL|x64
+ EndGlobalSection
+'''
+strings['postSolutionBegin'] = ' GlobalSection(ProjectConfigurationPlatforms) = postSolution
'
+strings['postSolutionEnd' ] = ' EndGlobalSection
'
+
+strings['preSolution'] = ''' GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+'''
+
+
+##
# {831EF580-92C8-4CA8-B0CE-3D906280A54D}.Debug|Win32.ActiveCfg = Debug|Win32
def compilationForProject(uid):
result = ''
@@ -120,11 +120,10 @@ def compilationTable():
# 2) Add a preprocessor symbol to ask config.h to read exv_msvc_configure.h
##
def projectRecord(project,projects):
-#
print( 'Project %-18s uid = %s' % (project, uid[project]) )
- UID = '8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942' # grep 8BC9 exiv2.sln | head -1
- vcnew = "%s\%s_configure.vcproj" % (project,project) # write in DOS notation for Visual Studio
+ UID = strings['UID']
+ vcnew = "%s\%s_configure.vcproj" % (project,project) # write in DOS notation for Visual Studio
result = 'Project("{%s}") = "%s", "%s", "{%s}"
' % (UID,project,vcnew,uid[project])
count = 0
@@ -144,9 +143,15 @@ def projectRecord(project,projects):
vcnew = os.path.join(project,("%s_configure.vcproj" % project) ) # path to new file
xmllines = xml.dom.minidom.parse(vcold).toprettyxml().split('
')
out = ""
+ projectGUID='ProjectGUID="{'
for line in xmllines:
+ if line.find( projectGUID) > 0:
+ start = line.find(projectGUID) + len(projectGUID)
+ olduid=line[start:line.find('}',start)-1]
+ line=line.replace(olduid,uid[project]);
+ # remove files
if line.find( 'File RelativePath=' ) >= 0:
- for stub in remove[project]:
+ for r in remove[project]:
for stub in r:
if ( line.find(stub) > 0 ):
line =''
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list