Reorganized the Symbian build system profiles.

Now we try share as much as possible between the different Symbian
build systems, so that changes made to the MMP systems will also work
in the makefile based one.

3 files changed, 113 insertions, 106 deletions

diff --git a/mkspecs/features/symbian/debug.prf b/mkspecs/features/symbian/debug.prf
new file mode 100644
index 0000000..19f5348
--- /dev/null
+++ b/mkspecs/features/symbian/debug.prf
@@ -0,0 +1 @@
+QMAKE_LIBDIR_QT        += $${EPOCROOT}epoc32/release/armv5/udeb
diff --git a/mkspecs/features/symbian/platform_paths.prf b/mkspecs/features/symbian/platform_paths.prf
index bec9811..e06ffd4 100644
--- a/mkspecs/features/symbian/platform_paths.prf
+++ b/mkspecs/features/symbian/platform_paths.prf
@@ -50,6 +50,12 @@
 #
 # ==============================================================================
 
+symbian-abld|symbian-sbsv2 {
+    epocroot_prefix = /
+} else {
+    epocroot_prefix = $${EPOCROOT}
+}
+
 exists($${EPOCROOT}epoc32/include/platform_paths.prf) {
     
     # Load platform specific paths
@@ -66,10 +72,10 @@ exists($${EPOCROOT}epoc32/include/platform_paths.prf) {
         # ---------------------------------------
 
         defineReplace(APP_LAYER_SDK_EXPORT_PATH) {
-             return (/epoc32/include/app/$$1)
+             return ($${epocroot_prefix}epoc32/include/app/$$1)
         }
         defineReplace(APP_LAYER_PUBLIC_EXPORT_PATH) {
-             return (/epoc32/include/app/$$1)
+             return ($${epocroot_prefix}epoc32/include/app/$$1)
         }
 
         # ---------------------------------------
@@ -77,10 +83,10 @@ exists($${EPOCROOT}epoc32/include/platform_paths.prf) {
         # ---------------------------------------
 
         defineReplace(APP_LAYER_DOMAIN_EXPORT_PATH) {
-             return (/epoc32/include/platform/app/$$1)
+             return ($${epocroot_prefix}epoc32/include/platform/app/$$1)
         }
         defineReplace(APP_LAYER_PLATFORM_EXPORT_PATH) {
-             return (/epoc32/include/platform/app/$$1)
+             return ($${epocroot_prefix}epoc32/include/platform/app/$$1)
         }
 
         # ---------------------------------------
@@ -88,10 +94,10 @@ exists($${EPOCROOT}epoc32/include/platform_paths.prf) {
         # ---------------------------------------
 
         defineReplace(MW_LAYER_SDK_EXPORT_PATH) {
-             return (/epoc32/include/mw/$$1)
+             return ($${epocroot_prefix}epoc32/include/mw/$$1)
         }
         defineReplace(MW_LAYER_PUBLIC_EXPORT_PATH) {
-             return (/epoc32/include/mw/$$1)
+             return ($${epocroot_prefix}epoc32/include/mw/$$1)
         }
 
         # ---------------------------------------
@@ -99,10 +105,10 @@ exists($${EPOCROOT}epoc32/include/platform_paths.prf) {
         # ---------------------------------------
 
         defineReplace(MW_LAYER_DOMAIN_EXPORT_PATH) {
-             return (/epoc32/include/platform/mw/$$1)
+             return ($${epocroot_prefix}epoc32/include/platform/mw/$$1)
         }
         defineReplace(MW_LAYER_PLATFORM_EXPORT_PATH) {
-             return (/epoc32/include/platform/mw/$$1)
+             return ($${epocroot_prefix}epoc32/include/platform/mw/$$1)
         }
 
         # ---------------------------------------
@@ -110,11 +116,11 @@ exists($${EPOCROOT}epoc32/include/platform_paths.prf) {
         # ---------------------------------------
 
         defineReplace(OSEXT_LAYER_SDK_EXPORT_PATH) {
-             return (/epoc32/include/$$1)
+             return ($${epocroot_prefix}epoc32/include/$$1)
         }
         # WARNING: If the following path changes see the exists() function around line 219
         defineReplace(OS_LAYER_PUBLIC_EXPORT_PATH) {
-             return (/epoc32/include/$$1)
+             return ($${epocroot_prefix}epoc32/include/$$1)
         }
 
         # ---------------------------------------
@@ -122,10 +128,10 @@ exists($${EPOCROOT}epoc32/include/platform_paths.prf) {
         # ---------------------------------------
 
         defineReplace(OSEXT_LAYER_DOMAIN_EXPORT_PATH) {
-             return (/epoc32/include/platform/$$1)
+             return ($${epocroot_prefix}epoc32/include/platform/$$1)
         }
         defineReplace(OS_LAYER_PLATFORM_EXPORT_PATH) {
-             return (/epoc32/include/platform/$$1)
+             return ($${epocroot_prefix}epoc32/include/platform/$$1)
         }
 
         # ---------------------------------------
@@ -152,18 +158,18 @@ exists($${EPOCROOT}epoc32/include/platform_paths.prf) {
         # the headers come from middleware or os-layer  => thus they are first.
 
         APP_LAYER_SYSTEMINCLUDE = \
-         /epoc32/include \
-         /epoc32/include/mw \
-         /epoc32/include/platform/mw \
-         /epoc32/include/platform \
-         /epoc32/include/app \
-         /epoc32/include/platform/app \
-         /epoc32/include/platform/loc \
-         /epoc32/include/platform/mw/loc \
-         /epoc32/include/platform/app/loc \
-         /epoc32/include/platform/loc/sc \
-         /epoc32/include/platform/mw/loc/sc \
-         /epoc32/include/platform/app/loc/sc
+         $${epocroot_prefix}epoc32/include \
+         $${epocroot_prefix}epoc32/include/mw \
+         $${epocroot_prefix}epoc32/include/platform/mw \
+         $${epocroot_prefix}epoc32/include/platform \
+         $${epocroot_prefix}epoc32/include/app \
+         $${epocroot_prefix}epoc32/include/platform/app \
+         $${epocroot_prefix}epoc32/include/platform/loc \
+         $${epocroot_prefix}epoc32/include/platform/mw/loc \
+         $${epocroot_prefix}epoc32/include/platform/app/loc \
+         $${epocroot_prefix}epoc32/include/platform/loc/sc \
+         $${epocroot_prefix}epoc32/include/platform/mw/loc/sc \
+         $${epocroot_prefix}epoc32/include/platform/app/loc/sc
 
         # This define statements defines the include paths, which are intended to be
         # used in the pro-files that are part of the middleware-layer. It includes all 
@@ -171,14 +177,14 @@ exists($${EPOCROOT}epoc32/include/platform_paths.prf) {
         # middleware-layer components. 
 
         MW_LAYER_SYSTEMINCLUDE = \
-         /epoc32/include \
-         /epoc32/include/mw \
-         /epoc32/include/platform/mw \
-         /epoc32/include/platform \
-         /epoc32/include/platform/loc \
-         /epoc32/include/platform/mw/loc \
-         /epoc32/include/platform/loc/sc \
-         /epoc32/include/platform/mw/loc/sc
+         $${epocroot_prefix}epoc32/include \
+         $${epocroot_prefix}epoc32/include/mw \
+         $${epocroot_prefix}epoc32/include/platform/mw \
+         $${epocroot_prefix}epoc32/include/platform \
+         $${epocroot_prefix}epoc32/include/platform/loc \
+         $${epocroot_prefix}epoc32/include/platform/mw/loc \
+         $${epocroot_prefix}epoc32/include/platform/loc/sc \
+         $${epocroot_prefix}epoc32/include/platform/mw/loc/sc
 
         # This define statements defines the include paths, which are intended to be
         # used in the pro-files that are part of the  osextensions-layer. It includes all
@@ -186,10 +192,10 @@ exists($${EPOCROOT}epoc32/include/platform_paths.prf) {
         # os-layer components. 
 
         OS_LAYER_SYSTEMINCLUDE = \
-         /epoc32/include \
-         /epoc32/include/platform \
-         /epoc32/include/platform/loc \
-         /epoc32/include/platform/loc/sc
+         $${epocroot_prefix}epoc32/include \
+         $${epocroot_prefix}epoc32/include/platform \
+         $${epocroot_prefix}epoc32/include/platform/loc \
+         $${epocroot_prefix}epoc32/include/platform/loc/sc
 
         # This define statements defines the include paths, which are intended to be
         # used in the pro-files that are part of the os-layer. This is intended 
@@ -198,7 +204,7 @@ exists($${EPOCROOT}epoc32/include/platform_paths.prf) {
         # 2 files already contain the /epoc32/include  as system include path.
 
         OS_LAYER_KERNEL_SYSTEMINCLUDE = \
-         /epoc32/include/platform
+         $${epocroot_prefix}epoc32/include/platform
 
 
         # ---------------------------------------
@@ -235,19 +241,19 @@ exists($${EPOCROOT}epoc32/include/platform_paths.prf) {
         # ---------------------------------------
               
         defineReplace(CORE_APP_LAYER_IBY_EXPORT_PATH) {
-            return(/epoc32/rom/include/core/app/$$1)
+            return($${epocroot_prefix}epoc32/rom/include/core/app/$$1)
         }
         defineReplace(CORE_MW_LAYER_IBY_EXPORT_PATH) {
-            return(/epoc32/rom/include/core/mw/$$1)
+            return($${epocroot_prefix}epoc32/rom/include/core/mw/$$1)
         }
         defineReplace(CORE_OSEXT_LAYER_IBY_EXPORT_PATH) {
-            return(/epoc32/rom/include/core/os/$$1)
+            return($${epocroot_prefix}epoc32/rom/include/core/os/$$1)
         }
         defineReplace(CORE_OS_LAYER_IBY_EXPORT_PATH) {
-            return(/epoc32/rom/include/core/os/$$1)
+            return($${epocroot_prefix}epoc32/rom/include/core/os/$$1)
         }
         defineReplace(CORE_ADAPT_LAYER_IBY_EXPORT_PATH) {
-            return(/epoc32/rom/include/$$1)
+            return($${epocroot_prefix}epoc32/rom/include/$$1)
         }
         
         # You need to define the following in pro-file, if you are using the stllib:
@@ -263,10 +269,10 @@ exists($${EPOCROOT}epoc32/include/platform_paths.prf) {
         # ---------------------------------------
 
         defineReplace(APP_LAYER_SDK_EXPORT_PATH) {
-             return (/epoc32/include/applications/$$1)
+             return ($${epocroot_prefix}epoc32/include/applications/$$1)
         }
         defineReplace(APP_LAYER_PUBLIC_EXPORT_PATH) {
-             return (/epoc32/include/applications/$$1)
+             return ($${epocroot_prefix}epoc32/include/applications/$$1)
         }
 
         # ---------------------------------------
@@ -274,10 +280,10 @@ exists($${EPOCROOT}epoc32/include/platform_paths.prf) {
         # ---------------------------------------
 
         defineReplace(APP_LAYER_DOMAIN_EXPORT_PATH) {
-             return (/epoc32/include/domain/applications/$$1)
+             return ($${epocroot_prefix}epoc32/include/domain/applications/$$1)
         }
         defineReplace(APP_LAYER_PLATFORM_EXPORT_PATH) {
-             return (/epoc32/include/domain/applications/$$1)
+             return ($${epocroot_prefix}epoc32/include/domain/applications/$$1)
         }
 
         # ---------------------------------------
@@ -285,10 +291,10 @@ exists($${EPOCROOT}epoc32/include/platform_paths.prf) {
         # ---------------------------------------
 
         defineReplace(MW_LAYER_SDK_EXPORT_PATH) {
-             return (/epoc32/include/middleware/$$1)
+             return ($${epocroot_prefix}epoc32/include/middleware/$$1)
         }
         defineReplace(MW_LAYER_PUBLIC_EXPORT_PATH) {
-             return (/epoc32/include/middleware/$$1)
+             return ($${epocroot_prefix}epoc32/include/middleware/$$1)
         }
 
         # ---------------------------------------
@@ -296,10 +302,10 @@ exists($${EPOCROOT}epoc32/include/platform_paths.prf) {
         # ---------------------------------------
 
         defineReplace(MW_LAYER_DOMAIN_EXPORT_PATH) {
-             return (/epoc32/include/domain/middleware/$$1)
+             return ($${epocroot_prefix}epoc32/include/domain/middleware/$$1)
         }
         defineReplace(MW_LAYER_PLATFORM_EXPORT_PATH) {
-             return (/epoc32/include/domain/middleware/$$1)
+             return ($${epocroot_prefix}epoc32/include/domain/middleware/$$1)
         }
 
         # ---------------------------------------
@@ -307,11 +313,11 @@ exists($${EPOCROOT}epoc32/include/platform_paths.prf) {
         # ---------------------------------------
 
         defineReplace(OSEXT_LAYER_SDK_EXPORT_PATH) {
-             return (/epoc32/include/osextensions/$$1)
+             return ($${epocroot_prefix}epoc32/include/osextensions/$$1)
         }
         # WARNING: If the following path changes see the exists() function around line 430
         defineReplace(OS_LAYER_PUBLIC_EXPORT_PATH) {
-             return (/epoc32/include/osextensions/$$1)
+             return ($${epocroot_prefix}epoc32/include/osextensions/$$1)
         }
 
         # ---------------------------------------
@@ -319,10 +325,10 @@ exists($${EPOCROOT}epoc32/include/platform_paths.prf) {
         # ---------------------------------------
 
         defineReplace(OSEXT_LAYER_DOMAIN_EXPORT_PATH) {
-             return (/epoc32/include/domain/osextensions/$$1)
+             return ($${epocroot_prefix}epoc32/include/domain/osextensions/$$1)
         }
         defineReplace(OS_LAYER_PLATFORM_EXPORT_PATH) {
-             return (/epoc32/include/domain/osextensions/$$1)
+             return ($${epocroot_prefix}epoc32/include/domain/osextensions/$$1)
         }
 
         # ---------------------------------------
@@ -349,20 +355,20 @@ exists($${EPOCROOT}epoc32/include/platform_paths.prf) {
         # the headers come from middleware or os-layer  => thus they are first.
 
         APP_LAYER_SYSTEMINCLUDE = \
-         /epoc32/include \
-         /epoc32/include/oem \
-         /epoc32/include/middleware \
-         /epoc32/include/domain/middleware \
-         /epoc32/include/osextensions \
-         /epoc32/include/domain/osextensions \
-         /epoc32/include/applications \
-         /epoc32/include/domain/applications \
-         /epoc32/include/domain/osextensions/loc \
-         /epoc32/include/domain/middleware/loc \
-         /epoc32/include/domain/applications/loc \
-         /epoc32/include/domain/osextensions/loc/sc \
-         /epoc32/include/domain/middleware/loc/sc \
-         /epoc32/include/domain/applications/loc/sc
+         $${epocroot_prefix}epoc32/include \
+         $${epocroot_prefix}epoc32/include/oem \
+         $${epocroot_prefix}epoc32/include/middleware \
+         $${epocroot_prefix}epoc32/include/domain/middleware \
+         $${epocroot_prefix}epoc32/include/osextensions \
+         $${epocroot_prefix}epoc32/include/domain/osextensions \
+         $${epocroot_prefix}epoc32/include/applications \
+         $${epocroot_prefix}epoc32/include/domain/applications \
+         $${epocroot_prefix}epoc32/include/domain/osextensions/loc \
+         $${epocroot_prefix}epoc32/include/domain/middleware/loc \
+         $${epocroot_prefix}epoc32/include/domain/applications/loc \
+         $${epocroot_prefix}epoc32/include/domain/osextensions/loc/sc \
+         $${epocroot_prefix}epoc32/include/domain/middleware/loc/sc \
+         $${epocroot_prefix}epoc32/include/domain/applications/loc/sc
 
         # This define statements defines the include paths, which are intended to be
         # used in the pro-files that are part of the middleware-layer. It includes all 
@@ -370,16 +376,16 @@ exists($${EPOCROOT}epoc32/include/platform_paths.prf) {
         # middleware-layer components. 
 
         MW_LAYER_SYSTEMINCLUDE = \
-         /epoc32/include \
-         /epoc32/include/oem \
-         /epoc32/include/middleware \
-         /epoc32/include/domain/middleware \
-         /epoc32/include/osextensions \
-         /epoc32/include/domain/osextensions \
-         /epoc32/include/domain/osextensions/loc \
-         /epoc32/include/domain/middleware/loc \
-         /epoc32/include/domain/osextensions/loc/sc \
-         /epoc32/include/domain/middleware/loc/sc
+         $${epocroot_prefix}epoc32/include \
+         $${epocroot_prefix}epoc32/include/oem \
+         $${epocroot_prefix}epoc32/include/middleware \
+         $${epocroot_prefix}epoc32/include/domain/middleware \
+         $${epocroot_prefix}epoc32/include/osextensions \
+         $${epocroot_prefix}epoc32/include/domain/osextensions \
+         $${epocroot_prefix}epoc32/include/domain/osextensions/loc \
+         $${epocroot_prefix}epoc32/include/domain/middleware/loc \
+         $${epocroot_prefix}epoc32/include/domain/osextensions/loc/sc \
+         $${epocroot_prefix}epoc32/include/domain/middleware/loc/sc
 
         # This define statements defines the include paths, which are intended to be
         # used in the pro-files that are part of the  osextensions-layer. It includes all
@@ -387,12 +393,12 @@ exists($${EPOCROOT}epoc32/include/platform_paths.prf) {
         # os-layer components. 
 
         OS_LAYER_SYSTEMINCLUDE = \
-         /epoc32/include \
-         /epoc32/include/oem \
-         /epoc32/include/osextensions \
-         /epoc32/include/domain/osextensions \
-         /epoc32/include/domain/osextensions/loc \
-         /epoc32/include/domain/osextensions/loc/sc
+         $${epocroot_prefix}epoc32/include \
+         $${epocroot_prefix}epoc32/include/oem \
+         $${epocroot_prefix}epoc32/include/osextensions \
+         $${epocroot_prefix}epoc32/include/domain/osextensions \
+         $${epocroot_prefix}epoc32/include/domain/osextensions/loc \
+         $${epocroot_prefix}epoc32/include/domain/osextensions/loc/sc
 
         # This define statements defines the include paths, which are intended to be
         # used in the pro-files that are part of the os-layer. This is intended 
@@ -401,9 +407,9 @@ exists($${EPOCROOT}epoc32/include/platform_paths.prf) {
         # 2 files already contain the /epoc32/include  as system include path.
 
         OS_LAYER_KERNEL_SYSTEMINCLUDE = \
-         /epoc32/include/oem \
-         /epoc32/include/osextensions \
-         /epoc32/include/domain/osextensions
+         $${epocroot_prefix}epoc32/include/oem \
+         $${epocroot_prefix}epoc32/include/osextensions \
+         $${epocroot_prefix}epoc32/include/domain/osextensions
 
 
         # ---------------------------------------
@@ -413,38 +419,38 @@ exists($${EPOCROOT}epoc32/include/platform_paths.prf) {
 
         OS_LAYER_LIBC_SYSTEMINCLUDE = $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis) \
                                       $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/sys) \
-                                      /epoc32/include/stdapis \
-                                      /epoc32/include/stdapis/sys
+                                      $${epocroot_prefix}epoc32/include/stdapis \
+                                      $${epocroot_prefix}epoc32/include/stdapis/sys
 
         OS_LAYER_GLIB_SYSTEMINCLUDE = $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/glib-2.0) \
                                       $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/glib-2.0/glib) \
                                       $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/glib-2.0/gObject) \
-                                      /epoc32/include/stdapis/glib-2.0 \
-                                      /epoc32/include/stdapis/glib-2.0/glib \
-                                      /epoc32/include/stdapis/glib-2.0/gObject
+                                      $${epocroot_prefix}epoc32/include/stdapis/glib-2.0 \
+                                      $${epocroot_prefix}epoc32/include/stdapis/glib-2.0/glib \
+                                      $${epocroot_prefix}epoc32/include/stdapis/glib-2.0/gObject
 
         OS_LAYER_SSL_SYSTEMINCLUDE = $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/openssl) \
-                                     /epoc32/include/stdapis/openssl
+                                     $${epocroot_prefix}epoc32/include/stdapis/openssl
 
         # stlportv5 is preferred over stlport as it has the throwing version of operator new
         exists($${EPOCROOT}epoc32/include/osextensions/stdapis/stlportv5)|exists($${EPOCROOT}epoc32/include/stdapis/stlportv5) {
             OS_LAYER_STDCPP_SYSTEMINCLUDE = $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/stlportv5) \
-                                            /epoc32/include/stdapis/stlportv5
+                                            $${epocroot_prefix}epoc32/include/stdapis/stlportv5
         } else {
             OS_LAYER_STDCPP_SYSTEMINCLUDE = $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/stlport) \
-                                            /epoc32/include/stdapis/stlport
+                                            $${epocroot_prefix}epoc32/include/stdapis/stlport
         }
         
         OS_LAYER_BOOST_SYSTEMINCLUDE = $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/boost) \
-                                       /epoc32/include/stdapis/boost
+                                       $${epocroot_prefix}epoc32/include/stdapis/boost
 
         OS_LAYER_DBUS_SYSTEMINCLUDE = $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/dbus-1.0) \
                                       $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/dbus-1.0/dbus) \
-                                      /epoc32/include/stdapis/dbus-1.0 \
-                                      /epoc32/include/stdapis/dbus-1.0/dbus
+                                      $${epocroot_prefix}epoc32/include/stdapis/dbus-1.0 \
+                                      $${epocroot_prefix}epoc32/include/stdapis/dbus-1.0/dbus
 
         OS_LAYER_LIBUTILITY_SYSTEMINCLUDE = $$OS_LAYER_PLATFORM_EXPORT_PATH(stdapis/utility) \
-                                            /epoc32/include/stdapis/utility
+                                            $${epocroot_prefix}epoc32/include/stdapis/utility
 
         # ---------------------------------------
         # Definitions to export IBY files to different folders where they will be taken 
@@ -452,19 +458,19 @@ exists($${EPOCROOT}epoc32/include/platform_paths.prf) {
         # ---------------------------------------
               
         defineReplace(CORE_APP_LAYER_IBY_EXPORT_PATH) {
-            return(/epoc32/rom/include/core/app/$$1)
+            return($${epocroot_prefix}epoc32/rom/include/core/app/$$1)
         }
         defineReplace(CORE_MW_LAYER_IBY_EXPORT_PATH) {
-            return(/epoc32/rom/include/core/mw/$$1)
+            return($${epocroot_prefix}epoc32/rom/include/core/mw/$$1)
         }
         defineReplace(CORE_OSEXT_LAYER_IBY_EXPORT_PATH) {
-            return(/epoc32/rom/include/core/osext/$$1)
+            return($${epocroot_prefix}epoc32/rom/include/core/osext/$$1)
         }
         defineReplace(CORE_OS_LAYER_IBY_EXPORT_PATH) {
-            return(/epoc32/rom/include/core/osext/$$1)
+            return($${epocroot_prefix}epoc32/rom/include/core/osext/$$1)
         }
         defineReplace(CORE_ADAPT_LAYER_IBY_EXPORT_PATH) {
-            return(/epoc32/rom/include/$$1)
+            return($${epocroot_prefix}epoc32/rom/include/$$1)
         }
         
         # You need to define the following in pro-file, if you are using the stllib:
@@ -476,5 +482,4 @@ exists($${EPOCROOT}epoc32/include/platform_paths.prf) {
     } 
 }
 
-
-    
+epocroot_prefix =
diff --git a/mkspecs/features/symbian/release.prf b/mkspecs/features/symbian/release.prf
new file mode 100644
index 0000000..abfa3ac
--- /dev/null
+++ b/mkspecs/features/symbian/release.prf
@@ -0,0 +1 @@
+QMAKE_LIBDIR_QT        += $${EPOCROOT}epoc32/release/armv5/urel