Changeset 658

Timestamp:

Mar 8, 2010, 4:45:44 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

configure.cmd: Ask if the webkit module should be built (defaults to "no" and the official build always enables it).

File:

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

trunk/configure.cmd

@@ -256 +256 @@
     G.CFG_DECLARATIVE = "auto"
     G.CFG_WEBKIT = "auto"
+    G.CFG_JAVASCRIPTCORE_JIT = "auto"
+
     G.CFG_GFX_AVAILABLE = ""
     G.CFG_GFX_ON = ""
@@ -270 +272 @@
     G.CFG_MOUSE_OFF = ""
     G.CFG_USE_GNUMAKE = "no"
-    CFG_DECORATION_AVAILABLE = "styled windows default"
-    CFG_DECORATION_ON = "${CFG_DECORATION_AVAILABLE}" /* all on by default */
+    G.CFG_DECORATION_AVAILABLE = "styled windows default"
+    G.CFG_DECORATION_ON = G.CFG_DECORATION_AVAILABLE /* all on by default */
     G.CFG_DECORATION_PLUGIN_AVAILABLE = ""
     G.CFG_DECORATION_PLUGIN = ""
@@ -949 +951 @@
     end
 
-    if (G.CFG_WEBKIT == "auto") then
-        G.CFG_WEBKIT = "no" /* WebKit seems to require G++ >= 3.4.x */
-
     /*--------------------------------------------------------------------------
      ask for all that hasn't been auto-detected or specified in the arguments
     --------------------------------------------------------------------------*/
 
-    /* We don't ask anything so far. Just apply "yes" to "auto" options */
-
-    /* enable all image formats and ZLIB by default */
+    if (G.CFG_WEBKIT == "auto") then do
+        if (G.OfficialBuild) then
+            G.CFG_WEBKIT = "yes"
+        else do
+            G.CFG_WEBKIT = "no"
+            call SaySay G.EOL||,
+'Qt comes with the webkit module that provides a powerful framework for web-'G.EOL||,
+'based applications and may be required by some of them but it takes a very 'G.EOL||,
+'long time to compile and build (it will double the overall compilation time).'
+            if (GetYesNo('Do you want to enable the webkit module?', 'N')) then do
+                G.CFG_WEBKIT = "yes"
+            end
+        end
+    end
+
+    /* For everything else, simply apply "yes" to "auto" options */
+
     if (G.CFG_GIF == "auto")    then G.CFG_GIF = "yes"
     if (G.CFG_TIFF == "auto")   then G.CFG_TIFF = "yes"
@@ -1214 +1227 @@
         G.QCONFIG_FLAGS = Join(G.QCONFIG_FLAGS, "QT_NO_DECLARATIVE")
 
-    if (G.CFG_WEBKIT == "yes") then
+    if (G.CFG_WEBKIT == "yes") then do
         G.QT_CONFIG = Join(G.QT_CONFIG, "webkit")
+        if (G.CFG_JAVASCRIPTCORE_JIT == "yes") then
+            call QMakeVar "set", "JAVASCRIPTCORE_JIT", "yes"
+        else if (G.CFG_JAVASCRIPTCORE_JIT == "no") then
+            call QMakeVar "set", "JAVASCRIPTCORE_JIT", "no"
+    end
     else do
         /* The reason we set CFG_WEBKIT, is such that the printed overview of
@@ -1816 +1834 @@
     call SayLog "SVG module .......... "G.CFG_SVG
     call SayLog "WebKit module ....... "G.CFG_WEBKIT
+    if (G.CFG_WEBKIT == "yes") then do
+        if (G.CFG_JAVASCRIPTCORE_JIT == "auto") then
+            call SayLog "JavaScriptCore JIT .. To be decided by JavaScriptCore"
+        else
+            call SayLog "JavaScriptCore JIT .. "G.CFG_JAVASCRIPTCORE_JIT
+    end
     /* declarative sources are not in the tree at all
     call SayLog "Declarative module .. "G.CFG_DECLARATIVE
@@ -2495 +2519 @@
 
 /**
+ *  Shows a Yes/No choice.
+ *
+ *  @param  prompt  prompt to show (specify '' to suppress the prompt)
+ *  @param  default default choice:
+ *      ''          - no default choice
+ *      'Y' or 1    - default is yes
+ *      other       - default is no
+ *  @return
+ *      1 if Yes is selected, otherwise 0
+ */
+GetYesNo: procedure expose (Globals)
+    parse arg prompt, default
+    default = translate(default)
+    if (default == 1) then default = 'Y'
+    else if (default \== '' & default \== 'Y') then default = 'N'
+    if (prompt \= '') then call SaySay prompt
+    say
+    call SayPrompt '[YN] ', 1
+    yn = ReadChoice('YN',, default, 'I')
+    say
+    say
+    return (yn == 'Y')
+
+/**
+ *  Reads a one-key choice from the keyboard.
+ *  user. Letters in the mode argument have the following meanings:
+ *
+ *      E -- allow to press Enter w/o a choice (will return '')
+ *      C -- ESC can be pressed to cancel selection (will return '1B'x)
+ *      I -- ignore case of pressed letters
+ *
+ *  @param  choices     string of allowed one-key choices
+ *  @param  extChoices  string of allowed one-extended-key choices
+ *  @param  default     default choice (can be a key from choices)
+ *  @param  mode        input mode string consisting of letters as described above
+ *  @return
+ *      entered key (prefixed with 'E0'x if from extChoices)
+ */
+ReadChoice: procedure expose (Globals)
+    parse arg choices, extChoices, default, mode
+    mode = translate(mode)
+    ignoreCase = pos('I', mode) > 0
+    allowEnter = pos('E', mode) > 0
+    allowCancel = pos('C', mode) > 0
+    choice = default
+    call charout, choice
+    if (ignoreCase) then choice = translate(choice)
+    extended = 0
+    do forever
+        key = SysGetKey('NOECHO')
+        if (key == 'E0'x) then do
+            extended = 1
+            iterate
+        end
+        if (\extended & ignoreCase) then key = translate(key)
+        select
+            when (allowCancel & \extended & key == '1B'x) then do
+                choice = key
+                leave
+            end
+            when (choice == '' & \extended & verify(key, choices) == 0) then do
+                choice = key
+            end
+            when (extended & verify(key, extChoices) == 0) then do
+                choice = '0E'x||key
+                leave
+            end
+            when (\extended & key == '08'x & choice \== '') then do
+                /* backspace pressed */
+                call charout, key' '
+                choice = ''
+            end
+            when (\extended & key == '0D'x & (choice \== '' | allowEnter)) then do
+                leave
+            end
+            otherwise do
+                extended = 0
+                iterate
+            end
+        end
+        call charout, key
+        extended = 0
+    end
+    return choice
+
+/**
  *  Encloses the given path with quotes if it contains
  *  space characters, otherwise returns it w/o changes.