Changeset 10

Timestamp:

Nov 16, 2005, 10:52:47 PM (20 years ago)

Author:

dmik

Message:

The file src/tools/qconfig.cmd (containing default installation paths) is now automatically generated by the configure.cmd script when configuring the Qt library

Location:

trunk

Files:

• configure.cmd (modified) (7 diffs)
• os2-doc/changes.html (modified) (1 diff)
• src/tools/qconfig.cpp (deleted)

trunk/configure.cmd

@@ -67 +67 @@
 G.!QModulesH        = 'include\qmodules.h'
 G.!QConfigH         = 'include\qconfig.h'
+G.!QConfigCPP       = 'src\tools\qconfig.cpp'
 G.!QMakeMakefile    = 'qmake\Makefile'
 G.!Makefile         = 'Makefile'
@@ -136 +137 @@
     G.!QModulesH = G.!QTDirP'\'G.!QModulesH
     G.!QConfigH = G.!QTDirP'\'G.!QConfigH
+    G.!QConfigCPP = G.!QTDirP'\'G.!QConfigCPP
     G.!QMakeMakefile = G.!QTDirP'\'G.!QMakeMakefile
     G.!Makefile = G.!QTDirP'\'G.!Makefile
@@ -158 +160 @@
         \FileExists(G.!QMakeCache) | \FileExists(G.!QtOS2Config) |,
         \FileExists(G.!QModulesH) | \FileExists(G.!QConfigH) |,
+        \FileExists(G.!QConfigCPP) |,
         \FileExists(G.!QMakeMakefile) | \FileExists(G.!Makefile)) then
         call ConfigureQt
@@ -536 +539 @@
     qmodules_h = G.!QModulesH
     qconfig_h = G.!QConfigH
+    qconfig_cpp = G.!QConfigCPP
 
     call DeleteFile qmake_cache
@@ -541 +545 @@
     call DeleteFile qmodules_h
     call DeleteFile qconfig_h
+    call DeleteFile qconfig_cpp
 
     call lineout qmake_cache, 'QMAKE_QT_VERSION_OVERRIDE=331'
@@ -598 +603 @@
     call lineout qconfig_h
 
+    call lineout qconfig_cpp, '#include <qglobal.h>'
+    call lineout qconfig_cpp, ''
+    call lineout qconfig_cpp, '/* Install paths from configure */'
+    call lineout qconfig_cpp, 'static const char QT_INSTALL_PREFIX [267] = "qt_nstpath='CPPPath(G.!QTDir)'";'
+    call lineout qconfig_cpp, 'static const char QT_INSTALL_BINS   [267] = "qt_binpath='CPPPath(G.!QTDirP)'\\bin";'
+    call lineout qconfig_cpp, 'static const char QT_INSTALL_DOCS   [267] = "qt_docpath='CPPPath(G.!QTDirP)'\\doc";'
+    call lineout qconfig_cpp, 'static const char QT_INSTALL_HEADERS[267] = "qt_hdrpath='CPPPath(G.!QTDirP)'\\include";'
+    call lineout qconfig_cpp, 'static const char QT_INSTALL_LIBS   [267] = "qt_libpath='CPPPath(G.!QTDirP)'\\lib";'
+    call lineout qconfig_cpp, 'static const char QT_INSTALL_PLUGINS[267] = "qt_plgpath='CPPPath(G.!QTDirP)'\\plugins";'
+    call lineout qconfig_cpp, 'static const char QT_INSTALL_DATA   [267] = "qt_datpath='CPPPath(G.!QTDir)'";'
+    call lineout qconfig_cpp, 'static const char QT_INSTALL_TRANSLATIONS [267] = "qt_trnpath='CPPPath(G.!QTDirP)'\\translations";'
+    call lineout qconfig_cpp, ''
+    call lineout qconfig_cpp, '/* strlen( "qt_xxxpath=" ) == 11 */'
+    call lineout qconfig_cpp, 'const char *qInstallPath()        { return QT_INSTALL_PREFIX  + 11; }'
+    call lineout qconfig_cpp, 'const char *qInstallPathDocs()    { return QT_INSTALL_DOCS    + 11; }'
+    call lineout qconfig_cpp, 'const char *qInstallPathHeaders() { return QT_INSTALL_HEADERS + 11; }'
+    call lineout qconfig_cpp, 'const char *qInstallPathLibs()    { return QT_INSTALL_LIBS    + 11; }'
+    call lineout qconfig_cpp, 'const char *qInstallPathBins()    { return QT_INSTALL_BINS    + 11; }'
+    call lineout qconfig_cpp, 'const char *qInstallPathPlugins() { return QT_INSTALL_PLUGINS + 11; }'
+    call lineout qconfig_cpp, 'const char *qInstallPathData()    { return QT_INSTALL_DATA    + 11; }'
+    call lineout qconfig_cpp, 'const char *qInstallPathTranslations() { return QT_INSTALL_TRANSLATIONS + 11; }'
+    call lineout qconfig_cpp, 'const char *qInstallPathSysconf() { return 0; }'
+    call lineout qconfig_cpp
+    
     call CopyFile QuotePath(G.!QTDirP)'\qmake\"Makefile.os2-g++"',
                   G.!QMakeMakefile
@@ -1132 +1161 @@
 
 /**
+ *  Doubles all back slash characters to make the path ready to be put
+ *  to a C/C++ source.
+ */
+CPPPath: procedure expose (Globals)
+    parse arg path
+    return Replace(path, '\', '\\')
+    
+/**
  *  Fixes the directory path by a) converting all slashes to back
  *  slashes and b) ensuring that the trailing slash is present if

trunk/os2-doc/changes.html

@@ -18 +18 @@
     release starting from the most recent. The text in the square brackets
     after the release date shows the repository tag corresponding to this
-    release.</p>
-
-    <p>More detailed changes can be found in the file <a
-    href="./ChangeLog">os2-doc\ChangeLog</a>.</p>
+    release (startng from version 3.3.1 Release Candidate 6). A tagged release
+    can be checked out from the SVN repository using a path like
+    <kbd>http://svn.netlabs.org/repos/qt3/tags/&lt;tag&gt;</kbd>.</p>
+
+    <p>For a more detailed list of changes please refer to the SVN repository.
+    Older changes (for version 3.3.1 Release Candidate 5 and earlier) can be
+    found in the file <a href="./ChangeLog.CVS">os2-doc\ChangeLog.CVS</a>.
+    </p>
+
+    <h2>Release Candidate 6 (2005-11-xx) [<kbd>3.1.1-rc06</kbd>]</h2>
+
+    <hr />
+
+    <p>The project has been moved to the SVN repository on netlabs (<a
+    href="http://svn.netlabs.org">svn.netlabs.org</a>). The direct path to the
+    main development branch is <a
+    href="http://svn.netlabs.org/repos/qt3/trunk">http://svn.netlabs.org/repos/qt3/trunk</a>.</p>
+
+    <p>The file <kbd>src/tools/qconfig.cpp</kbd> (containing default
+    installation paths) is now automatically generated by the
+    <kbd>configure.cmd</kbd> script when configuring the Qt library.</p>
 
     <h2>Release Candidate 5 (2005-11-12) [<kbd>rc05</kbd>]</h2>