Changeset 994

Timestamp:

Aug 17, 2011, 1:23:23 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

OS/2: configure.cmd: Build examples and docs by default.

Also added -nomake/-make options to control what parts to build.

File:

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

trunk/configure.cmd

@@ -41 +41 @@
 G.CFG_DEV           = "no"
 
-G.QT_DEFAULT_BUILD_PARTS = "libs tools docs translations" /* examples demos */
+G.QT_DEFAULT_BUILD_PARTS = "libs tools 
 
 /* all globals to be exposed in procedures */
@@ -174 +174 @@
             G.QT_BUILD_VERSION = build
             G.QT_CONFIG = "official_build"
-            G.QT_DEFAULT_BUILD_PARTS = "libs tools qmake examples demos docs translations"
+            G.QT_DEFAULT_BUILD_PARTS = "libs tools examples demos docs translations"
             if (\quiet) then do
                 call SaySay,
@@ -432 +432 @@
 G.EOL||,
 "Usage: " filespec('N', G.ScriptFile) "[-h] [-release] [-debug] [-debug-and-release]"G.EOL||,
-"        [-developer-build]"G.EOL||,
+"        [-developer-build]"G.EOL||,
 G.EOL||G.EOL||,
 "Configure options:"G.EOL||,
@@ -447 +447 @@
 "    -developer-build ... Compile and link Qt with Qt developer options"G.EOL||,
 "                         (including auto-tests exporting), implies -debug."G.EOL||,
+
+
+
+
+
+
 ""
         call Done 1
@@ -499 +505 @@
                         opt = 'P G.QT_INSTALL_SYSCONFFILE'
 
+
+
+
+
+
                     otherwise nop
                 end
@@ -511 +522 @@
                     else call value opt, 'yes'
                 end
-                if (typ == 'P') then do
+                else if (StartsWith(typ, 'S')) then do
+                    /* argument is a string */
+                    if (i == G.Args.0) then do
+                        call SayErr "ERROR: Option '"G.Args.i"' needs a string."
+                        call Done 1
+                    end
+                    i = i + 1
+                    if (EndsWith(typ, '+')) then
+                        call value opt, Join(value(opt), G.Args.i)
+                    else
+                        call value opt, G.Args.i
+                end
+                else if (typ == 'P') then do
                     /* argument is a path */
                     if (i == G.Args.0) then do
@@ -518 +541 @@
                     end
                     i = i + 1
-                    interpret opt "= translate(G.Args."i", '\', '/')"
+                    
                 end
             end
@@ -760 +783 @@
             call delword G.CFG_BUILD_PARTS, j
     end
+
     if (wordpos("libs", G.CFG_BUILD_PARTS) == 0) then
         G.CFG_BUILD_PARTS = Join(G.CFG_BUILD_PARTS, "libs")