Changeset 94 for trunk

Timestamp:

May 2, 2006, 9:25:01 PM (19 years ago)

Author:

dmik

Message:

Improved the configure script:

• Offer to (re)compile Qt after reconfiguring it.
• Determine the default mode (release or debug) in the generated qt.cmd using .qtos2config (remains always overridable using R[ELEASE] or D[EBUG] parameters).

File:

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

trunk/configure.cmd

@@ -204 +204 @@
         select
             when choice == 1 then call ConfigureCompiler
-            when choice == 2 then call ConfigureQt
-            when choice == 3 then do; call CompileQt; leave; end
+            when choice == 2 then do
+                call ConfigureQt
+                if (G.!DidConfigureQt) then do
+                    call SaySay 'It is strongly recommended to recompile',
+                                'the Qt library'
+                    call SaySay 'after it has been (re)configured.'
+                    if (GetYesNo('Procceed to compile?', 'Y')) then do
+                        call CompileQt
+                        leave
+                    end
+                end
+            end
+            when choice == 3 then do
+                call CompileQt
+                leave
+            end
             otherwise leave
         end
@@ -390 +404 @@
     call lineout G.!QtCmd, ''
     /*
-     *  determine whether to setup the environment for the debug version of Qt 
+     *  determine whether to setup the environment for the debug version of Qt
+     *  or for the release one 
      */
+    call lineout G.!QtCmd, '/* determine the default DEBUG value using .qtos2config */'
     call lineout G.!QtCmd, 'DEBUG = 0'
+    call lineout G.!QtCmd, 'do while (lines(QTDIR''\.qtos2config'') > 0)'
+    call lineout G.!QtCmd, '    line = strip(linein(QTDIR''\.qtos2config''))'
+    call lineout G.!QtCmd, '    if (word(line, 1) == ''CONFIG'') then'
+    call lineout G.!QtCmd, '        if (wordpos(''debug'', line, 3) > 0) then DEBUG = 1'
+    call lineout G.!QtCmd, 'end'
     call lineout G.!QtCmd, ''
     call lineout G.!QtCmd, '/* parse command line */'
-    call lineout G.!QtCmd, 'parse arg args'
-    call lineout G.!QtCmd, 'if (translate(word(args, 1)) == ''D'' |,'
-    call lineout G.!QtCmd, '    translate(word(args, 1)) == ''DEBUG'') then'
-    call lineout G.!QtCmd, 'do'
-    call lineout G.!QtCmd, '    DEBUG = 1'
-    call lineout G.!QtCmd, '    args = subword(args, 2)'
-    call lineout G.!QtCmd, 'end'
+    call lineout G.!QtCmd, 'parse arg arg1 args'
+    call lineout G.!QtCmd, 'arg1 = translate(arg1)'
+    call lineout G.!QtCmd, 'if (arg1 == ''D'' | arg1 == ''DEBUG'') then DEBUG = 1'
+    call lineout G.!QtCmd, 'else if (arg1 == ''R'' | arg1 == ''RELEASE'') then DEBUG = 0'
+    call lineout G.!QtCmd, 'else parse arg args'
     call lineout G.!QtCmd, ''
     /* 
@@ -801 +820 @@
     call SaySay 'The Qt Library has been configured.'
     say
-
-    call WaitForAnyKey
 
     G.!DidConfigureQt = 1
@@ -1226 +1243 @@
  *  Shows a Yes/No choice.
  *
- *  @param  prompt  prompt to show
+ *  @param  prompt  prompt to show (specify '' to suppress the prompt)
  *  @param  default default choice:
  *      ''      - no default choice
@@ -1238 +1255 @@
     default = translate(default)
     if (default \== '' & default \== 'Y') then default = 'N'
-    call SaySay prompt
+    if (prompt \= '') then call SaySay prompt
     say
     call SayPrompt '[YN] ', 1