Changeset 585


Ignore:
Timestamp:
Feb 21, 2010, 4:35:05 PM (15 years ago)
Author:
Dmitry A. Kuminov
Message:

configure.cmd: Adjust to the new configuration options in Qt 4.6 (this fixes the clean build) and create 'configure.log' in the script directory for later reference.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/configure.cmd

    r582 r585  
    2525G.ScreenWidth   = -1
    2626G.ScreenHeight  = -1
     27
    2728G.Verbose       = 1
    28 G.OfficialBuild = 0
     29G.LogFile       = ''
    2930
    3031/* initialize global variables */
    … …  
    4041G.CFG_DEV           = "no"
    4142
    42 /* All defines that express the limited functionality of the OS/2 version of Qt
    43  * (mostly because the relevant features are not yet implemented).
    44  *
    45  * NOTE: These defines affect the value of QT_BUILD_KEY (QLibraryInfo::buildKey())
    46  * which deals with binary compatibility, so use with care! If you only want the
    47  * QT_NO_ defne to appear in qconfig.h but not in the build key, use
    48  * G.QCONFIG_FLAGS instead.
    49  */
    50 G.LIMITATION_DEFS   =,
    51     "QT_NO_TABLET",
    52     "QT_NO_SYSTEMSEMAPHORE QT_NO_SHAREDMEMORY",
    53     "QT_NO_IM QT_NO_ACCESSIBILITY QT_NO_IPV6 QT_NO_LPR"
    54 
    55 G.QCONFIG_FLAGS     = G.LIMITATION_DEFS
    56 
    5743G.QT_DEFAULT_BUILD_PARTS = "libs tools qmake" /* examples demos docs translations */
    5844
    … …  
    7460parse source . . G.ScriptFile
    7561G.ScriptDir = FixDir(filespec('D', G.ScriptFile) || filespec('P', G.ScriptFile))
     62
     63G.LogFile = FixDirNoSlash(G.ScriptDir)'\configure.log'
     64call DeleteFile G.LogFile
    7665
    7766/* check text screen resolution */
    … …  
    173162    /* grab the official build option if any
    174163     * (@todo move this to the command line parsing code when it's done) */
     164    G.OfficialBuild = 0
    175165    build = word(aArgs, 1)
    176166    if (build == "--official-build" |,
    … …  
    191181'If you understand what it means and want to continue,'G.EOL||,
    192182'then type YES below. Otherwise, press Enter or Ctrl-C.'G.EOL
    193                 call SaySay "Continue? ", 1
     183                call SayPrompt "Continue? ", 1
    194184                str = linein()
    195185                if (str \== "YES") then
    … …  
    227217    G.CFG_PROFILE = "no"
    228218    G.CFG_EXCEPTIONS = "unspecified"
    229     G.CFG_SCRIPTTOOLS = "auto" /* (yes|no|auto) */
    230     G.CFG_XMLPATTERNS = "auto" /* (yes|no|auto) */
     219    G.CFG_CONCURRENT = "auto"
     220    G.CFG_SCRIPT = "auto"
     221    G.CFG_SCRIPTTOOLS = "auto"
     222    G.CFG_CONCURRENT = "auto"
     223    G.CFG_XMLPATTERNS = "auto"
    231224    G.CFG_INCREMENTAL = "auto"
    232225    G.CFG_QCONFIG = "full"
    … …  
    257250    G.CFG_PHONON = "auto"
    258251    G.CFG_PHONON_BACKEND = "yes"
     252    G.CFG_MULTIMEDIA = "auto"
     253    G.CFG_AUDIO_BACKEND = "auto"
    259254    G.CFG_SVG = "yes"
    260     G.CFG_WEBKIT = "auto" /* (yes|no|auto) */
     255    G.CFG_DECLARATIVE = "auto"
     256    G.CFG_WEBKIT = "auto"
    261257    G.CFG_GFX_AVAILABLE = ""
    262258    G.CFG_GFX_ON = ""
    … …  
    273269    G.CFG_MOUSE_OFF = ""
    274270    G.CFG_USE_GNUMAKE = "no"
    275     G.CFG_IM = "yes"
    276271    CFG_DECORATION_AVAILABLE = "styled windows default"
    277272    CFG_DECORATION_ON = "${CFG_DECORATION_AVAILABLE}" /* all on by default */
    … …  
    295290    G.CFG_PRECOMPILE = "auto"
    296291    G.CFG_SEPARATE_DEBUG_INFO = "auto"
     292    G.CFG_IPV6 = "auto"
    297293/* @todo do we really need this?
    298294    G.CFG_MMX = "auto"
    … …  
    301297    G.CFG_SSE2 = "auto"
    302298    G.CFG_IWMMXT = "no"
    303     G.CFG_IPV6 = "auto"
    304299    G.CFG_CLOCK_GETTIME = "auto"
    305300    G.CFG_CLOCK_MONOTONIC = "auto"
    … …  
    320315    G.CFG_PREFIX_INSTALL = "yes"
    321316    G.CFG_SDK = ""
    322     G.D_FLAGS = G.LIMITATION_DEFS
     317    G.D_FLAGS = ""
    323318    G.I_FLAGS = ""
    324319    G.L_FLAGS = ""
    325320    G.l_FLAGS = ""
     321    G.QCONFIG_FLAGS = ""
    326322    G.XPLATFORM = "" /* This seems to be the QMAKESPEC, like "linux-g++" */
    327323    G.PLATFORM = GetEnv("QMAKESPEC")
    … …  
    333329    G.OPT_SHADOW = "maybe"
    334330    G.OPT_FAST = "auto"
    335     G.OPT_VERBOSE = "no"
    336331    G.OPT_HELP = ""
    337332    G.CFG_SILENT = "no"
    … …  
    443438
    444439    if (G.CFG_QCONFIG \== "full" & G.CFG_QT3SUPPORT == "yes") then do
    445         call SaySay "Warning: '-qconfig "G.CFG_QCONFIG"' will disable the qt3support library."
     440        call SayLog "Warning: '-qconfig "G.CFG_QCONFIG"' will disable the qt3support library."
    446441        G.CFG_QT3SUPPORT = "no"
    447442    end
    … …  
    554549    end
    555550
    556     call SayVerbose "System architecture: '"G.CFG_ARCH"'"
     551    call SayVerbose "System architecture: '"G.CFG_ARCH"'"G.EOL
    557552
    558553    /*--------------------------------------------------------------------------
    … …  
    631626     * the printer classses at all when CUPS is not available */
    632627    if (G.CFG_CUPS == 'no') then do
    633         call SaySay 'WARNING: Printing support is completely disabled due to',
     628        call SayLog 'WARNING: Printing support is completely disabled due to',
    634629                    'disabled CUPS support.'
    635         G.D_FLAGS = Join(G.D_FLAGS, "QT_NO_PRINTER")
    636630        G.QCONFIG_FLAGS = Join(G.QCONFIG_FLAGS, "QT_NO_PRINTER")
    637631    end
    638632
    639     /* NIS support is always off for now */
     633    /*--------------------------------------------------------------------------
     634     apply OS/2-specific limitations to the configuration
     635    --------------------------------------------------------------------------*/
     636
     637    /* This is the place to force the current limitations of Qt for OS/2
     638     * (i.e. features that are unconditionally unavailable at the moment) */
     639
     640    G.QCONFIG_FLAGS = Join(G.QCONFIG_FLAGS,,
     641        "QT_NO_TABLET QT_NO_SYSTEMSEMAPHORE QT_NO_SHAREDMEMORY",
     642        "QT_NO_IM QT_NO_LPR")
     643
     644    G.CFG_ACCESSIBILITY = "no"
     645    G.CFG_MULTIMEDIA = "no"
     646    G.CFG_IPV6 = "no"
    640647    G.CFG_NIS = "no"
    641648
    … …  
    685692    if (G.OPT_HELP == "yes") then do
    686693        /* @todo */
    687         call SaySay "TODO: Help message"
     694        call SayLog "TODO: Help message"
    688695    end
    689696
    … …  
    692699    --------------------------------------------------------------------------*/
    693700
    694     call SaySay
    695     call SaySay "This is the Qt for OS/2 "G.EditionString" Edition."
    696     call SaySay
     701    call SayLog
     702    call SayLog "This is the Qt for OS/2 "G.EditionString" Edition."
     703    call SayLog
    697704
    698705    if (G.Edition == "OpenSource") then
    … …  
    807814    --------------------------------------------------------------------------*/
    808815
    809     call SaySay "Creating qmake. Please wait..."
     816    call SayLog "Creating qmake. Please wait..."
    810817
    811818    /* take the correct Makefile and fix it */
    … …  
    925932                    if (G.CFG_SQLITE == "system") then do
    926933                        /* @todo external sqlite3 library isn't yet supported */
    927                         call SaySay,
     934                        call SayLog,
    928935"Warning: Linking against the external sqlite3 library isn't yet supported,"G.EOL||,
    929936"the sqlite SQL driver is disabled"G.EOL||G.EOL
    … …  
    10291036    end
    10301037
     1038    if (G.CFG_IPV6 == "yes") then
     1039        G.QT_CONFIG = Join(G.QT_CONFIG, "ipv6")
     1040    else
     1041        G.CFG_IPV6 = "no"
     1042
    10311043/* @todo do we really need this?
    10321044    if (G.CFG_MMX == "yes") then
    … …  
    10401052    if (G.CFG_IWMMXT == "yes") then
    10411053        G.QMAKE_CONFIG = Join(G.QMAKE_CONFIG, "iwmmxt")
    1042     if (G.CFG_IPV6 == "yes") then
    1043         G.QT_CONFIG = Join(G.QT_CONFIG, "ipv6")
    10441054    if (G.CFG_CLOCK_GETTIME == "yes") then
    10451055        G.QT_CONFIG = Join(G.QT_CONFIG, "clock-gettime")
    … …  
    11471157    if (G.CFG_EXCEPTIONS \== "no") then
    11481158        G.QTCONFIG_CONFIG = Join(G.QTCONFIG_CONFIG, "exceptions")
     1159    else
     1160        G.CFG_EXCEPTIONS = "no"
     1161
     1162    if (G.CFG_CONCURRENT == "auto") then
     1163        G.CFG_CONCURRENT = "yes"
     1164
     1165    if (G.CFG_CONCURRENT == "no") then
     1166        G.QCONFIG_FLAGS = Join(G.QCONFIG_FLAGS, "QT_NO_CONCURRENT")
    11491167
    11501168    if (G.CFG_XMLPATTERNS == "yes" & G.CFG_EXCEPTIONS == "no") then do
    … …  
    11621180        G.QCONFIG_FLAGS = Join(G.QCONFIG_FLAGS, "QT_NO_XMLPATTERNS")
    11631181
     1182    if (G.CFG_MULTIMEDIA == "auto") then
     1183        G.CFG_MULTIMEDIA == "yes"
     1184
     1185    if (G.CFG_MULTIMEDIA == "no") then
     1186        G.QCONFIG_FLAGS = Join(G.QCONFIG_FLAGS, "QT_NO_MULTIMEDIA")
     1187    else
     1188        G.QT_CONFIG = Join(G.QT_CONFIG, "multimedia")
     1189
     1190    if (G.CFG_AUDIO_BACKEND == "yes") then
     1191        G.QT_CONFIG = Join(G.QT_CONFIG, "audio-backend")
     1192
    11641193    if (G.CFG_SVG == "yes") then
    11651194        G.QT_CONFIG = Join(G.QT_CONFIG, "svg")
    11661195    else
    11671196        G.QCONFIG_FLAGS = Join(G.QCONFIG_FLAGS, "QT_NO_SVG")
     1197
     1198    if (G.CFG_DECLARATIVE == "auto") then
     1199        G.CFG_DECLARATIVE = "yes"
     1200
     1201    if (G.CFG_DECLARATIVE == "yes") then
     1202        G.QT_CONFIG = Join(G.QT_CONFIG, "declarative")
     1203    else
     1204        G.QCONFIG_FLAGS = Join(G.QCONFIG_FLAGS, "QT_NO_DECLARATIVE")
    11681205
    11691206    if (G.CFG_WEBKIT == "auto") then
    … …  
    11791216    end
    11801217
     1218    if (G.CFG_SCRIPT == "auto") then
     1219        G.CFG_SCRIPT = "yes"
     1220
     1221    if (G.CFG_SCRIPT == "yes") then
     1222        G.QT_CONFIG = Join(G.QT_CONFIG, "script")
     1223    else
     1224        G.QCONFIG_FLAGS = Join(G.QCONFIG_FLAGS, "QT_NO_SCRIPT")
     1225
    11811226    if (G.CFG_SCRIPTTOOLS == "auto") then
    11821227        G.CFG_SCRIPTTOOLS = "yes"
    … …  
    11901235
    11911236    if (G.CFG_EXCEPTIONS == "no") then do
     1237        call QMakeVar "add", "QMAKE_CFLAGS", "$$QMAKE_CFLAGS_EXCEPTIONS_OFF"
    11921238        call QMakeVar "add", "QMAKE_CXXFLAGS", "$$QMAKE_CXXFLAGS_EXCEPTIONS_OFF"
     1239        call QMakeVar "add", "QMAKE_LFLAGS", "$$QMAKE_LFLAGS_EXCEPTIONS_OFF"
    11931240        G.QMAKE_CONFIG = Join(G.QMAKE_CONFIG, "exceptions_off")
    11941241    end
    … …  
    12921339        opt = strip(word(G.D_FLAGS, i))
    12931340        if (StartsWith(opt, "QT_NO")) then do
     1341            /* skip defines marked as not affecting binary compatibility */
     1342            if (wordpos(opt, G.BUILD_KEY_IRRELEVANT) \= 0) then
     1343                iterate
    12941344            /* maintan sort order and unicity (helps ensure that changes in this
    12951345             * configure script don't affect the QT_BUILD_KEY generation) */
    … …  
    14221472    if (G.CFG_EXCEPTIONS == "no") then
    14231473        G.QCONFIG_FLAGS = Join(G.QCONFIG_FLAGS, "QT_NO_EXCEPTIONS")
    1424 /* @todo detect what's actually relevant
    1425     if (G.CFG_IPV6 == "no") then
     1474    if (G.CFG_IPV6 \== "yes") then
    14261475        G.QCONFIG_FLAGS = Join(G.QCONFIG_FLAGS, "QT_NO_IPV6")
    1427 */
    14281476    if (G.CFG_QGTKSTYLE \== "yes") then
    14291477        G.QCONFIG_FLAGS = Join(G.QCONFIG_FLAGS, "QT_NO_STYLE_GTK")
    1430     if (G.CFG_OPENSSL == "no") then
     1478    if (G.CFG_OPENSSL \== "yes") then
    14311479        G.QCONFIG_FLAGS = Join(G.QCONFIG_FLAGS, "QT_NO_OPENSSL")
    1432     if (G.CFG_DBUS == "no") then
     1480    if (G.CFG_DBUS \== "yes") then
    14331481        G.QCONFIG_FLAGS = Join(G.QCONFIG_FLAGS, "QT_NO_DBUS")
    14341482
    … …  
    17081756    --------------------------------------------------------------------------*/
    17091757
     1758    call SayLog
     1759
    17101760    /* G++ is the only supported compiler on OS/2 so far */
     1761    /* @todo enable this code when we start processing command line options
    17111762    if (G.CFG_EXCEPTIONS \== "no") then
    1712         call SaySay,
     1763        call SayLog,
    17131764'        This target is using the GNU C++ compiler ('G.PLATFORM').'G.EOL||,
    17141765''G.EOL||,
    … …  
    17201771'        option to compile Qt without exceptions. This is completely binary'G.EOL||,
    17211772'        compatible, and existing applications will continue to work.'G.EOL||G.EOL
     1773    */
    17221774
    17231775    if (G.XPLATFORM == G.PLATFORM) then
    1724         call SaySay "Build type:    "G.PLATFORM
     1776        call SayLog "Build type:    "G.PLATFORM
    17251777    else do
    1726         call SaySay "Building on:   "G.PLATFORM
    1727         call SaySay "Building for:  "G.XPLATFORM
    1728     end
    1729 
    1730     call SaySay "Architecture:  "G.CFG_ARCH
    1731 
    1732     if (G.OPT_VERBOSE == "yes") then do
    1733         call SaySay "qmake vars .......... "replace(G.QMAKE_VARS,G.EOL,' ')
    1734         call SaySay "qmake switches ...... "G.QMAKE_SWITCHES
    1735     end
     1778        call SayLog "Building on:   "G.PLATFORM
     1779        call SayLog "Building for:  "G.XPLATFORM
     1780    end
     1781
     1782    call SayLog "Architecture:  "G.CFG_ARCH
     1783    call SayLog
    17361784
    17371785    /* @todo process CFG_INCREMENTAL? */
    17381786
    1739     call SaySay "Build ............... "G.CFG_BUILD_PARTS
    1740     call SaySay "Configuration ....... "G.QMAKE_CONFIG G.QT_CONFIG
     1787    call SayLog "Build ............... "G.CFG_BUILD_PARTS
     1788    call SayLog "Configuration ....... "G.QMAKE_CONFIG G.QT_CONFIG
    17411789    if (G.CFG_DEBUG_RELEASE == "yes") then do
    1742        call SaySay "Debug ............... yes (combined)"
     1790       call SayLog "Debug ............... yes (combined)"
    17431791       if (G.CFG_DEBUG == "yes") then
    1744            call SaySay "Default Link ........ debug"
     1792           call SayLog "Default Link ........ debug"
    17451793       else
    1746            call SaySay "Default Link ........ release"
     1794           call SayLog "Default Link ........ release"
    17471795    end
    17481796    else
    1749        call SaySay "Debug ............... "G.CFG_DEBUG
    1750 
    1751     call SaySay "Qt 3 compatibility .. "G.CFG_QT3SUPPORT
     1797       call SayLog "Debug ............... "G.CFG_DEBUG
     1798
     1799    call SayLog "Qt 3 compatibility .. "G.CFG_QT3SUPPORT
     1800    if (G.CFG_DBUS == "no") then
     1801        call SayLog "QtDBus module ....... no"
     1802    if (G.CFG_DBUS == "yes") then
     1803        call SayLog "QtDBus module ....... yes (run-time)"
     1804    if (G.CFG_DBUS == "linked") then
     1805        call SayLog "QtDBus module ....... yes (linked)"
     1806    call SayLog "QtConcurrent code.... "G.CFG_CONCURRENT
     1807    call SayLog "QtScript module ..... "G.CFG_SCRIPT
     1808    call SayLog "QtScriptTools module  "G.CFG_SCRIPTTOOLS
     1809    call SayLog "QtXmlPatterns module  "G.CFG_XMLPATTERNS
     1810    call SayLog "Phonon module ....... "G.CFG_PHONON
     1811    call SayLog "Multimedia module ... "G.CFG_MULTIMEDIA
     1812    call SayLog "SVG module .......... "G.CFG_SVG
     1813    call SayLog "WebKit module ....... "G.CFG_WEBKIT
     1814    call SayLog "Declarative module .. "G.CFG_DECLARATIVE
     1815    call SayLog "STL support ......... "G.CFG_STL
     1816    call SayLog "PCH support ......... "G.CFG_PRECOMPILE
    17521817/* @todo do we really need this?
    1753     [ "$CFG_DBUS" = "no" ]     && echo "QtDBus module ....... no"
    1754     [ "$CFG_DBUS" = "yes" ]    && echo "QtDBus module ....... yes (run-time)"
    1755     [ "$CFG_DBUS" = "linked" ] && echo "QtDBus module ....... yes (linked)"
     1818    call SayLog "MMX/3DNOW/SSE/SSE2..  "G.CFG_MMX}"/"G.CFG_3DNOW"/"G.CFG_SSE"/"G.CFG_SSE2
    17561819*/
    1757     call SaySay "QtScriptTools module  "G.CFG_SCRIPTTOOLS
    1758     call SaySay "QtXmlPatterns module  "G.CFG_XMLPATTERNS
    1759     call SaySay "Phonon module ....... "G.CFG_PHONON
    1760     call SaySay "SVG module .......... "G.CFG_SVG
    1761     call SaySay "WebKit module ....... "G.CFG_WEBKIT
    1762     call SaySay "STL support ......... "G.CFG_STL
    1763     call SaySay "PCH support ......... "G.CFG_PRECOMPILE
     1820    call SayLog "Graphics System ..... "G.CFG_GRAPHICS_SYSTEM
     1821    call SayLog "IPv6 support ........ "G.CFG_IPV6
     1822    call SayLog "Accessibility ....... "G.CFG_ACCESSIBILITY
     1823    call SayLog "NIS support ......... "G.CFG_NIS
     1824    call SayLog "CUPS support ........ "G.CFG_CUPS
    17641825/* @todo do we really need this?
    1765     call SaySay "MMX/3DNOW/SSE/SSE2..  "G.CFG_MMX}"/"G.CFG_3DNOW"/"G.CFG_SSE"/"G.CFG_SSE2
     1826    call SayLog "IPv6 ifname support . "G.CFG_IPV6IFNAME
     1827    call SayLog "getifaddrs support .. "G.CFG_GETIFADDRS
     1828    call SayLog "Iconv support ....... "G.CFG_ICONV
     1829    call SayLog "Glib support ........ "G.CFG_GLIB
     1830    call SayLog "GStreamer support ... "G.CFG_GSTREAMER
    17661831*/
    1767     call SaySay "Graphics System ..... "G.CFG_GRAPHICS_SYSTEM
    1768     call SaySay "Accessibility ....... "G.CFG_ACCESSIBILITY
    1769     call SaySay "CUPS support ........ "G.CFG_CUPS
    1770     call SaySay "NIS support ......... "G.CFG_NIS
    1771 /* @todo do we really need this?
    1772     call SaySay "IPv6 support ........ "G.CFG_IPV6
    1773     call SaySay "IPv6 ifname support . "G.CFG_IPV6IFNAME
    1774     call SaySay "getifaddrs support .. "G.CFG_GETIFADDRS
    1775     call SaySay "Iconv support ....... "G.CFG_ICONV
    1776     call SaySay "Glib support ........ "G.CFG_GLIB
    1777     call SaySay "GStreamer support ... "G.CFG_GSTREAMER
    1778 */
    1779     call SaySay "Large File support .. "G.CFG_LARGEFILE
    1780     call SaySay "GIF support ......... "G.CFG_GIF
     1832    call SayLog "Large File support .. "G.CFG_LARGEFILE
     1833    call SayLog "GIF support ......... "G.CFG_GIF
    17811834    if (G.CFG_TIFF == "no") then
    1782         call SaySay "TIFF support ........ "G.CFG_TIFF
     1835        call SayLog "TIFF support ........ "G.CFG_TIFF
    17831836    else
    1784         call SaySay "TIFF support ........ "G.CFG_TIFF" ("G.CFG_LIBTIFF")"
     1837        call SayLog "TIFF support ........ "G.CFG_TIFF" ("G.CFG_LIBTIFF")"
    17851838    if (G.CFG_JPEG == "no") then
    1786         call SaySay "JPEG support ........ "G.CFG_JPEG
     1839        call SayLog "JPEG support ........ "G.CFG_JPEG
    17871840    else
    1788         call SaySay "JPEG support ........ "G.CFG_JPEG" ("G.CFG_LIBJPEG")"
     1841        call SayLog "JPEG support ........ "G.CFG_JPEG" ("G.CFG_LIBJPEG")"
    17891842    if (G.CFG_PNG == "no") then
    1790         call SaySay "PNG support ......... "G.CFG_PNG
     1843        call SayLog "PNG support ......... "G.CFG_PNG
    17911844    else
    1792         call SaySay "PNG support ......... "G.CFG_PNG" ("G.CFG_LIBPNG")"
     1845        call SayLog "PNG support ......... "G.CFG_PNG" ("G.CFG_LIBPNG")"
    17931846    if (G.CFG_MNG == "no") then
    1794         call SaySay "MNG support ......... "G.CFG_MNG
     1847        call SayLog "MNG support ......... "G.CFG_MNG
    17951848    else
    1796         call SaySay "MNG support ......... "G.CFG_MNG" ("G.CFG_LIBMNG")"
    1797     call SaySay "zlib support ........ "G.CFG_ZLIB
    1798     call SaySay "Session management .. "G.CFG_SM
     1849        call SayLog "MNG support ......... "G.CFG_MNG" ("G.CFG_LIBMNG")"
     1850    call SayLog "zlib support ........ "G.CFG_ZLIB
     1851    call SayLog "Session management .. "G.CFG_SM
    17991852
    18001853    if (G.CFG_OPENGL == "desktop") then
    1801         call SaySay "OpenGL support ...... yes (Desktop OpenGL)"
     1854        call SayLog "OpenGL support ...... yes (Desktop OpenGL)"
    18021855    else if (G.CFG_OPENGL == "es1") then
    1803         call SaySay "OpenGL support ...... yes (OpenGL ES 1.x Common profile)"
     1856        call SayLog "OpenGL support ...... yes (OpenGL ES 1.x Common profile)"
    18041857    else if (G.CFG_OPENGL == "es1cl") then
    1805         call SaySay "OpenGL support ...... yes (OpenGL ES 1.x Common Lite profile)"
     1858        call SayLog "OpenGL support ...... yes (OpenGL ES 1.x Common Lite profile)"
    18061859    else if (G.CFG_OPENGL == "es2") then
    1807         call SaySay "OpenGL support ...... yes (OpenGL ES 2.x)"
     1860        call SayLog "OpenGL support ...... yes (OpenGL ES 2.x)"
    18081861    else
    1809         call SaySay "OpenGL support ...... no"
     1862        call SayLog "OpenGL support ...... no"
    18101863
    18111864    if (G.CFG_SQL_mysql \== "no") then
    1812         call SaySay "MySQL support ....... "G.CFG_SQL_mysql
     1865        call SayLog "MySQL support ....... "G.CFG_SQL_mysql
    18131866    if (G.CFG_SQL_psql \== "no") then
    1814         call SaySay "PostgreSQL support .. "G.CFG_SQL_psql
     1867        call SayLog "PostgreSQL support .. "G.CFG_SQL_psql
    18151868    if (G.CFG_SQL_odbc \== "no") then
    1816         call SaySay "ODBC support ........ "G.CFG_SQL_odbc
     1869        call SayLog "ODBC support ........ "G.CFG_SQL_odbc
    18171870    if (G.CFG_SQL_oci \== "no") then
    1818         call SaySay "OCI support ......... "G.CFG_SQL_oci
     1871        call SayLog "OCI support ......... "G.CFG_SQL_oci
    18191872    if (G.CFG_SQL_tds \== "no") then
    1820         call SaySay "TDS support ......... "G.CFG_SQL_tds
     1873        call SayLog "TDS support ......... "G.CFG_SQL_tds
    18211874    if (G.CFG_SQL_db2 \== "no") then
    1822         call SaySay "DB2 support ......... "G.CFG_SQL_db2
     1875        call SayLog "DB2 support ......... "G.CFG_SQL_db2
    18231876    if (G.CFG_SQL_ibase \== "no") then
    1824         call SaySay "InterBase support ... "G.CFG_SQL_ibase
     1877        call SayLog "InterBase support ... "G.CFG_SQL_ibase
    18251878    if (G.CFG_SQL_sqlite2 \== "no") then
    1826         call SaySay "SQLite 2 support .... "G.CFG_SQL_sqlite2
     1879        call SayLog "SQLite 2 support .... "G.CFG_SQL_sqlite2
    18271880    if (G.CFG_SQL_sqlite \== "no") then
    1828         call SaySay "SQLite support ...... "G.CFG_SQL_sqlite" ("G.CFG_SQLITE")"
     1881        call SayLog "SQLite support ...... "G.CFG_SQL_sqlite" ("G.CFG_SQLITE")"
    18291882
    18301883    OPENSSL_LINKAGE = ""
    … …  
    18331886    else if (G.CFG_OPENSSL == "linked") then
    18341887        OPENSSL_LINKAGE = "(linked)"
    1835     call SaySay "OpenSSL support ..... "G.CFG_OPENSSL OPENSSL_LINKAGE
     1888    call SayLog "OpenSSL support ..... "G.CFG_OPENSSL OPENSSL_LINKAGE
    18361889
    18371890    if (G.CFG_PTMALLOC \== "no") then
    1838         call SaySay "Use ptmalloc ........ "G.CFG_PTMALLOC
     1891        call SayLog "Use ptmalloc ........ "G.CFG_PTMALLOC
    18391892
    18401893    if (G.QMAKE_EXEPACK \== "") then
    1841         call SaySay "Exepack support ..... yes ("G.QMAKE_EXEPACK")"
     1894        call SayLog "Exepack support ..... yes ("G.QMAKE_EXEPACK")"
    18421895    else
    1843         call SaySay "Exepack support ..... no"
     1896        call SayLog "Exepack support ..... no"
    18441897
    18451898    /* complain about not being able to use dynamic plugins if we are using a static build */
    18461899    if (G.CFG_SHARED == "no") then
    1847         call SaySay,,
     1900        call SayLog,,
    18481901G.EOL||,
    18491902"WARNING: Using static linking will disable the use of dynamically"G.EOL||,
    … …  
    18521905G.EOL
    18531906    if (G.CFG_OPENSSL == "linked" &  OPENSSL_LIBS == "") then
    1854         call SaySay,,
     1907        call SayLog,,
    18551908G.EOL||,
    18561909"NOTE: When linking against OpenSSL, you can override the default"G.EOL||,
    … …  
    18601913G.EOL
    18611914
    1862     call SaySay
     1915    call SayLog
     1916
     1917    /* we don't want to print this, it's in .qmake.cache anyway */
     1918    /*
     1919    call SayVerbose "qmake vars .......... "G.EOL'  'replace(G.QMAKE_VARS,G.EOL,G.EOL'  ')
     1920    call SayVerbose "qmake switches ...... "G.QMAKE_SWITCHES
     1921    call SayVerbose
     1922    */
    18631923
    18641924    /*--------------------------------------------------------------------------
    … …  
    18661926    --------------------------------------------------------------------------*/
    18671927
    1868     call SaySay "Finding project files. Please wait..."
     1928    call SayLog "Finding project files. Please wait..."
    18691929
    18701930    /* @todo walk through the demos, examples, doc, translations trees
    18711931     * (depending on G.CFG_BUILD_PARTS) and call qmake on .pro files */
    18721932
    1873     call SaySay "Creating makefiles. Please wait..."
     1933    call SayLog "Creating makefiles. Please wait..."
    18741934
    18751935    if (pos("qmake", G.CFG_BUILD_PARTS) > 0) then
    … …  
    19011961    --------------------------------------------------------------------------*/
    19021962    if (G.CFG_ARCH == "generic") then
    1903         call SaySay,,
     1963        call SayLog,,
    19041964G.EOL||,
    19051965'            NOTICE: Atomic operations are not yet supported for this'G.EOL||,
    … …  
    19201980
    19211981    G.MAKE = filespec('N', G.MAKE)
    1922     call SaySay
    1923     call SaySay "Qt is now configured for building. Just run '"G.MAKE"'."
    1924     call SaySay
    1925     call SaySay "To reconfigure, run '"G.MAKE" confclean' and 'configure.cmd'."
    1926     call SaySay
     1982    call SayLog
     1983    call SayLog "Qt is now configured for building. Just run '"G.MAKE"'."
     1984    call SayLog
     1985    call SayLog "To reconfigure, run '"G.MAKE" confclean' and 'configure.cmd'."
     1986    call SayLog
    19271987
    19281988    return
    … …  
    21582218    return
    21592219
    2160 SayErr: procedure expose (Globals)
    2161     parse arg str, noeol
    2162     noeol = (noeol == 1)
    2163     if (noeol) then call charout, str
    2164     else say str
    2165     return
    2166 
    21672220SayPrompt: procedure expose (Globals)
    21682221    parse arg str, noeol
    … …  
    21722225    return
    21732226
     2227SayLog: procedure expose (Globals)
     2228    parse arg str, noeol
     2229    noeol = (noeol == 1)
     2230    call SaySay str, noeol
     2231    if (noeol) then call charout G.LogFile, str
     2232    else call lineout G.LogFile, str
     2233    return
     2234
     2235SayErr: procedure expose (Globals)
     2236    parse arg str, noeol
     2237    call SayLog str, noeol
     2238    return
     2239
    21742240SayVerbose: procedure expose (Globals)
    21752241    parse arg str, noeol
    2176     if (G.Verbose) then call SaySay str, noeol
     2242    if (G.Verbose) then call SayLog str, noeol
    21772243    return
    21782244
Note: See TracChangeset for help on using the changeset viewer.