Changeset 507 for trunk

Timestamp:

Feb 3, 2010, 4:47:59 AM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

general: Don't use the debug_and_release setup unless it is configured so by configure.cmd. Make sure the release setup is used for the official build.

Location:

trunk

Files:

• configure.cmd (modified) (5 diffs)
• mkspecs/os2-g++/qmake.conf (modified) (1 diff)

trunk/configure.cmd

@@ -29 +29 @@
 G.ScreenHeight  = -1
 G.Verbose       = 1
+
 
 /* initialize global variables */
@@ -169 +170 @@
     build = linein(G.RelPath"\official_build")
     if (build \== "") then do
+
         G.QT_BUILD_VERSION = build
         G.QT_CONFIG = "official_build"
@@ -174 +176 @@
         call SaySay "WARNING:"
         call SaySay "You are going to configure an official build of Qt4 for OS/2!"
-        call SaySay "Full version number is: "G.QT_VERSION"-"G.QT_BUILD_VERSION
+        call SaySay "Full version number is: "G.QT_VERSION""G.QT_BUILD_VERSION
         call SaySay
         call SaySay "If you understand what it means and want to continue,"
@@ -459 +461 @@
         /* detect build style */
         if (G.CFG_DEBUG == "auto") then do
-            G.CFG_DEBUG_RELEASE = "yes"
-            G.CFG_DEBUG = "yes"
+            if (G.OfficialBuild) then do
+                G.CFG_DEBUG_RELEASE = "no"
+                G.CFG_DEBUG = "no"
+            end
+            else do
+                G.CFG_DEBUG_RELEASE = "yes"
+                G.CFG_DEBUG = "yes"
+            end
         end
         if (G.CFG_DEBUG_RELEASE == "yes") then
@@ -1478 +1486 @@
     if (G.CFG_DEBUG == "yes") then do
         G.QTCONFIG_CONFIG = Join(G.QTCONFIG_CONFIG, "debug")
-        if (G.CFG_DEBUG_RELEASE == "yes") then
+        G.QT_CONFIG = Join(G.QT_CONFIG, "debug")
+        if (G.CFG_DEBUG_RELEASE == "yes") then do
+            G.QTCONFIG_CONFIG = Join(G.QTCONFIG_CONFIG, "debug_and_release")
+            G.QTCONFIG_CONFIG = Join(G.QTCONFIG_CONFIG, "debug_and_release_target")
             G.QT_CONFIG = Join(G.QT_CONFIG, "release")
-        G.QT_CONFIG = Join(G.QT_CONFIG, "debug")
+        
     end
     else if (G.CFG_DEBUG == "no") then do
         G.QTCONFIG_CONFIG = Join(G.QTCONFIG_CONFIG, "release")
-        if (G.CFG_DEBUG_RELEASE == "yes") then
+        G.QT_CONFIG = Join(G.QT_CONFIG, "release")
+        if (G.CFG_DEBUG_RELEASE == "yes") then do
+            G.QTCONFIG_CONFIG = Join(G.QTCONFIG_CONFIG, "debug_and_release")
+            G.QTCONFIG_CONFIG = Join(G.QTCONFIG_CONFIG, "debug_and_release_target")
             G.QT_CONFIG = Join(G.QT_CONFIG, "debug")
-        G.QT_CONFIG = Join(G.QT_CONFIG, "release")
+        
     end
 

trunk/mkspecs/os2-g++/qmake.conf

@@ -7 +7 @@
 MAKEFILE_GENERATOR  = GNUMAKE
 TEMPLATE        = app
-CONFIG          += qt warn_on release link_prl copy_dir_files debug_and_release debug_and_release_target
+CONFIG          += qt warn_on release link_prl copy_dir_files
 QT              += core gui
 # @todo