Switched to using ABIv2 format to generate Symbian binaries.

This means using elf2e32 instead of elftran, and eliminates the need
for generating exports manually.

3 files changed, 36 insertions, 40 deletions

diff --git a/mkspecs/symbian/linux-armcc/features/qt.prf b/mkspecs/symbian/linux-armcc/features/qt.prf
index acd56bf..efe7fbd 100644
--- a/mkspecs/symbian/linux-armcc/features/qt.prf
+++ b/mkspecs/symbian/linux-armcc/features/qt.prf
@@ -5,63 +5,59 @@ isEmpty(DESTDIR) {
 }
 
 for(libraries, LIBS) {
-    isLib = $$find(libraries, \.lib)
-    isEmpty(isLib) {
-        LIBS += $${libraries}.lib\\(VtblExports.o\\)
+    isFullName = $$find(libraries, \.)
+    isEmpty(isFullName) {
+        LIBS = $$replace(LIBS, "$$libraries", "$${libraries}.dso")
     }
 }
 for(libraries, QMAKE_LIBS) {
-    isLib = $$find(libraries, \.lib)
-    isEmpty(isLib) {
-        QMAKE_LIBS += $${libraries}.lib\\(VtblExports.o\\)
+    isFullName = $$find(libraries, \.)
+    isEmpty(isFullName) {
+        QMAKE_LIBS = $$replace(QMAKE_LIBS, "$$libraries", "$${libraries}.dso")
     }
 }
 
 # This needs to be done after the above LIBS mangling.
 include(../platformlibs.conf)
 
-contains(TEMPLATE, lib):!contains(CONFIG, static):!contains(CONFIG, staticlib) {
-    exports.commands = winewrapper getexports.exe ${QMAKE_FILE_NAME} > ${OBJECTS_DIR}${QMAKE_FILE_BASE}.exports
-    exports.output = $$OBJECTS_DIR/${QMAKE_FILE_BASE}.exports
-    exports.input = OBJECTS
-    exports.variable_out = ORDINALMAP
-    exports.CONFIG = no_link
-
-    deffile.input = ORDINALMAP
-    deffile.output = $$OBJECTS_DIR/$${TARGET}.def
-    deffile.commands = makedeffile $$OBJECTS_DIR/$${TARGET}.def ${QMAKE_FILE_NAME}
-    deffile.variable_out = DEFFILE
-    deffile.CONFIG = no_link combine
-
-    expfile.input = DEFFILE
-    expfile.output = $$OBJECTS_DIR/$${TARGET}.exp
-    expfile.commands = makeexpfile ${QMAKE_FILE_NAME} $$OBJECTS_DIR/$${TARGET}.exp
-    expfile.variable_out = QMAKE_LIBS
-    expfile.CONFIG = target_predeps
-
-    ordinalmap.input = DEFFILE
-    ordinalmap.output = $$DESTDIR/$${TARGET}.lib
-    ordinalmap.commands = makeordinalmap $$OBJECTS_DIR ${QMAKE_FILE_NAME} $${TARGET}.dll $$DESTDIR/$${TARGET}.lib
-    ordinalmap.variable_out = PRE_TARGETDEPS
+elf2e32_LIBPATH =
+for(libPath, QMAKE_LIBDIR) {
+    elf2e32_LIBPATH += "--libpath=$$libPath"
+}
+
+splitVersion = $$split(VERSION, ".")
+intVersion = "00"
+for(verNumber, splitVersion) {
+    # Poor man's printf
+    !contains(verNumber, "[0-9][0-9]"):intVersion = "$${intVersion}0"
+    intVersion = "$${intVersion}$${verNumber}"
+}
+
+intUid3 = $$lower($$replace(TARGET.UID3, "^0x", ""))
 
+contains(TEMPLATE, lib):!contains(CONFIG, static):!contains(CONFIG, staticlib) {
     !isEmpty($$QMAKE_POST_LINK):QMAKE_POST_LINK += &&
     QMAKE_POST_LINK += $$QMAKE_MOVE $$DESTDIR/$${TARGET}.dll $$DESTDIR/$${TARGET}.sym
-    QMAKE_POST_LINK += && winewrapper elftran.exe  -version 4.1536 -sid 0xe001b2dc  -allow -nocall -heap 0x00020000 0x00800000 -stack 0x00014000 -unpaged         -uid1 0x10000079 -uid2 0x1000008d -uid3 0xe001b2dc         -fpu softvfp -capability None $${DESTDIR}/$${TARGET}.sym $${DESTDIR}/$${TARGET}.dll
+    QMAKE_POST_LINK += && elf2e32  --version 4.1536 --sid 0xe001b2dc  --uid1 0x10000079 --uid2 0x1000008d --uid3 0xe001b2dc --dlldata --heap=0x00020000,0x00800000 --stack=0x00014000 --capability=None --fpu=softvfp --targettype=DLL --elfinput=$${DESTDIR}/$${TARGET}.sym --output=$${DESTDIR}/$${TARGET}.dll --dso=$$DESTDIR/$${TARGET}.dso --defoutput=$$OBJECTS_DIR/$${TARGET}.def --unfrozen --linkas=$${TARGET}\\{$${intVersion}\\}\\[$${intUid3}\\].dll --compressionmethod bytepair $$elf2e32_LIBPATH --unpaged
     QMAKE_DISTCLEAN += $${DESTDIR}/$${TARGET}.sym
+    QMAKE_DISTCLEAN += $${DESTDIR}/$${TARGET}.dso
+    QMAKE_CLEAN += $${OBJECTS_DIR}/$${TARGET}.def
 
-    QMAKE_EXTRA_COMPILERS += exports
-    QMAKE_EXTRA_COMPILERS += deffile
-    QMAKE_EXTRA_COMPILERS += expfile
-    QMAKE_EXTRA_COMPILERS += ordinalmap
+    QMAKE_LIBS += -ledllstub.lib -ledll.lib\\(uc_dll_.o\\)
 
-    QMAKE_LIBS += -ledllstub -ledll.lib\\(uc_dll_.o\\)
+    QMAKE_LFLAGS += --symver_soname --soname $${TARGET}\\{$${intVersion}\\}\\[$${intUid3}\\].dll
 }
 
 contains(TEMPLATE, app) {
-    QMAKE_POST_LINK += winewrapper elftran.exe  -version 10.0 -sid 0xe4d10fc9  -nocall -heap 0x00020000 0x00800000 -stack 0x00014000 -unpaged         -uid1 0x1000007a -uid2 0x1000008d -uid3 0xe4d10fc9         -fpu softvfp -capability None $${DESTDIR}/$${TARGET} $${DESTDIR}/$${TARGET}.tran
-    QMAKE_DISTCLEAN += $${DESTDIR}/$${TARGET}.tran
+    !isEmpty($$QMAKE_POST_LINK):QMAKE_POST_LINK += &&
+
+    QMAKE_POST_LINK += $$QMAKE_MOVE $$DESTDIR/$${TARGET} $$DESTDIR/$${TARGET}.sym
+    QMAKE_POST_LINK += && elf2e32  --version 4.1536 --sid 0xe001b2dc  --uid1 0x10000079 --uid2 0x1000008d --uid3 $$TARGET.UID3 --dlldata --heap=0x00020000,0x00800000 --stack=0x00014000 --capability=None --fpu=softvfp --targettype=EXE --elfinput=$${DESTDIR}/$${TARGET}.sym --output=$${DESTDIR}/$${TARGET}.exe --unfrozen --linkas=$${TARGET}\\{$${intVersion}\\}\\[$${intUid3}\\].exe --compressionmethod bytepair $$elf2e32_LIBPATH --unpaged
+    QMAKE_DISTCLEAN += $${DESTDIR}/$${TARGET}.exe
 
     QMAKE_LIBS += -leexe.lib\\(uc_exe_.o\\)
+
+    QMAKE_LFLAGS += --symver_soname --soname $${TARGET}\\{$${intVersion}\\}\\[$${intUid3}\\].dll
 }
 
 # Symbian resource files
diff --git a/mkspecs/symbian/linux-armcc/platformlibs.conf b/mkspecs/symbian/linux-armcc/platformlibs.conf
index 9ef31dc..ac57790 100644
--- a/mkspecs/symbian/linux-armcc/platformlibs.conf
+++ b/mkspecs/symbian/linux-armcc/platformlibs.conf
@@ -1 +1 @@
-QMAKE_LIBS           += -lusrt2_2 -ldfpaeabi -ldfprvct2_2.lib -ldrtaeabi -ldrtaeabi.lib\\(VtblExports.o\\) -lscppnwdl -ldrtrvct2_2
+QMAKE_LIBS           += -lusrt2_2.lib -ldfpaeabi.dso -ldfprvct2_2.dso -ldrtaeabi.dso -lscppnwdl.dso -ldrtrvct2_2.dso -lh_t__uf.l\\(switch8.o\\)
diff --git a/mkspecs/symbian/linux-armcc/qmake.conf b/mkspecs/symbian/linux-armcc/qmake.conf
index c28acb8..780ff29 100644
--- a/mkspecs/symbian/linux-armcc/qmake.conf
+++ b/mkspecs/symbian/linux-armcc/qmake.conf
@@ -26,9 +26,9 @@ QMAKE_DEL_DIR         = rmdir
 QMAKE_CHK_DIR_EXISTS  = test -d
 QMAKE_MKDIR           = mkdir -p
 
-QMAKE_CFLAGS		+= --preinclude rvct2_2.h  --diag_suppress 186,654,1300 --thumb --fpu softvfp --cpu 5T --enum_is_int -Ono_known_library --fpmode ieee_no_fenv --export_all_vtbl --no_vfe --apcs /inter --dllimport_runtime --gnu
+QMAKE_CFLAGS		+= --dllimport_runtime --preinclude rvct2_2.h  --diag_suppress 186,654,1300 --thumb --fpu softvfp --cpu 5T --enum_is_int -Ono_known_library --fpmode ieee_no_fenv --export_all_vtbl --no_vfe --apcs /inter --visibility_inlines_hidden
 QMAKE_CXXFLAGS		+= $$QMAKE_CFLAGS --no_parse_templates
-QMAKE_LFLAGS      	+= --diag_suppress 6331,6780 --shl --reloc --split --rw-base 0x400000 --noscanlib
+QMAKE_LFLAGS      	+= --diag_suppress 6331,6780 --bpabi --reloc --datacompressor=off --split --rw-base 0x400000 --dll --no_scanlib
 QMAKE_LFLAGS_APP        += --entry _E32Startup
 QMAKE_LFLAGS_SHLIB      += --entry _E32Dll