FCL/sftools/dev/build: comparison buildframework/helium/tools/common/common.antlib.xml

equal deleted inserted replaced

-:27cf35f95864
+:b8d81fa19e7d
 target = str(attributes.get('target'))
 collectTargetDependencies(target, 1)
 targetList.append((target, 0))
-format = str(attributes.get('format'))
+formatstr = str(attributes.get('format'))
-if format == 'nested':
+if formatstr == 'nested':
 for target, indent in targetList:
 indentString = ''.join(['   ' for x in range(indent)])
 print indentString + str(target)
-elif format == 'executable':
+elif formatstr == 'executable':
 print "Top level targets:\n"
 print ''.join([str(target) + ' ' for target, indent in targetList[:-1] if indent == 1])
 print "\n\nAll targets in sequence:\n"
 print ''.join([str(target) + ' ' for target, indent in targetList[:-1]])
 </scriptdef>
 <attribute name="type"/>
 <![CDATA[
 import netrc
 import os
 result = "0"
-try:
 netrc_file = netrc.netrc()
 self.log("Type: %s" % str(attributes.get("type")))
 netrc_info = netrc_file.authenticators(str(attributes.get("type")))
 if netrc_info == None:
-raise Exception("No entry found for Type: %s" % str(attributes.get("type")))
+print "No entry found for Type: %s" % str(attributes.get("type"))
+result = '-1'
+else:
 (n_username, n_account, n_password) = netrc_info
 if attributes.get('output-prop') != None:
 project.setProperty(str(attributes.get('output-prop')), str(n_password))
-except Exception, e:
-result = "-1"
-print "Warning: %s" % e
 if attributes.get('result-prop') != None:
 project.setProperty(str(attributes.get('result-prop')), str(result))
 ]]>
 </scriptdef>
 <attribute name="type"/>
 <![CDATA[
 import netrc
 import os
 result = "0"
-try:
 netrc_file = netrc.netrc()
 self.log("Type: %s" % str(attributes.get("type")))
 netrc_info = netrc_file.authenticators(str(attributes.get("type")))
 if netrc_info == None:
-raise Exception("No entry found for Type: %s" % str(attributes.get("type")))
+print "No entry found for Type: %s" % str(attributes.get("type"))
+result = '-1'
+else:
 (n_username, n_account, n_password) = netrc_info
 if attributes.get('output-prop') != None:
 project.setProperty(str(attributes.get('output-prop')), str(n_username))
-except Exception, e:
-result = "-1"
-print "Warning: %s" % e
 if attributes.get('result-prop') != None:
 project.setProperty(str(attributes.get('result-prop')), str(result))
 ]]>
 </scriptdef>
 session = None
 result = "0"
 cache = None
 if project.getProperty("ccm.cache.xml")is not None:
 cache = str(project.getProperty("ccm.cache.xml"))
-try:
+database = project.getProperty('ccm.database')
-database = project.getProperty('ccm.database')
+if project.getProperty('ccm.user.login') == None :
+raise Exception("'ccm.user.login' property is not defined")
-if project.getProperty('ccm.user.login') == None :
+username = project.getProperty('ccm.user.login')
-raise Exception("'ccm.user.login' property is not defined")
+if project.getProperty('ccm.user.password') == None :
+raise Exception("'ccm.user.password' property is not defined")
-username = project.getProperty('ccm.user.login')
+password = project.getProperty('ccm.user.password')
+engine = project.getProperty('ccm.engine.host')
-if project.getProperty('ccm.user.password') == None :
+dbpath = project.getProperty('ccm.database.path')
-raise Exception("'ccm.user.password' property is not defined")
+provider = ccm.extra.CachedSessionProvider(opener=nokia.nokiaccm.open_session, cache=cache)
+if database != None:
-password = project.getProperty('ccm.user.password')
+session = provider.get(username, password, database=database, reuse=False)
+else:
+session = provider.get(username, password, engine, dbpath, reuse=False)
-engine = project.getProperty('ccm.engine.host')
+session.close()
-dbpath = project.getProperty('ccm.database.path')
+provider.close()
-provider = ccm.extra.CachedSessionProvider(opener=nokia.nokiaccm.open_session, cache=cache)
-if database != None:
-session = provider.get(username, password, database=database, reuse=False)
-else:
-session = provider.get(username, password, engine, dbpath, reuse=False)
-session.close()
-provider.close()
-except Exception, e:
-print "ERROR: %s" % e
-if str(e).find("access denied") != -1:
-result = "-2"
-else:
-result = "-1"
-self.log("Result: %s" % attributes.get('resultproperty'))
-project.setProperty(str(attributes.get('resultproperty')), str(result))
 ]]>
 </scriptdef>
 <macrodef name="signalMacro" uri="http://www.nokia.com/helium">
 file="@{logfile}" />
 <!-- signal for errors -->
 <var name="internal.signal.macro.log.basename" value="" unset="true"/>
 <basename property="internal.signal.macro.log.basename" file="@{logfile}" />
