Changeset 656

Timestamp:

Mar 8, 2010, 4:00:31 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

qmake:qmake: os2/gnumake: Add support for the declspec(dllexport)-based DLL generation and activate this support by default which greatly reduces the number of exported symbols in Qt DLLs. The old method which causes all public symbols to be exported is still available using the "export_all" CONFIG flag (off by default). Note that DLL splitting will turn "export_all" on because otherwise it is impossible to create split DLLs at the moment (emxexp limitation).

Location:

trunk

Files:

• mkspecs/features/os2/default_post.prf (modified) (3 diffs)
• mkspecs/features/os2/default_pre.prf (modified) (3 diffs)
• mkspecs/os2-g++/qmake.conf (modified) (1 diff)
• qmake/generators/os2/gnumake.cpp (modified) (3 diffs)

trunk/mkspecs/features/os2/default_post.prf

@@ -10 +10 @@
 load(default_post)
 
-# convert QMAKE_TARGET_ variables to DEF_FILE_ ones
 build_pass|isEmpty(BUILDS) {
+
+    dll {
+        # create the import library target
+        make_implib.target = $(TARGET_IMPLIB)
+        make_implib.commands = $$QMAKE_RUN_IMPLIB
+        export_all {
+            make_implib.depends = $(DEF_FILE)
+            POST_TARGETDEPS += $$make_implib.target
+        } else {
+            make_implib.depends = $(DESTDIR_TARGET)
+            ALL_DEPS += $$make_implib.target
+        }
+        QMAKE_EXTRA_TARGETS += make_implib
+        QMAKE_CLEAN += $$make_implib.target
+
+                export_all:QMAKE_RUN_GENDEF = $$QMAKE_RUN_GENDEF_EXPORT_ALL
+    }
+
+    # convert QMAKE_TARGET_ variables to DEF_FILE_ ones
     isEmpty(DEF_FILE_VERSION) {
         DEF_FILE_VERSION = $$VERSION
@@ -27 +45 @@
         }
         isEmpty(DEF_FILE_VENDOR):!isEmpty(QMAKE_TARGET_COMPANY):DEF_FILE_VENDOR = $$QMAKE_TARGET_COMPANY
-}
 
-build_pass|isEmpty(BUILDS) {
+    # handle .DEF file creation for executables
     contains(TEMPLATE, ".*app"):isEmpty(DEF_FILE) {
         DEF_FILE_DESCR =
@@ -68 +85 @@
                 @echo DESCRIPTION \'$${DEF_FILE_DESCR}\' >> $(DEF_FILE)
             QMAKE_EXTRA_TARGETS += make_exe_def
-            QMAKE_CLEAN += $(DEF_FILE)
+            QMAKE_CLEAN += $$make_exe_def.target
         }
     }

trunk/mkspecs/features/os2/default_pre.prf

@@ -25 +25 @@
 
     !dll:error("splitDllBegin may only be used for DLLs!")
+
+    # splitDLL functionality currently requires export_all
+    CONFIG *= export_all
+    export(CONFIG)
 
     1 = $$unique(1)
