Changeset 815

Timestamp:

Nov 4, 2010, 1:57:51 AM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

configure.cmd: Added recognition of -prefix and other options that allow to set hard-coded library paths returned by QLibraryInfo.

File:

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

trunk/configure.cmd

@@ -347 +347 @@
     G.QT_INSTALL_EXAMPLES = ""
     G.QT_INSTALL_DEMOS = ""
-    G.QT_HOST_PREFIX = ""
+    G.QT_ = ""
 
     G.QT_LIBINFIX = ""
@@ -421 +421 @@
     --------------------------------------------------------------------------*/
 
-    /* @todo */
     if (aArgs \= "") then do
-        call SayErr
-        call SayErr "Sorry, command line arguments are not yet processed."
-        call SayErr "Please run the script again without the arguments."
-        call SayErr
-        call Done 1
+        call TokenizeString aArgs, 'G.Args'
+        i = 1
+        do while i <= G.Args.0
+            a = G.Args.i
+            if (StartsWith(a, '-')) then do
+                a = strip(a, 'L', '-')
+                opt = ''
+                typ = 'P' /* path */
+                select
+                    when (a == "prefix") then
+                        opt = 'G.QT_INSTALL_PREFIX'
+                    when (a == "datadir") then
+                        opt = 'G.QT_INSTALL_DATA'
+                    when (a == "libdir") then
+                        opt = 'G.QT_INSTALL_LIBS'
+                    when (a == "headerdir") then
+                        opt = 'G.QT_INSTALL_HEADERS'
+                    when (a == "bindir") then
+                        opt = 'G.QT_INSTALL_BINS'
+                    when (a == "plugindir") then
+                        opt = 'G.QT_INSTALL_PLUGINS'
+                    when (a == "demosdir") then
+                        opt = 'G.QT_INSTALL_DEMOS'
+                    when (a == "examplesdir") then
+                        opt = 'G.QT_INSTALL_EXAMPLES'
+                    when (a == "docdir") then
+                        opt = 'G.QT_INSTALL_DOCS'
+                    when (a == "translationdir") then
+                        opt = 'G.QT_INSTALL_TRANSLATIONS'
+                    when (a == "sysconfdir" | a == "settingsdir") then
+                        opt = 'G.QT_INSTALL_SETTINGS'
+                    when (a == "sysconffile") then
+                        opt = 'G.QT_INSTALL_SYSCONFFILE'
+                    otherwise typ = ''
+                end
+                if (typ == '') then do
+                    call SayErr "ERROR: Invalid option '"G.Args.i"'."
+                    call Done 1
+                end
+                if (typ == 'P') then do
+                    if (i == G.Args.0) then do
+                        call SayErr "ERROR: Option '"G.Args.i"' needs a path value."
+                        call Done 1
+                    end
+                    i = i + 1
+                    interpret opt "= translate(G.Args."i", '\', '/')"
+                end
+            end
+            else do
+                call SayErr "ERROR: Invalid argument '"G.Args.i"'."
+                call Done 1
+            end
+            i = i + 1
+        end
     end
 
@@ -687 +735 @@
     if (G.QT_INSTALL_DEMOS == "") then
         G.QT_INSTALL_DEMOS = "demos"
+
 
     /*--------------------------------------------------------------------------
@@ -777 +826 @@
 '#define QT_CONFIGURE_EXAMPLES_PATH "'CPPPath(G.QT_INSTALL_EXAMPLES)'"'G.EOL||,
 '#define QT_CONFIGURE_DEMOS_PATH "'CPPPath(G.QT_INSTALL_DEMOS)'"'G.EOL
+
+
+
+
 
     today = date('S')
@@ -2941 +2994 @@
 
 /**
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
  * Initializes a new "at exit" slot and returns its ID.
  */