-<hlm:signal name="@{signal.input}" result="${signal.errors.total}"
+<hlm:signal result="${signal.errors.total}" message="Found ${signal.errors.total} errors under @{logfile}.">
-message="Found ${signal.errors.total} errors under @{logfile}.">
 <signalNotifierInput>
 <signalInput refid="@{signal.input}" />
 <notifierInput>
-<fileset casesensitive="false" dir="${build.signal.status.dir}"
+<fileset casesensitive="false" dir="${build.log.dir}">
-includes="${internal.signal.macro.log.basename}.status.html" />
+<include name="**/${internal.signal.macro.log.basename}*" />
+</fileset>
 </notifierInput>
 </signalNotifierInput>
 </hlm:signal>
 </sequential>
 </macrodef>
 <attribute name="control"/>
 <attribute name="test"/>
 <attribute name="failonerror"/>
 <![CDATA[
 import logging
+import junit.framework
 import java.io
 import org.custommonkey.xmlunit
 control_id = str(attributes.get('control'))
 test_id = str(attributes.get('test'))
 try:
 control_reader = java.io.InputStreamReader(control_resource.getInputStream())
 test_reader = java.io.InputStreamReader(test_resource.getInputStream())
 org.custommonkey.xmlunit.XMLAssert.assertXMLEqual(control_reader, test_reader)
 print 'XML is similar'
-except Exception, e:
+except junit.framework.AssertionFailedError, e:
 print 'XML is NOT similar!'
 failonerror = str(attributes.get('failonerror'))
 if failonerror == 'true' or failonerror == 'None':
 raise e
 ]]>
 <!-- unsubst task, will unsubst a given drive. -->
 <scriptdef name="unsubst" language="jython" uri="http://www.nokia.com/helium">
 <attribute name="drive"/>
 <attribute name="failonerror"/>
-""" internal.codescanner.drive """
+#internal.codescanner.drive
 import os
 if os.sep == '\\':
 import fileutils
 self.setTaskName('unsubst')
 drive = attributes.get('drive')
 else:
 drive = str(drive)
 try:
 self.log(str("Unsubsting %s..." % drive))
 fileutils.unsubst(drive)
-except Exception, e:
+except OSError, e:
 if failonerror:
 raise e
 else:
 self.log(str("Error: %s" % e))
 </scriptdef>
 <!-- Touches the files in the paths given. -->
 <scriptdef name="touch" language="jython" uri="http://www.nokia.com/helium">
 <element name="path" type="path"/>
 <![CDATA[
 import fileutils
-for id in range(elements.get("path").size()):
+for aid in range(elements.get("path").size()):
-iterator = elements.get("path").get(int(id)).iterator()
+iterator = elements.get("path").get(int(aid)).iterator()
 while iterator.hasNext():
 path = str(iterator.next())
 fileutils.touch(path)
 ]]>
 </scriptdef>
 <hlm:database output="@{file}" scope="@{scope}">
 <fileset dir="${helium.dir}">
 <include name="config/signaling_config_default.ant.xml"/>
 <include name="config/stages_config_default.ant.xml"/>
 <include name="config/metadata_filter_config_default.ant.xml"/>
+<include name="tools/common/default_config.ant.xml"/>
 <include name="tools/**/*.antlib.xml"/>
 </fileset>
 </hlm:database>
 </sequential>
 </macrodef>

changeset 645	b8d81fa19e7d
parent 628	7c4a911dc066