Changeset 537

Timestamp:

Feb 5, 2010, 2:23:12 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

configure.cmd: Introduced --official-build and --official-build-quiet options (supersede the official_build file in the root dir).

File:

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

trunk/configure.cmd

@@ -167 +167 @@
     end
 
-    /* read the build number if any */
-    build = linein(G.RelPath"\official_build")
-    if (build \== "") then do
-        G.OfficialBuild = 1
-        G.QT_BUILD_VERSION = build
-        G.QT_CONFIG = "official_build"
-        call SaySay
-        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
-        call SaySay "If you understand what it means and want to continue,"
-        call SaySay "then type YES below. Otherwise, press Enter or Ctrl-C."
-        call SaySay
-        call SaySay "Continue? ", 1
-        str = linein()
-        if (str \== "YES") then
-            call Done 255
-    end
-    else do
-        build = linein(G.RelPath"\build")
-        if (build \== "") then
+    /* grab the official build option if any
+     * (@todo move this to the command line parsing code when it's done) */
+    build = word(aArgs, 1)
+    if (build == "--official-build" |,
+        build == "--official-build-quiet") then do
+        quiet = (build == "--official-build-quiet")
+        build = word(aArgs, 2)
+        if (build \= '') then do
+            G.OfficialBuild = 1
             G.QT_BUILD_VERSION = build
+            G.QT_CONFIG = "official_build"
+            G.QT_DEFAULT_BUILD_PARTS = "libs tools qmake examples demos"
+            if (\quiet) then do
+                call SaySay,
+G.EOL||,
+'WARNING: You are going to configure an official build of Qt4 for OS/2!'G.EOL||,
+'Full version number is: 'G.QT_VERSION'.'G.QT_BUILD_VERSION||G.EOL||,
+G.EOL||,
+'If you understand what it means and want to continue,'G.EOL||,
+'then type YES below. Otherwise, press Enter or Ctrl-C.'G.EOL
+                call SaySay "Continue? ", 1
+                str = linein()
+                if (str \== "YES") then
+                    call Done 255
+            end
+            aArgs = subword(aArgs, 3)
+        end
     end
 
@@ -320 +324 @@
     G.PLATFORM = GetEnv("QMAKESPEC")
     G.QT_CROSS_COMPILE = "no"
-    G.OPT_CONFIRM_LICENSE = "no"
+
+    if (G.OfficialBuild) then G.OPT_CONFIRM_LICENSE = "yes"
+    else G.OPT_CONFIRM_LICENSE = "no"
+
     G.OPT_SHADOW = "maybe"
     G.OPT_FAST = "auto"