Changeset 1001

Timestamp:

Aug 17, 2011, 7:47:55 PM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

OS/2: configure.cmd: Support single -debug-and-release option.

Previously, specifying -debug-and-release would not have any effect
(this is how the original configure behaves).

File:

• trunk/configure.cmd (modified) (2 diffs)

trunk/configure.cmd

@@ -229 +229 @@
     G.CFG_QCONFIG = "full"
     G.CFG_DEBUG = "auto"
-    G.CFG_DEBUG_RELEASE = "no"
+    G.CFG_DEBUG_RELEASE = "auto"
     G.CFG_SHARED = "yes"
     G.CFG_SM = "auto"
@@ -616 +616 @@
         /* detect build style */
         if (G.CFG_DEBUG == "auto") then do
-            if (G.OfficialBuild) then do
+            if (G.CFG_DEBUG_RELEASE \== "auto") then do
+                G.CFG_DEBUG = "no"
+            end
+            else do
+                if (G.OfficialBuild) then do
+                    G.CFG_DEBUG_RELEASE = "no"
+                    G.CFG_DEBUG = "no"
+                end
+                else if (G.CFG_DEV == "yes") then do
+                    G.CFG_DEBUG_RELEASE = "no"
+                    G.CFG_DEBUG = "yes"
+                end
+                else if (G.OPT_SHADOW == "yes") 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
+        end
+        else do
+            if (G.CFG_DEBUG_RELEASE == "auto") then do
                 G.CFG_DEBUG_RELEASE = "no"
-                G.CFG_DEBUG = "no"
-            end
-            else if (G.CFG_DEV == "yes") then do
-                G.CFG_DEBUG_RELEASE = "no"
-                G.CFG_DEBUG = "yes"
-            end
-            else if (G.OPT_SHADOW == "yes") 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