FCL/sftools/dev/build: comparison buildframework/helium/tools/publish/publish.ant.xml

equal deleted inserted replaced

-:be27ed110b50
+:d8ac696cc51f
 e.g:
 <pre>
 <hlm:mergeMetadataMacro file="${zip.config.file.parsed}" config="${zips.@{type}.spec.name}"/>
 </pre>
 -->
-<scriptdef name="mergeMetadataMacro" language="jython" uri="http://www.nokia.com/helium">
+<macrodef name="mergeMetadataMacro" uri="http://www.nokia.com/helium">
 <attribute name="file" />
 <attribute name="config" />
-<![CDATA[
+<sequential>
+<hlm:python>
+<![CDATA[
 import configuration
 import symrec
 import os
-import traceback
+import sys
-# Nicer name
+import logging
-self.setTaskName("merge-metadata")
+import ant
+LOGGER = logging.getLogger("metadatamerger")
+LOGGER.setLevel(level=logging.INFO)
+logging.basicConfig(level=logging.INFO)
 def merge_filelist(merger, filelist):
 for filename in filelist:
 try:
-self.log(str("Merging %s" % filename))
+LOGGER.info("Merging %s" % filename)
 merger.merge(filename)
 os.unlink(filename)
 except Exception, exc:
-self.log("Warning: %s" % exc)
+LOGGER.warning("Warning: %s" % exc)
 try:
-builder = configuration.NestedConfigurationBuilder(open(str(attributes.get('file')), 'r'))
+builder = configuration.NestedConfigurationBuilder(open(ant.get_property(r'@{file}')), 'r')
 configSet = builder.getConfiguration()
-configs = configSet.getConfigurations(str(attributes.get('config')))
+configs = configSet.getConfigurations(ant.get_property(r'@{config}'))
 if len(configs) > 0:
 filelist = []
 for config in configs:
 if config.get_boolean("grace.metadata", False):
 metadata = os.path.join(config['archives.dir'], config['name']+ ".metadata.xml")
 if os.path.exists(metadata):
-self.log(str("Found %s" % metadata))
+LOGGER.info("Found %s" % metadata)
 filelist.append(metadata)
 merger = None
 metadata_main = os.path.join(configs[0]['archives.dir'], "release_metadata.xml")
 if os.path.exists(metadata_main):
 merger = symrec.MetadataMerger(metadata_main)
 merge_filelist(merger, filelist)
-self.log(str("Writing %s" % metadata_main))
+LOGGER.info(str("Writing %s" % metadata_main))
 merger.save()
 elif len(filelist) > 0:
 input = filelist.pop(0)
 merger = symrec.MetadataMerger(input)
 merge_filelist(merger, filelist)
-self.log(str("Writing %s" % metadata_main))
+LOGGER.info(str("Writing %s" % metadata_main))
 merger.save(metadata_main)
 os.unlink(input)
 except Exception, e:
-self.log('ERROR: %s' % e)
+LOGGER.error('ERROR: %s' % e)
-traceback.print_exc()
+sys.exit(-1)
-# Let's propagate at the moment
-raise e
 ]]>
-</scriptdef>
+</hlm:python>
+</sequential>
+</macrodef>
 <!-- This macro allows you to add or update one archive definition inside the release metadata files.
 e.g.:
 <pre>
 <hlm:updateMetadataMacro file="<path>/release_metadata.xml" archive="<path>/archive.zip" />
 </pre>
 -->
-<scriptdef name="updateMetadataMacro" language="jython" uri="http://www.nokia.com/helium">
+<macrodef name="updateMetadataMacro" uri="http://www.nokia.com/helium">
 <attribute name="file" />
 <attribute name="archive" />
-<attribute name="filters" />
+<attribute name="filters" default=""/>
+<sequential>
+<hlm:python>
 <![CDATA[
 import symrec
 import os
 import traceback
 import fileutils
-self.setTaskName("updateMetadataMacro")
+import ant
-if attributes.get('file') is None:
+import sys
+import logging
+LOGGER = logging.getLogger("metadataupdater")
+LOGGER.setLevel(level=logging.INFO)
+logging.basicConfig(level=logging.INFO)
+if ant.get_property(r'@{file}') is None:
 raise Exception('file attribute is not defined.')
-if attributes.get('archive') is None:
+if ant.get_property(r'@{archive}') is None:
 raise Exception('archive attribute is not defined.')
 filters = None
-if attributes.get('filters') is not None:
+if ant.get_property(r'@{filters}') is not None:
-filters = str(attributes.get('filters')).split(r',')
+filters = ant.get_property(r'@{filters}').split(r',')
 try:
-filename = str(attributes.get('file'))
+filename = ant.get_property(r'@{file}')
-archive = str(attributes.get('archive'))
+archive = ant.get_property(r'@{archive}')
 if not os.path.exists(filename):
 raise Exception("Could not find file: %s" % filename)
 if not os.path.exists(archive):
 raise Exception("Could not find file: %s" % archive)
-self.log(str("Opening %s" % filename))
+LOGGER.info(str("Opening %s" % filename))
 md = symrec.ReleaseMetadata(filename)
 if os.path.basename(archive) not in md.keys():
-self.log(str("Adding %s to metadata" % os.path.basename(archive)))
+LOGGER.info(str("Adding %s to metadata" % os.path.basename(archive)))
 md.add_package(os.path.basename(archive), md5checksum=fileutils.getmd5(archive), size=os.path.getsize(archive), filters=filters)
 else:
-self.log(str("Updating %s to metadata" % os.path.basename(archive)))
+LOGGER.info(str("Updating %s to metadata" % os.path.basename(archive)))
 result = md[os.path.basename(archive)]
 result['md5checksum'] = unicode(fileutils.getmd5(archive))
 result['size'] = unicode(os.path.getsize(archive))
 if filters is not None:
 result['filters'] = filters
 md[os.path.basename(archive)] = result
 md.save()
 except Exception, e:
-self.log('ERROR: %s' % e)
+LOGGER.error('ERROR: %s' % e)
-traceback.print_exc()
+sys.exit(-1)
-# Let's propagate at the moment
-raise e
 ]]>
-</scriptdef>
+</hlm:python>
+</sequential>
+</macrodef>
 <!-- This macro update the metadata file generated by the config provided by file.
 e.g:
 <pre>
 <hlm:updateMD5Macro file="${zip.config.file.parsed}" config="${zips.@{type}.spec.name}"/>
 </pre>
 -->
-<scriptdef name="updateMD5Macro" language="jython" uri="http://www.nokia.com/helium">
+<macrodef name="updateMD5Macro" uri="http://www.nokia.com/helium">
 <attribute name="file" />
 <attribute name="config" />
+<sequential>
+<hlm:python>
 <![CDATA[
 import configuration
 import archive
 import os
 import symrec
-import traceback
+import ant
+import logging
-self.setTaskName("update-md5")
+import sys
+LOGGER = logging.getLogger("metadataMD5updater")
+LOGGER.setLevel(level=logging.INFO)
+logging.basicConfig(level=logging.INFO)
 # Reading the config from Ant
 try:
-config_filename = str(attributes.get('file'))
+config_filename = ant.get_property(r'@{file}')
-spec_name = str(attributes.get('config'))
+spec_name = ant.get_property(r'@{config}')
 # Loading the config file.
 builder = configuration.NestedConfigurationBuilder(open(config_filename, 'r'))
 configSet = builder.getConfiguration()
 configs = configSet.getConfigurations(spec_name)
 if os.path.exists(os.path.join(configs[0]['archives.dir'], "release_metadata.xml")):
 md5update = symrec.MD5Updater(os.path.join(configs[0]['archives.dir'], "release_metadata.xml"))
 md5update.update()
 md5update.save()
 else:
-self.log(str('WARNING: Could not find %s.' % os.path.join(configs[0]['archives.dir'], "release_metadata.xml")))
+LOGGER.warning(str('WARNING: Could not find %s.' % os.path.join(configs[0]['archives.dir'], "release_metadata.xml")))
 else:
-self.log('WARNING: No config.')
+LOGGER.warning('WARNING: No config.')
 except Exception, e:
-self.log('ERROR: %s' % e)
+LOGGER.error('ERROR: %s' % e)
-traceback.print_exc()
+sys.exit(-1)
-# Let's propagate at the moment
-raise e
 ]]>
-</scriptdef>
+</hlm:python>
+</sequential>
+</macrodef>
 <condition property="archive.using.ec">
 <or>
 <equals arg1="${build.system}" arg2="ec-helium" />
 <equals arg1="${build.system}" arg2="sbs-ec" />
 <!-- Zips files using a type and zip config file as args -->
 <macrodef name="zipContentMacro" uri="http://www.nokia.com/helium">
 <attribute name="type" />
 <attribute name="file" />
 <attribute name="ec" default="${archive.using.ec}"/>
+<attribute name="failonemptyconfig" default="true"/>
+<attribute name="phase" default="archive"/>
 <sequential>
 <if>
 <not>
 <isset property="zip.@{type}.log.file" />
 </not>
 <then>
-<property name="zip.@{type}.log.file" location="${build.log.dir}/${build.id}_@{type}_zip.log" />
+<property name="zip.@{type}.log.file" location="${@{phase}.log.dir}/${build.id}_@{type}_zip.log" />
 </then>
 </if>
+<mkdir dir="${@{phase}.log.dir}"/>
+<mkdir dir="${post.log.dir}"/>
+<property name="zip.@{type}.nopolicy.log.file" location="${@{phase}.log.dir}/${build.id}_@{type}_archive.nopolicy.log" />
+<property name="zip.@{type}.policy.log.file" location="${@{phase}.log.dir}/${build.id}_@{type}_archive.policy.log" />
 <trycatch property="exception" reference="exception">
 <try>
 <!-- Don't print 'compressing' on console -->
 <hlm:logtoconsole action="stop" />
 <!-- Stops writing on ...ant_build.log file-->
-<hlm:startSpecificLogMacro name="${zip.@{type}.log.file}" />
+<hlm:startSpecificLogMacro name="${zip.@{type}.log.file}" phase="@{phase}"/>
 <property name="zip.config.file.parsed" location="${temp.build.dir}/zip.cfg.xml.parsed" />
 <copy file="@{file}" tofile="${zip.config.file.parsed}" overwrite="true">
 <filterchain>
 <expandproperties />
 </filterchain>
 </copy>
-<hlm:updateArchiveConfig configtype="${zips.@{type}.spec.name}" configfileparsed="${zip.config.file.parsed}" usingec="@{ec}" />
+<hlm:updateArchiveConfig configtype="${zips.@{type}.spec.name}" configfileparsed="${zip.config.file.parsed}" usingec="@{ec}" failonemptyconfig="@{failonemptyconfig}"/>
 <if>
 <istrue value="@{ec}" />
 <then>
 <echo>emake.root.to.append=${emake.root.to.append}</echo>
-<hlm:emakeMacro name="archive-full-@{type}" makefile="${build.drive}/ZIP_${zips.@{type}.spec.name}.make" target="all" dir="${build.drive}" annodetail="basic,history,file,waiting" root="${emake.root.to.append}" failonerror="false" />
+<hlm:emakeMacro name="archive-full-@{type}" makefile="${build.drive}/ZIP_${zips.@{type}.spec.name}.make" target="all" dir="${build.drive}/" annodetail="basic,history,file,waiting" root="${emake.root.to.append}" failonerror="false" phase="archive"/>
 </then>
 <else>
 <if>
 <isgreaterthan arg1="${number.of.threads}" arg2="${archive.max.number.of.threads}"/>
 <then>
 <throw refid="exception"/>
 </catch>
 <finally>
 <!-- Todo: metadata: Convert to metadata structure -->
 <!-- Stops log back to main log. -->
-<hlm:stopSpecificLogMacro name="${zip.@{type}.log.file}" />
+<hlm:stopSpecificLogMacro name="${zip.@{type}.log.file}" phase="@{phase}"/>
 <hlm:logtoconsole action="resume" />
 </finally>
 </trycatch>
 <hlm:assertFileExists file="${zip.@{type}.log.file}" />
-<copy file="${zip.@{type}.log.file}" tofile="${build.log.dir}/${build.id}_@{type}_archive.nopolicy.log" verbose="true">
+<copy file="${zip.@{type}.log.file}" tofile="${zip.@{type}.nopolicy.log.file}" verbose="true">
 <filterchain>
 <linecontainsregexp negate="true">
 <regexp pattern="POLICY_(ERROR|WARNING|INFO)" />
 </linecontainsregexp>
 </filterchain>
 </copy>
 <hlm:metadatarecord database="${metadata.dbfile}">
 <hlm:textmetadatainput>
-<fileset casesensitive="false" file="${build.log.dir}/${build.id}_@{type}_archive.nopolicy.log" />
+<fileset casesensitive="false" file="${zip.@{type}.nopolicy.log.file}" />
 <metadatafilterset refid="filterset.archive.nopolicy" />
 </hlm:textmetadatainput>
 </hlm:metadatarecord>
-<hlm:signalMacro logfile="${build.log.dir}/${build.id}_@{type}_archive.nopolicy.log"
+<hlm:signalMacro logfile="${zip.@{type}.nopolicy.log.file}"
 signal.input="archiveErrorSignalInput" />
 <!-- Extracting policy errors from archiving. -->
-<copy file="${zip.@{type}.log.file}" tofile="${build.log.dir}/${build.id}_@{type}_archive.policy.log" verbose="true">
+<copy file="${zip.@{type}.log.file}" tofile="${zip.@{type}.policy.log.file}" verbose="true">
 <filterchain>
 <linecontainsregexp>
 <regexp pattern="POLICY_(ERROR|WARNING|INFO)" />
 </linecontainsregexp>
 <tokenfilter>
 <replaceregex pattern=".*(POLICY_(?:ERROR|WARNING|INFO))" replace="\1" flags="gi" />
 </tokenfilter>
 </filterchain>
 </copy>
-<hlm:assertFileExists file="${build.log.dir}/${build.id}_@{type}_archive.policy.log" />
+<hlm:assertFileExists file="${zip.@{type}.policy.log.file}" />
 <hlm:metadatarecord database="${metadata.dbfile}">
 <hlm:textmetadatainput>
-<fileset casesensitive="false" file="${build.log.dir}/${build.id}_@{type}_archive.policy.log" />
+<fileset casesensitive="false" file="${zip.@{type}.policy.log.file}" />
 <metadatafilterset refid="filterset.archive.policy" />
 </hlm:textmetadatainput>
 </hlm:metadatarecord>
-<hlm:signalMacro logfile="${build.log.dir}/${build.id}_@{type}_archive.policy.log"
+<hlm:signalMacro logfile="${zip.@{type}.policy.log.file}"
 signal.input="archivePolicyErrorSignalInput" />
 </sequential>
 </macrodef>
 <!--
 -->
 <scriptdef name="updateArchiveConfig" language="jython" uri="http://www.nokia.com/helium">
 <attribute name="configtype" />
 <attribute name="configfileparsed" />
 <attribute name="usingec" />
+<attribute name="failonemptyconfig" />
 <![CDATA[
 import archive
 import configuration
 import logging
 import os
+failonemptyconfig = True
+if attributes.get('failonemptyconfig'):
+failonemptyconfig = str(attributes.get('failonemptyconfig')).lower() == "true"
 config_parsed_filename = str(attributes.get('configfileparsed'))
 config_type = str(attributes.get('configtype'))
 is_it_ec = str(attributes.get('usingec'))
 builder = configuration.NestedConfigurationBuilder(open(config_parsed_filename, 'r'))
 outputext = '.xml'
 if is_it_ec == "true":
 outputtype = 'make'
 outputext = '.make'
-if len(configs) > 0:
+if len(configs) > 0 or not failonemptyconfig:
 prebuilder = archive.ArchivePreBuilder(configuration.ConfigurationSet(configs), config_type, outputtype)
 if os.sep == '\\':
 toAppendEmakeRoot = prebuilder.checkRootDirValue(builder, config_parsed_filename, project.getProperty('build.drive'), config_type)
 if toAppendEmakeRoot is not None:
 project.setProperty("emake.root.to.append", str(toAppendEmakeRoot))
 prebuilder.writeTopLevel(os.path.join(project.getProperty('build.drive') + os.sep, 'ZIP_' + config_type + outputext), project.getProperty('temp.build.dir'), config_parsed_filename)
 else:
 raise Exception('There are no archive configs to build. Looked for %s' % config_type)
 ]]>
 </scriptdef>
 First the logging should be stopped, before the file is copied. Hence this target should be called
 by the "final" target last.
 -->
 <target name="publish-build-log" depends="prep-publish" if="publish">
-<record name="${build.log}" action="stop" append="true" />
 <copy todir="${publish.dir}/logs" preservelastmodified="true" failonerror="false">
-<fileset dir="${build.log.dir}" includes="${build.id}*_ant_build.log" />
+<fileset dir="${build.log.dir}" includes="**/*.log" />
 </copy>
 </target>
+<!-- Copy the debug log to the build area if available-->
+<target name="copy-debug-logs">
+<echo message="log4j.dir:${log4j.cache.dir}" />
+<if>
+<available file="${log4j.cache.dir}" />
+<then>
+<copy todir="${build.log.dir}/debug" failonerror="false">
+<fileset dir="${log4j.cache.dir}" includes="hlm_*.log" />
+</copy>
+</then>
+</if>
+</target>
+<!-- Target to simulate that the build is failed because of processing
+ant output
+-->
+<target name="raise-error">
+<echo message="ERROR: Build failed due to exceptions" />
+</target>
+<!-- Update the build status by processing the ant build output log -->
+<target name="build-status">
+<hlm:metadatarecord database="${metadata.dbfile}">
+<hlm:antmetadatainput>
+<fileset casesensitive="false" file="${build.log.dir}/${build.id}_ant_build.log" />
+<metadatafilterset refid="filterset.ant.output" />
+</hlm:antmetadatainput>
+</hlm:metadatarecord>
+<hlm:signalMacro logfile="${build.id}_ant_build.log"
+signal.input="exceptionSignalInput" />
+</target>
+<!-- Exception handler to process the ant output log -->
+<target name="hlm-exception-handler">
+<if>
+<available file="${build.log.dir}/${build.id}_ant_build.log"/>
+<then>
+<runtarget target="do-exception-handler" />
+</then>
+</if>
+</target>
+<target name="do-exception-handler" depends="raise-error, build-status, build-log-summary, copy-debug-logs, publish-build-log" />
 <!-- Does any wrap-up at the end of the build. This should be the last target for every top-level target. -->
-<target name="final" depends="publish-build-log">
+<target name="final" depends="build-status, build-log-summary, copy-debug-logs, publish-build-log" />
-</target>
 <!-- This target will zip the WA depending on the ado mapping file -->
 <target name="zip-wa" depends="ido-create-ado-mapping" if="zip.wa">
 <tempfile property="zipwa.dynamic.config" suffix=".xml" deleteonexit="false" destdir="${temp.build.dir}"/>
 <fmpp sourceFile="${helium.dir}/tools/common/templates/ido/zip-ant-wa-copy.xml.ftl" outputFile="${zipwa.dynamic.config}">

changeset 179	d8ac696cc51f
parent 1	be27ed110b50
child 217	0f5e3a7fb6af