Changeset 1576 for sip

Timestamp:

May 20, 2016, 10:41:19 AM (9 years ago)

Author:

Silvan Scherrer

Message:

sip: add GNUMAKE as valid generator, add the version behind the Qt dll

Location:

sip/trunk

Files:

• siputils.py (modified) (4 diffs)
• specs/os2-g++ (modified) (1 diff)

sip/trunk/siputils.py ¶

@@ -873 +873 @@
         qt5_rename = False
 
-        if sys.platform == "win32" and "shared" in self.config.qt_winconfig.split():
+        if sys.platform in ("win32", "os2knix") and "shared" in self.config.qt_winconfig.split():
             if (mname in ("QtCore", "QtDeclarative", "QtDesigner", "QtGui",
                           "QtHelp", "QtMultimedia", "QtNetwork", "QtOpenGL",
@@ -1219 +1219 @@
         if self.generator == "MINGW":
             mfile.write(".SUFFIXES: .cpp .cxx .cc .C .c\n\n")
-        elif self.generator == "UNIX":
+        elif self.generator in ("UNIX", "GNUMAKE"):
             mfile.write(".SUFFIXES: .c .o .cpp .cc .cxx .C\n\n")
         else:
@@ -1317 +1317 @@
         """
         # Help package builders.
-        if self.generator == "UNIX":
+        if self.generator in ("UNIX", "GNUMAKE"):
             dst = "$(DESTDIR)" + dst
 
         mfile.write("\t@%s %s " % (self.chkdir, _quote(dst)))
 
-        if self.generator == "UNIX":
+        if self.generator in ("UNIX", "GNUMAKE"):
             mfile.write("|| ")
 
@@ -1404 +1404 @@
             if self.generator == "MINGW":
                 mfile.write("\t@$(MAKE) -C %s%s\n" % (d, tname))
-            elif self.generator == "UNIX":
+            elif self.generator in ("UNIX", "GNUMAKE"):
                 mfile.write("\t@(cd %s; $(MAKE)%s)\n" % (d, tname))
             else:

sip/trunk/specs/os2-g++ ¶

@@ -5 +5 @@
 #
 
-MAKEFILE_GENERATOR  = UNIX
+MAKEFILE_GENERATOR  = GNUMAKE
 TEMPLATE        = app
 CONFIG          += qt warn_on release link_prl copy_dir_files