[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdesupport/emerge/portage/win32libs-sources/dbus-src
From:       Ralf Habacker <Ralf.Habacker () freenet ! de>
Date:       2009-07-31 23:40:28
Message-ID: 1249083628.020454.28986.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1005414 by habacker:

fixed mingw build

 A             WSPiApi.h   [License: UNKNOWN]
 M  +23 -70    dbus-src-1.2.4.20081023.py  


--- trunk/kdesupport/emerge/portage/win32libs-sources/dbus-src/dbus-src-1.2.4.20081023.py \
#1005413:1005414 @@ -1,85 +1,38 @@
 # -*- coding: utf-8 -*-
-import base
 import utils
 import os
-import shutil
 import info
 
 class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['1.1.2'] = 'tags/1.1.2'
-        self.svnTargets['1.2.1'] = 'tags/1.2.1'
-        self.svnTargets['1.2.3'] = 'tags/1.2.3'
-        self.svnTargets['1.2.4'] = 'tags/1.2.4'
-        self.svnTargets['svnHEAD'] = 'trunk'
+        svnurl = "https://windbus.svn.sourceforge.net/svnroot/windbus/"
+        self.svnTargets['1.1.2'] = svnurl + 'tags/1.1.2'
+        self.svnTargets['1.2.1'] = svnurl + 'tags/1.2.1'
+        self.svnTargets['1.2.3'] = svnurl + 'tags/1.2.3'
+        self.svnTargets['1.2.4'] = svnurl + 'tags/1.2.4'
+        self.svnTargets['svnHEAD'] = svnurl + 'trunk'
         self.defaultTarget = '1.2.4'
+        self.targetInstSrc['1.2.4'] = 'tags/1.2.4'
+        self.targetConfigurePath['1.2.4'] = 'cmake'
+        self.targetConfigurePath['svnHead'] = 'cmake'
     
     def setDependencies( self ):
         self.hardDependencies['win32libs-bin/libxml2'] = 'default'
         self.hardDependencies['virtual/base'] = 'default'
 
-class subclass(base.baseclass):
-  def __init__( self, **args ):
-    base.baseclass.__init__( self, args=args )
-    self.instsrcdir = os.path.join( "dbus", "cmake" )
-    self.subinfo = subinfo()
-    
-  def unpack( self ):
-    print "dbus unpack called for %s" % self.subinfo.buildTarget
-    # do the svn fetch/update
-    repo = 'https://windbus.svn.sourceforge.net/svnroot/windbus/'
-    if self.subinfo.buildTarget in self.subinfo.svnTargets.keys():
-        if( self.subinfo.buildTarget != 'svnHEAD' ):
-            self.svndir += '/tags'
-        self.svnFetch( repo + self.subinfo.svnTargets[ self.subinfo.buildTarget ] )
-    else:
-        return False
+from Package.CMakePackageBase import *
+                
+class Package(CMakePackageBase):
+    def __init__( self, **args ):
+        self.subinfo = subinfo()
+        CMakePackageBase.__init__( self )
+        
+    def unpack(self):
+        if not CMakePackageBase.unpack(self):
+            return False
+        utils.copyFile( os.path.join(self.packageDir(), "wspiapi.h"), \
os.path.join(self.buildDir(), "wspiapi.h") ) +        return True
 
-    if self.buildTarget == '1.1.2':
-      utils.cleanDirectory( self.workdir )
-  
-      # now copy the tree below destdir/trunk to workdir
-      srcdir = self.svndir
-      destdir = os.path.join( self.workdir, "dbus" )
-      utils.copySrcDirToDestDir( srcdir, destdir )
-  
-      os.chdir( destdir )
-      os.system( "patch -p0 < DBus-win32.patch" )
-  
-      #copy the needed changed cmake files over...
-      destdir = os.path.join( self.workdir, "dbus", "cmake", "modules" )
-      utils.copySrcDirToDestDir( self.filesdir, destdir )
-  
-      file = r"cmake\CMakeLists.txt"
-      os.rename( file, "%s.orig" % file )
-  
-      # disable doc subdir in recent dbus svn
-      sedcommand = r""" "s/add_subdirectory( doc )/###add_subdirectory( doc )/" """
-  
-      command = "type %s.orig | sed -e %s > %s" % ( file, sedcommand, file )
-      #print "command:", command
-      os.system( command )
-
-    if( not os.path.exists( self.workdir ) ):
-        os.makedirs( self.workdir )
-
-    return True
-
-  def compile( self ):
-    if self.subinfo.buildTarget in self.subinfo.svnTargets.keys():
-        self.kde.sourcePath = os.path.join( self.svndir, self.subinfo.svnTargets[ \
                self.subinfo.buildTarget ], "cmake" )
-    else:
-        return False
-    return self.kdeCompile()
-
-  def install( self ):
-    return self.kdeInstall()
-
-  def make_package( self ):
-    self.kde.sourcePath = os.path.join( self.svndir, self.subinfo.svnTargets[ \
                self.subinfo.buildTarget ] )
-    self.doPackaging( "dbus", "1.2.4-1", True )
-
-    return True
-
+    
 if __name__ == '__main__':
-    subclass().execute()
+    Package().execute()


[prev in list] [next in list] [prev in thread] [next in thread]