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

List:       kde-commits
Subject:    kdesupport/emerge/bin/BuildSystem
From:       Ralf Habacker <Ralf.Habacker () freenet ! de>
Date:       2009-08-01 0:29:17
Message-ID: 1249086557.154312.32272.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1005425 by habacker:

cleaned up compiler settings - it belongs into BuildSystemBase

 M  +8 -0      BuildSystemBase.py  
 M  +1 -3      CMakeBuildSystem.py  
 M  +2 -2      QMakeBuildSystem.py  


--- trunk/kdesupport/emerge/bin/BuildSystem/BuildSystemBase.py #1005424:1005425
@@ -18,6 +18,14 @@
         self.envPath = ""
         if self.compiler() == "mingw":
             self.envPath = "mingw/bin"
+
+        if self.compiler() == "msvc2005" or self.compiler() == "msvc2008":
+            self.makeProgramm = "nmake"
+        elif self.compiler() == "mingw":
+            self.makeProgramm = "mingw32-make"
+        else:
+            utils.die( "unknown %s compiler" % self.compiler() )
+            
                 
     def configure(self): 
         """configure the target"""
--- trunk/kdesupport/emerge/bin/BuildSystem/CMakeBuildSystem.py #1005424:1005425
@@ -17,10 +17,8 @@
 
         if self.compiler() == "msvc2005" or self.compiler() == "msvc2008":
             self.cmakeMakefileGenerator = "NMake Makefiles"
-            self.cmakeMakeProgramm = "nmake"
         elif self.compiler() == "mingw":
             self.cmakeMakefileGenerator = "MinGW Makefiles"
-            self.cmakeMakeProgramm = "mingw32-make"
         else:
             utils.die( "unknown %s compiler" % self.compiler() )
                                 
@@ -68,7 +66,7 @@
             utils.debug("adding %s to system path" % os.path.join( self.rootdir, self.envPath ),2)
             os.putenv( "PATH", os.path.join( self.rootdir, self.envPath ) + ";" + os.getenv("PATH") )
         
-        command = self.cmakeMakeProgramm
+        command = self.makeProgramm
 
         if utils.verbose() > 1:
             command += " VERBOSE=1"
--- trunk/kdesupport/emerge/bin/BuildSystem/QMakeBuildSystem.py #1005424:1005425
@@ -55,7 +55,7 @@
         # so that the mkspecs can be found, when -prefix is set
         os.putenv( "QMAKEPATH", self.sourceDir() )
 
-        command = self.cmakeMakeProgramm 
+        command = self.makeProgramm 
         #if self.makeOptions() <> "": 
         #    command += " " + self.makeOptions()
         # adding Targets later
@@ -68,7 +68,7 @@
         """Using *make install"""
 
         self.enterBuildDir()
-        command = "%s DESTDIR=%s install" % ( self.cmakeMakeProgramm, self.installDir() )
+        command = "%s DESTDIR=%s install" % ( self.makeProgramm, self.installDir() )
         
         utils.system( command ) or utils.die( "while installing. cmd: %s" % command )
         return True
[prev in list] [next in list] [prev in thread] [next in thread]