@@ -145 +149 @@
 
     CONFIG($$SPLIT_CONFIG) {
+
+                # splitDLL functionality currently requires export_all
+        !export_all:error("splitDllPart requires export_all in CONFIG!")
+
         CONFIG($$scope): {
             eval($${scope}_HEADERS = $$HEADERS)
@@ -184 +192 @@
 
         CONFIG($$SPLIT_CONFIG):CONFIG($$scope) {
+
+                        # splitDLL functionality currently requires export_all
+            !export_all:error("splitDllEnd requires export_all in CONFIG!")
+
             eval(HEADERS = $$eval($${scope}_HEADERS))
             export(HEADERS)

trunk/mkspecs/os2-g++/qmake.conf

@@ -107 +107 @@
 
 QMAKE_RUN_LINK          = $(LINK) $(LFLAGS) -o $(DESTDIR_TARGET) $(DEF_FILE) -Wl,$$QMAKE_OBJECTS_REF $(LIBS)
-QMAKE_RUN_IMPLIB        = emximp -p 128 -o $(TARGET_IMPLIB) $(DEF_FILE)
 
-QMAKE_RUN_GENDEF        = \
-    $(if $(QT_DEV_NO_DEF_GENERATION),\
-        @echo Warning: .DEF file generation is disabled! \
-            (QT_DEV_NO_DEF_GENERATION=$(QT_DEV_NO_DEF_GENERATION)),\
-        $(QMAKESPECDIR)\emxexpw.cmd -name $(basename $(TARGET)) \
-            $(if $(DEF_FILE_VERSION),-version \"$(DEF_FILE_VERSION)\") \
-            $(if $(DEF_FILE_DESCRIPTION),-desc \"$(DEF_FILE_DESCRIPTION)\") \
-            $(if $(DEF_FILE_VENDOR),-vendor \"$(DEF_FILE_VENDOR)\") \
-            -def $(DEF_FILE) $(if $(DEF_FILE_MAP),-map $(DEF_FILE_MAP)) \
-            $(if $(DEF_FILE_TEMPLATE),-template $(DEF_FILE_TEMPLATE)) \
-            $$QMAKE_OBJECTS_REF)
+QMAKE_RUN_IMPLIB        = emximp -p 128 -o $@ $<
+
+QMAKE_RUN_GENDEF            = \
+    $(QMAKESPECDIR)\emxexpw.cmd -name $(basename $(TARGET)) \
+        -def $(DEF_FILE) \
+        $(if $(DEF_FILE_VERSION),-version \"$(DEF_FILE_VERSION)\") \
+        $(if $(DEF_FILE_DESCRIPTION),-desc \"$(DEF_FILE_DESCRIPTION)\") \
+        $(if $(DEF_FILE_VENDOR),-vendor \"$(DEF_FILE_VENDOR)\") \
+        $(if $(DEF_FILE_TEMPLATE),-template $(DEF_FILE_TEMPLATE))
+
+QMAKE_RUN_GENDEF_EXPORT_ALL = $$QMAKE_RUN_GENDEF \
+        $(if $(DEF_FILE_MAP),-map $(DEF_FILE_MAP)) \
+        $$QMAKE_OBJECTS_REF
 
 QMAKE_GENDEF_DEPS       = $(OBJECTS) $(MAKEFILE)

trunk/qmake/generators/os2/gnumake.cpp

@@ -581 +581 @@
     }
 
-    if (mode == DLL && !project->isEmpty("QMAKE_RUN_IMPLIB")) {
+    if (mode == DLL) {
+        /* we neeed $(TARGET_IMPLIB) to be in sync with getLibTarget() */
         t << "TARGET_IMPLIB = $(basename $(DESTDIR_TARGET)).lib" << endl;
-        project->values("QMAKE_CLEAN").append("$(TARGET_IMPLIB)");
-        project->values("POST_TARGETDEPS") += escapeFileVars("$(TARGET_IMPLIB)");
     }
 }
@@ -602 +601 @@
             t << valGlue(var("QMAKE_RUN_GENDEF").split(";;"), "\n\t", "\n\t", "") << endl;
         }
-        if (!project->isEmpty("QMAKE_RUN_IMPLIB")) {
-            /* generate the import library */
-            t << escapeFileVars("$(TARGET_IMPLIB): ") << escapeFileVars("$(DEF_FILE)");
-            t << "\n\t" << var("QMAKE_RUN_IMPLIB") << endl;
-        }
     }
 }
@@ -648 +642 @@
 QString GNUMakefileGenerator::getLibTarget()
 {
-    if (mode == DLL && !project->isEmpty("QMAKE_RUN_IMPLIB"))
+    if (mode == DLL)
         return QString("$(notdir $(TARGET_IMPLIB))");
     return Win32MakefileGenerator::getLibTarget();