Changeset 406

Timestamp:

Dec 10, 2009, 12:56:17 AM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

qmake: Build qmake second time after building all DLLs using its .pro and link it to Qt DLLs on OS/2 (this became possible after the fix in #405). This greatly reduces its size and finally fixes the national characters in the date printed in the generarted Makefile headers.

Location:

trunk

Files:

• configure.cmd (modified) (4 diffs)
• projects.pro (modified) (1 diff)
• qmake/Makefile.os2-g++ (modified) (4 diffs)
• qmake/qmake.pri (modified) (2 diffs)
• qmake/qmake.pro (modified) (2 diffs)

trunk/configure.cmd

@@ -51 +51 @@
     "QT_NO_PRINTER QT_NO_PRINTDIALOG QT_NO_DRAGANDDROP"
 
-G.QT_DEFAULT_BUILD_PARTS = "libs tools" /* examples demos docs translations */
+G.QT_DEFAULT_BUILD_PARTS = "libs tools qmake" /* examples demos docs translations */
 
 /* all globals to be exposed in procedures */
@@ -559 +559 @@
         G.QMAKE_EXEPACK_POST_FLAGS = ""
     end
+    /* export EXEPACK variables for building qmake (used by Makefile.os2-g++) */
+    call SetEnv "QMAKE_EXEPACK", G.QMAKE_EXEPACK
+    call SetEnv "QMAKE_EXEPACK_FLAGS", G.QMAKE_EXEPACK_FLAGS
+    call SetEnv "QMAKE_EXEPACK_POST_FLAGS", G.QMAKE_EXEPACK_POST_FLAGS
 
     /*--------------------------------------------------------------------------
@@ -1723 +1727 @@
 
     /*--------------------------------------------------------------------------
-     re-build qmake using the .pro file
-    --------------------------------------------------------------------------*/
-
-    call SaySay "Rebuilding qmake. Please wait..."
-
-    /* this is necessary to to get all the fancy things such as embedded
-     * version information */
-
-    curdir = directory()
-    call directory G.RelPath"\qmake"
-
-    /* first, generate a Makefile from .pro */
-    address "cmd" G.OutPath"\bin\qmake.exe"
-    make_rc = rc
-
-    if (make_rc == 0)  then do
-        /* now, run make */
-        address "cmd" G.MAKE "release"
-        make_rc = rc
-    end
-    call SaySay
-
-    call directory curdir
-
-    /* exit on failure */
-    if (make_rc \= 0)  then
-        call Done 2
-
-    /*--------------------------------------------------------------------------
      build makefiles based on the configuration
     --------------------------------------------------------------------------*/
@@ -1763 +1738 @@
 
     /* generate the root makefile */
-    address "cmd" G.OutPath"\bin\qmake.exe" G.RelPath"\projects.pro -o" G.OutPath"\Makefile"
+    str = G.OutPath"\bin\qmake.exe" G.RelPath"\projects.pro -o" G.OutPath"\Makefile"
+    say str
+    address "cmd" str
     make_rc = rc
     /* exit on failure */
     if (make_rc \= 0)  then
         call Done 2
+
+    if (pos("qmake", G.CFG_BUILD_PARTS) > 0) then do
+        /* generate the qmake makefile as well to overwrite the bootstrapped Makefile */
+        str = G.OutPath"\bin\qmake.exe" G.RelPath"\qmake\qmake.pro -o" G.OutPath"\qmake\Makefile"
+        say str
+        address "cmd" str
+        make_rc = rc
+        /* exit on failure */
+        if (make_rc \= 0)  then
+            call Done 2
+    end
 
     /* generate the immediate child makefiles, otherwise 'make release|debug'

trunk/projects.pro

@@ -40 +40 @@
        contains(QT_BUILD_PARTS, tools):include(translations/translations.pri)
     } else:isEqual(PROJECT, qmake) {
-#      SUBDIRS += qmake
+       os2:SUBDIRS += qmake
     } else {
        message(Unknown PROJECT: $$PROJECT)

trunk/qmake/Makefile.os2-g++

@@ -38 +38 @@
 endif
 
-OBJECTS_DIR = release-shared
+OBJECTS_DIR = release-bootstrap
 
 # qmake code
@@ -152 +152 @@
 OBJECTS     = $(foreach src,$(SOURCES),$(call SRC_TO_OBJ,$(src)))
 
-$(BUILD_PATH)\bin\qmake.exe: $(OBJECTS)
+qmake.exe: $(OBJECTS_DIR) $(OBJECTS)
         $(LINK) -o $@ $(OBJECTS) $(LIBS)
+ifneq "$(QMAKE_EXEPACK)" ""
+        $(QMAKE_EXEPACK) $(QMAKE_EXEPACK_FLAGS) $@ $(QMAKE_EXEPACK_POST_FLAGS)
+endif
+        copy $@ $(BUILD_PATH)\bin\
+
+$(OBJECTS_DIR):
+        @mkdir $(OBJECTS_DIR)
 
 Makefile: Makefile.os2-g++
@@ -166 +173 @@
 
 distclean:: clean
-        -del $(BUILD_PATH)\bin\qmake.exe >nul 2>&1
+        -del qmake.exe >nul 2>&1
 
 .SUFFIXES: .cpp .c
@@ -178 +185 @@
 define SRC_TO_OBJ_RULE
 $(call SRC_TO_OBJ,$(1)): $(1)
-        @if not exist $(OBJECTS_DIR) mkdir $(OBJECTS_DIR)
         $(CXX) -c $(CXXFLAGS) -o $$@ $$<
 endef

trunk/qmake/qmake.pri

@@ -1 +1 @@
 CONFIG += depend_includepath
-
-QMAKE_INCREMENTAL =
-SKIP_DEPENDS += qconfig.h qmodules.h
-DEFINES += QT_NO_TEXTCODEC QT_NO_LIBRARY QT_NO_STL QT_NO_COMPRESS QT_NO_UNICODETABLES \
-           QT_NO_GEOM_VARIANT QT_NO_DATASTREAM
 
 #qmake code
@@ -29 +24 @@
 
 bootstrap { #Qt code
+   QMAKE_INCREMENTAL =
+   SKIP_DEPENDS += qconfig.h qmodules.h
+   DEFINES += QT_NO_TEXTCODEC QT_NO_LIBRARY QT_NO_STL QT_NO_COMPRESS QT_NO_UNICODETABLES \
+              QT_NO_GEOM_VARIANT QT_NO_DATASTREAM
    DEFINES+=QT_NODLL QT_NO_THREAD
    SOURCES+= \

trunk/qmake/qmake.pro

@@ -4 +4 @@
 #platform than either of the generic makefiles
 
-CONFIG += console bootstrap
-CONFIG -= qt shared app_bundle uic
-DEFINES += QT_BUILD_QMAKE QT_BOOTSTRAPPED
+os2 {
+  # using this .pro, we build non-bootstrapped qmake which links to Qt DLLs
+  CONFIG += console
+  CONFIG -= uic
+} else {
+  CONFIG += console bootstrap
+  CONFIG -= qt shared app_bundle uic
+  DEFINES += QT_BUILD_QMAKE QT_BOOTSTRAPPED
+}
 DESTDIR = ../bin/
 
@@ -17 +23 @@
          $$QT_SOURCE_TREE/src/corelib/kernel \
          $$QT_SOURCE_TREE/src/corelib/plugin \
-         $$QT_SOURCE_TREE/src/corelib/io \
-         $$QT_SOURCE_TREE/src/script
+         $$QT_SOURCE_TREE/src/corelib/io \
+         $$QT_SOURCE_TREE/src/script
 INCPATH += generators generators/unix generators/win32 generators/os2 generators/mac \
            $$QT_SOURCE_TREE/include $$QT_SOURCE_TREE/include/QtCore \