Changeset 406 for trunk/qmake

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/qmake

Files:

• Makefile.os2-g++ (modified) (4 diffs)
• qmake.pri (modified) (2 diffs)
• qmake.pro (modified) (2 diffs)

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 \