[Uml-devel] kdesupport/emerge/portage
Ralf Habacker
Ralf.Habacker at freenet.de
Mon Apr 12 13:57:18 UTC 2010
SVN commit 1114015 by habacker:
- added mingw x64 target
- qt platform is now set in QMakeBuildSystem, use it
- call to putenv are already in QMakeBuildSystem::SetPathes(), use it
M +1 -0 extragear/krusader/krusader-2.0.0svn.py
M +7 -6 kde/kde4-l10n/kde4-l10n-20090815.py
M +25 -28 libs/qt/qt-4.6.2.20100215.py
M +1 -0 testing/mysql-debug/mysql-debug-5.1.36.py
M +1 -0 testing/mysql-embedded/mysql-embedded-5.1.36.py
M +1 -2 testing/mysql-server/mysql-server-5.1.36.py
D testing/mysql-server/mysql-server.xml
M +1 -0 testing/umbrello/umbrello-20090807.py
M +1 -0 win32libs-bin/sqlite/sqlite-3.6.2.py
M +1 -1 win32libs-sources/aspell-src/aspell-src-0.60.5.py
M +1 -1 win32libs-sources/expat-src/expat-src-2.0.1.py
--- trunk/kdesupport/emerge/portage/extragear/krusader/krusader-2.0.0svn.py #1114014:1114015
@@ -5,6 +5,7 @@
class subinfo( info.infoclass ):
def setTargets( self ):
self.svnTargets['svnHEAD'] = "trunk/extragear/utils/krusader"
+ self.patchToApply['svnHEAD'] = ['krusader-svn.patch',1]
self.targets['2.0.0-beta2'] = 'http://prdownloads.sourceforge.net/krusader/krusader-2.0.0-beta2.tar.gz'
self.targetInstSrc['2.0.0-beta2'] = 'krusader-2.0.0-beta2'
self.patchToApply['2.0.0-beta2'] = ['krusader.patch',1]
--- trunk/kdesupport/emerge/portage/kde/kde4-l10n/kde4-l10n-20090815.py #1114014:1114015
@@ -29,7 +29,7 @@
self.subinfo.options.make.ignoreErrors = True
self.subinfo.options.exitOnErrors = False
# hardcoded for now
- #self.subinfo.options.package.version = '4.3.63'
+ self.subinfo.options.package.version = '4.3.65'
def repositoryPath(self,index=0):
# \todo we cannot use CMakePackageBase here because repositoryPath
@@ -60,7 +60,8 @@
return True
def createPackage(self):
- self.subinfo.options.package.packageName = 'l10n-kde4-%s' % self.language
+ self.subinfo.options.package.packageName = 'kde4-l10n-%s' % self.language
+ self.subinfo.options.package.version = '4.3.68'
self.subinfo.options.package.withCompiler = False
return KDEWinPackager.createPackage(self)
@@ -72,18 +73,18 @@
# all targets in svn
self.languages = 'af ar be bg bn bn_IN br ca cs csb cy da de '
self.languages += 'el en_GB eo es et eu fa fi fr fy ga gl gu '
- self.languages += 'ha he hi hr hsb hu hy is it ja ka kk km kn ko ku '
- self.languages += 'lb lt lv mk ml ms mt nb nds ne nl nn nso oc '
+ self.languages += 'ha he hi hne hr hsb hu hy is it ja ka kk km kn ko ku '
+ self.languages += 'lb lt lv mai mk ml mr ms mt nb nds ne nl nn nso oc '
self.languages += 'pa pl pt pt_BR ro ru rw se sk sl sr sv '
self.languages += 'ta te tg th tr uk uz vi wa xh zh_CN zh_HK zh_TW '
#for testing
- self.languages = 'de'
+ #self.languages = 'de'
def setDependencies( self ):
self.hardDependencies['dev-util/cmake'] = 'default'
self.hardDependencies['dev-util/gettext-tools'] = 'default'
- self.hardDependencies['kde/kdelibs'] = 'default'
+ #self.ardDependencies['kde/kdelibs'] = 'default'
class MainPackage(PackageBase):
--- trunk/kdesupport/emerge/portage/libs/qt/qt-4.6.2.20100215.py #1114014:1114015
@@ -29,8 +29,12 @@
self.svnTargets['4.6.0'] = "git://gitorious.org/+kde-developers/qt/kde-qt.git|4.6.0-patched|"
self.svnTargets['4.6.1'] = "git://gitorious.org/+kde-developers/qt/kde-qt.git|4.6.1-patched|"
self.svnTargets['4.6.2'] = "git://gitorious.org/+kde-developers/qt/kde-qt.git|4.6.2-patched|"
-
- self.defaultTarget = '4.6.2'
+ self.svnTargets['4.6.2-mingw-x64'] = "git://gitorious.org/+qt-mingw-w64/qt/qt-mingw-w64-qt.git|4.6_jjc|"
+ self.targetSrcSuffix['4.6.2-mingw-x64'] = "x64"
+ if (COMPILER == "mingw" or COMPILER == "mingw4") and os.getenv("EMERGE_ARCHITECTURE") == 'x64':
+ self.defaultTarget = '4.6.2-mingw-x64'
+ else:
+ self.defaultTarget = '4.6.2'
## \todo this is prelimary and may be changed
self.options.package.packageName = 'qt'
@@ -40,11 +44,15 @@
self.hardDependencies['virtual/base'] = 'default'
self.hardDependencies['dev-util/perl'] = 'default'
self.hardDependencies['testing/mysql-server'] = 'default'
- if COMPILER == "mingw" or COMPILER == "mingw4":
- self.hardDependencies['win32libs-bin/dbus'] = 'default'
- else:
+ if os.getenv("EMERGE_ARCHITECTURE") == 'x64':
self.hardDependencies['win32libs-sources/dbus-src'] = 'default'
- self.hardDependencies['win32libs-bin/openssl'] = 'default'
+ self.hardDependencies['testing/openssl_beta-src'] = 'default'
+ elif COMPILER == "msvc2008":
+ self.hardDependencies['win32libs-sources/dbus-src'] = 'default'
+ self.hardDependencies['win32libs-bin/openssl'] = 'default'
+ else:
+ self.hardDependencies['win32libs-bin/dbus'] = 'default'
+ self.hardDependencies['win32libs-bin/openssl'] = 'default'
class Package(PackageBase,GitSource, QMakeBuildSystem, KDEWinPackager):
def __init__( self, **args ):
@@ -54,30 +62,22 @@
QMakeBuildSystem.__init__(self)
KDEWinPackager.__init__(self)
# get instance of dbus and openssl package
- if self.compiler() == "mingw" or self.compiler() == "mingw4":
- self.dbus = portage.getPackageInstance('win32libs-bin','dbus')
- else:
+ if os.getenv("EMERGE_ARCHITECTURE") == 'x64':
self.dbus = portage.getPackageInstance('win32libs-sources','dbus-src')
- self.openssl = portage.getPackageInstance('win32libs-bin','openssl')
+ self.openssl = portage.getPackageInstance('testing','openssl_beta-src')
+ elif COMPILER == "msvc2008":
+ self.dbus = portage.getPackageInstance('win32libs-sources','dbus-src')
+ self.openssl = portage.getPackageInstance('win32libs-bin','openssl')
+ else:
+ self.dbus = portage.getPackageInstance('win32libs-bin','dbus')
+ self.openssl = portage.getPackageInstance('win32libs-bin','openssl')
+
self.mysql_server = portage.getPackageInstance('testing','mysql-server')
def configure( self, unused1=None, unused2=""):
self.enterBuildDir()
+ self.setPathes()
- #
- os.putenv( "PATH", os.path.join( self.buildDir(), "bin" ) + ";" + os.getenv("PATH") )
-
- # so that the mkspecs can be found, when -prefix is set
- os.putenv( "QMAKEPATH", self.sourceDir() )
-
- platform = ""
- if self.compiler() == "msvc2005" or self.compiler() == "msvc2008":
- platform = "win32-%s" % self.compiler()
- elif self.compiler() == "mingw" or self.compiler() == "mingw4":
- platform = "win32-g++"
- else:
- exit( 1 )
-
os.environ[ "USERIN" ] = "y"
userin = "y"
@@ -95,7 +95,7 @@
"-no-phonon -qdbus -openssl -dbus-linked " \
"-fast -ltcg -no-vcproj -no-dsp " \
"-nomake demos -nomake examples " \
- "%s %s" % ( userin, configure, platform, self.installDir(), incdirs, libdirs)
+ "%s %s" % ( userin, configure, self.platform, self.installDir(), incdirs, libdirs)
if self.buildType() == "Debug":
command += " -debug "
else:
@@ -117,9 +117,6 @@
os.environ[ "INCLUDE" ] = "%s%s" % (inctmp, incdirs)
os.environ[ "LIB" ] = "%s%s" % (libtmp, libdirs)
- # so that the mkspecs can be found, when -prefix is set
- os.putenv( "QMAKEPATH", self.sourceDir() )
-
QMakeBuildSystem.make(self)
if not libtmp:
--- trunk/kdesupport/emerge/portage/testing/mysql-debug/mysql-debug-5.1.36.py #1114014:1114015
@@ -19,6 +19,7 @@
def __init__( self ):
self.subinfo = subinfo()
BinaryPackageBase.__init__( self )
+ self.subinfo.options.package.withCompiler=False
if __name__ == '__main__':
Package().execute()
--- trunk/kdesupport/emerge/portage/testing/mysql-embedded/mysql-embedded-5.1.36.py #1114014:1114015
@@ -22,6 +22,7 @@
def __init__( self ):
self.subinfo = subinfo()
BinaryPackageBase.__init__( self )
+ self.subinfo.options.package.withCompiler=False
if __name__ == '__main__':
Package().execute()
--- trunk/kdesupport/emerge/portage/testing/mysql-server/mysql-server-5.1.36.py #1114014:1114015
@@ -20,8 +20,7 @@
def __init__( self ):
self.subinfo = subinfo()
BinaryPackageBase.__init__( self )
-
-
+ self.subinfo.options.package.withCompiler=False
if __name__ == '__main__':
Package().execute()
--- trunk/kdesupport/emerge/portage/testing/umbrello/umbrello-20090807.py #1114014:1114015
@@ -16,6 +16,7 @@
self.subinfo = subinfo()
CMakePackageBase.__init__(self)
self.subinfo.options.configure.onlyBuildTargets = 'umbrello'
+ self.subinfo.options.make.slnBaseName = 'kdesdk'
if __name__ == '__main__':
Package().execute()
--- trunk/kdesupport/emerge/portage/win32libs-bin/sqlite/sqlite-3.6.2.py #1114014:1114015
@@ -36,6 +36,7 @@
self.createCombinedPackage = True
def install( self ):
+ BinaryPackageBase.unpack(self)
dst = os.path.join( self.imageDir(), "bin" )
utils.cleanDirectory( dst )
dst = os.path.join( self.imageDir(), "include" )
--- trunk/kdesupport/emerge/portage/win32libs-sources/aspell-src/aspell-src-0.60.5.py #1114014:1114015
@@ -19,7 +19,7 @@
self.hardDependencies['dev-util/perl'] = 'default' # buildtime dependency
self.hardDependencies['dev-util/msys'] = 'default' # buildtime dependency
-class subclass(base.baseclass):
+class Package(base.baseclass):
def __init__( self, **args ):
base.baseclass.__init__( self, args=args )
self.createCombinedPackage = True
--- trunk/kdesupport/emerge/portage/win32libs-sources/expat-src/expat-src-2.0.1.py #1114014:1114015
@@ -5,7 +5,7 @@
class subinfo(info.infoclass):
def setDependencies( self ):
- self.hardDependencies['dev-util/msys'] = 'default'
+ #self.hardDependencies['dev-util/msys'] = 'default'
self.hardDependencies['win32libs-sources/zlib-src'] = 'default'
def setTargets( self ):
More information about the umbrello-devel
mailing list