Changeset 3297 for pjproject

Timestamp:

Aug 26, 2010 8:17:01 AM (14 years ago)

Author:

bennylp

Message:

More on automated tests (re ticket:1111): added support for multiple Nokia/Symbian? SDK installed in one system

Location:

pjproject/trunk/tests/automated

Files:

• configure.py (modified) (5 diffs)
• symbian.xml.template (modified) (1 diff)

pjproject/trunk/tests/automated/configure.py

@@ -85 +85 @@
 class S60SDK:
         def __init__(self):
+                self.epocroot = ""
+                self.sdk = ""
+                self.device = ""
+
                 # Check that EPOCROOT is set
                 if not "EPOCROOT" in os.environ:
@@ -94 +98 @@
                     epocroot = epocroot + "\\"
                     os.environ["EPOCROOT"] = epocroot
-                sdk1 = epocroot.split("\\")[-2]
+                self.epocroot = epocroot
+                self.sdk = sdk1 = epocroot.split("\\")[-2]
+                self.device = "@" + self.sdk + ":com.nokia.s60"
 
                 # Check that correct device is set
@@ -124 +130 @@
 
         # osinfo
+        s60sdk_var = None
         if build_type == "s60":
-                os_info = S60SDK().name
+                s60sdk_var = S60SDK()
+                os_info = s60sdk_var.name
         elif platform.system().lower() == "windows" or platform.system().lower() == "microsoft":
                 if platform.system().lower() == "microsoft":
@@ -154 +162 @@
                 suffix = "i386-Win32-vc8-" + vs_target
         elif build_type == "s60":
-                suffix = S60SDK().name + "-" + s60_target.replace(" ", "-")
+                suffix = s60sdk_var.name + "-" + s60_target.replace(" ", "-")
         elif build_type == "gnu":
                 proc = subprocess.Popen("sh config.guess", cwd="../..",
@@ -183 +191 @@
                 elif text.find("$(S60TARGETNAME)") >= 0:
                         text = text.replace("$(S60TARGETNAME)", s60_target.replace(" ", "-"))
+                elif text.find("$(S60DEVICE)") >= 0:
+                        text = text.replace("$(S60DEVICE)", s60sdk_var.device)
+                elif text.find("$(EPOCROOT)") >= 0:
+                        text = text.replace("$(EPOCROOT)", s60sdk_var.epocroot)
                 elif text.find("$(DISABLED)") >= 0:
                         text = text.replace("$(DISABLED)", "0")

pjproject/trunk/tests/automated/symbian.xml.template

@@ -14 +14 @@
 ]]>                     
                 </FileWrite>
-                <Configure cmd="cmd /c echo success" />
-                <Build wdir="build.symbian" cmd='cmd /C &quot;bldmake bldfiles &amp;&amp; abld reallyclean $(S60TARGET) &amp;&amp; abld build $(S60TARGET)&quot;' />
+                <Configure cmd="cmd /c devices -setdefault $(S60DEVICE)" />
+                <Build wdir="build.symbian" cmd='cmd /C &quot;SET EPOCROOT=$(EPOCROOT)&amp;&amp; bldmake bldfiles &amp;&amp; abld reallyclean $(S60TARGET) &amp;&amp; abld build $(S60TARGET)&quot;' />
         </Submit>
 </Scenario>