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

List:       pykde
Subject:    [PyKDE] [PATCH] the new build options for sip
From:       Hans-Peter Jansen <hpj () urpla ! net>
Date:       2003-03-27 18:00:33
[Download RAW message or body]

Hi Phil,

as promised, here is a similar patch for sip. The former announced=20
ChangeLog entries for -r and -t applies here, too.

Pete
["sip-libopt.diff" (text/x-diff)]

--- build.py.orig	2003-03-27 17:56:38.000000000 +0100
+++ build.py	2003-03-27 18:18:07.000000000 +0100
@@ -20,12 +20,14 @@
 
 # Define the globals.
 progName = None
 qtDir = None
 qtIncDir = None
+qtLibDir = None
 qtVersion = 0
 qtLib = None
+platPyBaseDir = None
 platPySiteDir = None
 platPyIncDir = None
 platPyLib = None
 platBinDir = None
 modDir = None
@@ -50,11 +52,11 @@
 def usage(rcode = 2):
     """Display a usage message and exit.
 
     rcode is the return code passed back to the calling process.
     """
-    global progName, platBinDir, platMake, modDir, sipIncDir, platQTDIRName
+    global progName, platBinDir, platMake, modDir, sipIncDir, platQTDIRName, \
platPyBaseDir  
     print "Usage:"
     print "    %s [-h] [-b dir] [-d dir] [-e dir] [-f gccflag] [-g prog] [-i dir] \
[-l Qt-library] [-m prog] [-p dir] [-q dir] [-u] [-w] [-x]" % (progName)  print \
"where:"  print "    -h             display this help message"
@@ -65,10 +67,12 @@
     print "    -g prog        the name of the Makefile generator"
     print "    -i dir         the directory containing the Qt header files [default \
                %s%sinclude]" % (platQTDIRName,os.sep)
     print "    -l Qt-library  explicitly specify the type of Qt library, either qt, \
                qt-mt or qte"
     print "    -m prog        the name of the Make program [default %s]" % \
                (platMake)
     print "    -q dir         the Qt base directory [default %s]" % (platQTDIRName)
+    print "    -r dir         the Qt lib directory [default %s%slib]" % \
(platQTDIRName, os.sep) +    print "    -t dir         Python base directory [default \
%s]" % (platPyBaseDir)  print "    -u             build with debugging symbols"
     print "    -w             enable the use of Python 1.5.x under Windows"
     print "    -x             disable Qt support"
 
     sys.exit(rcode)
@@ -132,11 +136,11 @@
 
 
 def initGlobals():
     """Sets the values of globals that need more than a simple assignment.
     """
-    global platMake, platCopy, platPySiteDir, platPyIncDir, platPyLib
+    global platMake, platCopy, platPyBaseDir, platPySiteDir, platPyIncDir, platPyLib
     global platQTDIRName, platBinDir, modDir, sipIncDir, pyFullVers, pyVersNr
 
     pyFullVers = string.split(sys.version)[0]
 
     vl = string.split(re.findall("[0-9.]*",pyFullVers)[0],".")
@@ -148,28 +152,34 @@
 
     if sys.platform == "win32":
         platMake = "nmake"
         platCopy = "copy /y"
 
+        if not platPyBaseDir:
+            platPyBaseDir = sys.prefix
+
         if pyVersNr < 22:
-            platPySiteDir = sys.prefix + "\\Lib"
+            platPySiteDir = platPyBaseDir + "\\Lib"
         else:
-            platPySiteDir = sys.prefix + "\\Lib\\site-packages"
+            platPySiteDir = platPyBaseDir + "\\Lib\\site-packages"
 
-        platPyIncDir = sys.prefix + "\\include"
+        platPyIncDir = platPyBaseDir + "\\include"
         platQTDIRName = "%QTDIR%"
         platBinDir = sys.exec_prefix
 
-        platPyLib = sys.prefix + "\\libs\\python%d.lib" % (pyVersNr)
+        platPyLib = platPyBaseDir + "\\libs\\python%d.lib" % (pyVersNr)
     else:
         platMake = "make"
         platCopy = "cp"
 
+        if not platPyBaseDir:
+            platPyBaseDir = sys.prefix + "/lib/python" + pyVers
+
         if pyVersNr < 20:
-            platPySiteDir = sys.prefix + "/lib/python" + pyVers
+            platPySiteDir = platPyBaseDir
         else:
-            platPySiteDir = sys.prefix + "/lib/python" + pyVers + "/site-packages"
+            platPySiteDir = platPyBaseDir + "/site-packages"
 
         platPyIncDir = sys.prefix + "/include/python" + pyVers
         platQTDIRName = "$QTDIR"
         platBinDir = "/usr/local/bin"
 
@@ -458,13 +468,16 @@
 
 
 def checkQtLibrary():
     """Check which Qt library is to be used.
     """
-    global qtDir, qtLib
+    global qtDir, qtLibDir, qtLib
 
-    qtlibdir = qtDir + os.sep + "lib"
+    if qtLibDir:
+        qtlibdir = qtLibDir
+    else:
+        qtlibdir = qtDir + os.sep + "lib"
 
     if qtLib is None:
         mtlib = isQtLibrary(qtlibdir,"qt-mt")
         stlib = isQtLibrary(qtlibdir,"qt")
         emlib = isQtLibrary(qtlibdir,"qte")
@@ -849,11 +862,11 @@
     progName = os.path.basename(argv[0])
 
     initGlobals()
 
     try:
-        optlist, args = getopt.getopt(argv[1:],"hb:d:e:f:g:i:l:m:q:uwx")
+        optlist, args = getopt.getopt(argv[1:],"hb:d:e:f:g:i:l:m:q:r:t:uwx")
     except getopt.GetoptError:
         usage()
 
     global makeBin, platBinDir, debugMode
 
@@ -890,10 +903,17 @@
             makeBin = arg
             explicitMake = 1
         elif opt == "-q":
             global qtDir
             qtDir = arg
+        elif opt == "-r":
+            global qtLibDir
+            qtLibDir = arg
+        elif opt == "-t":
+            global platPyBaseDir
+            platPyBaseDir = arg
+            initGlobals()           # init various python globals again
         elif opt == "-u":
             debugMode = "debug"
         elif opt == "-w":
             global enableOldPython
             enableOldPython = 1


_______________________________________________
PyKDE mailing list    PyKDE@mats.gmd.de
http://mats.gmd.de/mailman/listinfo/pykde

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