Changeset 1039

Timestamp:

Aug 31, 2011, 2:33:19 PM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

OS/2: Generate and install qmake.sym.

Location:

trunk

Files:

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

trunk/configure.cmd

@@ -835 +835 @@
         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
 
     /* detect the CUPS support */
@@ -1069 +1065 @@
     end
 
-    Makefile_str =,
+    Makefile_r =,
         '# AutoGenerated by configure.cmd'G.EOL||,
         'BUILD_PATH = 'QuotePath(G.OutPath)||G.EOL||,
         'SOURCE_PATH = 'QuotePath(G.RelPath)||G.EOL||,
         'QMAKESPEC = 'G.PLATFORM||G.EOL||,
-        'QMAKE_OPENSOURCE_EDITION = yes'G.EOL||G.EOL||,
-        Makefile_str
+        'QMAKE_OPENSOURCE_EDITION = yes'G.EOL||G.EOL
+
+    if (G.QMAKE_MAPSYM \== "") then do
+        Makefile_header = Makefile_header||,
+            'QMAKE_MAPSYM = 'QuotePath(G.QMAKE_MAPSYM)||G.EOL
+    end
+    if (G.QMAKE_EXEPACK \== "") then do
+        Makefile_header = Makefile_header||,
+            'QMAKE_EXEPACK = 'QuotePath(G.QMAKE_EXEPACK)||G.EOL||,
+            'QMAKE_EXEPACK_FLAGS = 'QuotePath(G.QMAKE_EXEPACK_FLAGS)||G.EOL||,
+            'QMAKE_EXEPACK_POST_FLAGS = 'QuotePath(G.QMAKE_EXEPACK_POST_FLAGS)||G.EOL||G.EOL
+    end
+
+    Makefile_str = Makefile_header||Makefile_str
 
     /* avoid unecessary rebuilds by copying only if Makefile has changed */
@@ -1085 +1093 @@
         call charout Makefile
     end
+
+
 
     /* mkspecs/default is used as a (gasp!) default mkspec so QMAKESPEC needn't

trunk/projects.pro

@@ -153 +153 @@
 win32|os2 {
    qmake.files=$$QT_BUILD_TREE/bin/qmake.exe
+
 } else {
    qmake.files=$$QT_BUILD_TREE/bin/qmake

trunk/qmake/Makefile.os2-g++

@@ -32 +32 @@
 CXXFLAGS    =   $(CFLAGS)
 ifeq "$(EMXOMFLD_TYPE)" "WLINK"
-LFLAGS      =   -s -Zomf -Zstack 0x2000 -Zlinker DISABLE\ 1121
+LFLAGS      =   -s -Zomf -Zstack 0x2000 -Zlinker DISABLE\ 1121
 else
-LFLAGS      =   -s -Zomf -Zstack 0x2000 -Zlinker /PM:VIO -Zlinker /EXEPACK:2
+LFLAGS      =   -s -Zomf -Zstack 0x2000 -Zlinker /PM:VIO -Zlinker /EXEPACK:2
 endif
 LIBS        =   -lregistry.dll
@@ -137 +137 @@
         $(QMAKE_EXEPACK) $(QMAKE_EXEPACK_FLAGS) $@ $(QMAKE_EXEPACK_POST_FLAGS)
 endif
-        copy $@ $(BUILD_PATH)\bin\
+ifneq "$(QMAKE_MAPSYM)" ""
+ifeq "$(EMXOMFLD_TYPE)" "WLINK"
+        $(SOURCE_PATH)/mkspecs\os2-g++\wmapsym.cmd $(basename $@).map
+else
+        $(QMAKE_MAPSYM) $(basename $@).map
+endif
+        del $(basename $@).map >nul 2>&1
+        copy $(basename $@).sym "$(BUILD_PATH)\bin\"
+endif
+        copy $@ "$(BUILD_PATH)\bin\"
 
 $(OBJECTS_DIR):
@@ -153 +162 @@
 
 distclean:: clean
-        -del qmake.exe >nul 2>&1
+        -del qmake.exe >nul 2>&1
 
 .SUFFIXES: .cpp .c