merge
authorsrilekhas
Mon, 11 Oct 2010 11:16:47 +0100
changeset 646 a010554f8551
parent 644 01667c882e63 (diff)
parent 645 b8d81fa19e7d (current diff)
merge
buildframework/helium/config/logging.conf.ftl
buildframework/helium/doc/src/manual/stage_ats.rst.inc.ftl
buildframework/helium/doc/src/manual/stage_final.rst.inc.ftl
buildframework/helium/doc/src/manual/stage_matti.rst.inc.ftl
buildframework/helium/sf/doc/src/index.rst
buildframework/helium/sf/java/antdata/src/com/nokia/helium/ant/data/taskdefs/AntConfigLintTask.java
buildframework/helium/sf/java/antdata/src/com/nokia/helium/ant/data/types/AntLintCheck.java
buildframework/helium/sf/java/antdata/src/com/nokia/helium/ant/data/types/LintIssue.java
buildframework/helium/sf/java/antdata/src/com/nokia/helium/ant/data/types/PropertyNameCheck.java
buildframework/helium/sf/java/antdata/src/com/nokia/helium/ant/data/types/WrongTypePropertyCheck.java
buildframework/helium/sf/java/antlint/src/com/nokia/helium/antlint/AntLintHandler.java
buildframework/helium/sf/java/antlint/src/com/nokia/helium/antlint/ant/types/CheckPythonTasks.java
buildframework/helium/sf/java/antlint/src/com/nokia/helium/antlint/ant/types/CheckScriptDef.java
buildframework/helium/sf/java/antlint/src/com/nokia/helium/antlint/ant/types/CheckScriptDefNameAttributes.java
buildframework/helium/sf/java/diamonds/src/com/nokia/helium/diamonds/AllTargetDiamondsListener.java
buildframework/helium/sf/java/diamonds/src/com/nokia/helium/diamonds/DiamondsClient.java
buildframework/helium/sf/java/diamonds/src/com/nokia/helium/diamonds/DiamondsExceptionStatusUpdate.java
buildframework/helium/sf/java/diamonds/src/com/nokia/helium/diamonds/DiamondsListenerImpl.java
buildframework/helium/sf/java/diamonds/src/com/nokia/helium/diamonds/DiamondsPostBuildStatusUpdate.java
buildframework/helium/sf/java/diamonds/src/com/nokia/helium/diamonds/StageDiamondsListener.java
buildframework/helium/sf/java/diamonds/src/com/nokia/helium/diamonds/TargetDiamondsListener.java
buildframework/helium/sf/java/diamonds/src/com/nokia/helium/diamonds/ant/HeliumListener.java
buildframework/helium/sf/java/legacy/src/com/nokia/ant/BuildStatusDef.java
buildframework/helium/sf/java/legacy/src/com/nokia/ant/Database.java
buildframework/helium/sf/java/legacy/src/com/nokia/ant/HeliumLogger.java
buildframework/helium/sf/java/legacy/src/com/nokia/ant/HelpDef.java
buildframework/helium/sf/java/legacy/src/com/nokia/ant/Signal.java
buildframework/helium/sf/java/legacy/src/com/nokia/ant/helium.antlib.xml
buildframework/helium/sf/java/legacy/src/com/nokia/ant/taskdefs/StopLogToConsoleTask.java
buildframework/helium/sf/java/legacy/tests/antunit/run-scenario.ant.xml
buildframework/helium/sf/java/legacy/tests/antunit/test_feature_enabled_flags.ant.xml
buildframework/helium/sf/java/legacy/tests/scenarii/bld.sh
buildframework/helium/sf/java/legacy/tests/scenarii/build.bat
buildframework/helium/sf/java/legacy/tests/scenarii/property/feature.ant.xml
buildframework/helium/sf/java/legacy/tests/scenarii/test/build.xml
buildframework/helium/sf/java/legacy/tests/src/com/nokia/ant/HeliumLoggerTest.java
buildframework/helium/sf/java/logging/src/com/nokia/helium/logger/ant/listener/Handler.java
buildframework/helium/sf/java/logging/src/com/nokia/helium/logger/ant/listener/StatusAndLogListener.java
buildframework/helium/sf/java/logging/src/com/nokia/helium/logger/ant/types/StageLogging.java
buildframework/helium/sf/java/signaling/src/com/nokia/helium/signal/Notifier.java
buildframework/helium/sf/java/signaling/src/com/nokia/helium/signal/SignalExceptionMessage.java
buildframework/helium/sf/java/signaling/src/com/nokia/helium/signal/SignalNeverFailMessage.java
buildframework/helium/sf/java/signaling/src/com/nokia/helium/signal/SignalStatus.java
buildframework/helium/sf/java/signaling/src/com/nokia/helium/signal/SignalStatusList.java
buildframework/helium/sf/java/signaling/src/com/nokia/helium/signal/ant/SignalList.java
buildframework/helium/sf/java/signaling/src/com/nokia/helium/signal/ant/types/SMSNotifier.java
buildframework/helium/sf/java/signaling/src/templates/email.html.ftl
buildframework/helium/sf/java/signaling/src/templates/email_default.html.ftl
buildframework/helium/sf/java/signaling/src/templates/email_subject.txt.ftl
buildframework/helium/sf/java/signaling/tests/antunit/signaling_test.ant.xml
buildframework/helium/sf/python/pythoncore/lib/ats3/matti/MattiDrops.py
buildframework/helium/sf/python/pythoncore/lib/ats3/matti/__init__.py
buildframework/helium/sf/python/pythoncore/lib/ats3/matti/template/matti_demo.xml
buildframework/helium/sf/python/pythoncore/lib/ats3/matti2.py
buildframework/helium/sf/python/pythoncore/lib/ats3/matti_template.xml
buildframework/helium/sf/python/pythoncore/lib/pythoncorecpythontests/test_matti.py
buildframework/helium/sf/python/pythoncore/lib/pythoncorecpythontests/test_matti2.py
buildframework/helium/sf/python/pythoncore/tests/data/matti/matti_template.xml
buildframework/helium/sf/python/pythoncore/tests/data/matti/test.rb
buildframework/helium/sf/python/pythoncore/tests/data/matti/test_all_present.xml
buildframework/helium/sf/python/pythoncore/tests/data/matti/test_all_present_sierra_disabled.xml
buildframework/helium/tools/common/templates/codescanner/codescanner.ant.xml.ftl
buildframework/helium/tools/common/templates/codescanner/codescanner.mk.ftl
buildframework/helium/tools/common/templates/coverity/coverity.summary.html.ftl
buildframework/helium/tools/common/templates/coverity/coverity.summary.xml.ftl
buildframework/helium/tools/common/templates/db2xml.xml.ftl
buildframework/helium/tools/common/templates/ido/ido-ant-copy.xml.ftl
buildframework/helium/tools/common/templates/ido/ido-cenrep-gen.xml.ftl
buildframework/helium/tools/common/templates/ido/ido-cmt-ant.xml.ftl
buildframework/helium/tools/common/templates/ido/ido-confml-validate.ant.xml.ftl
buildframework/helium/tools/common/templates/ido/ido-export.ant.xml.ftl
buildframework/helium/tools/common/templates/ido/ido-robot-zip.ant.xml.ftl
buildframework/helium/tools/common/templates/ido/ready.txt.ftl
buildframework/helium/tools/common/templates/ido/task-publish.ant.xml.ftl
buildframework/helium/tools/common/templates/ido/zip-ant-wa-copy.xml.ftl
buildframework/helium/tools/common/templates/integration/build-duplicates.html.ftl
buildframework/helium/tools/common/templates/integration/internal-exports.html.ftl
buildframework/helium/tools/common/templates/integration/validate-policy.log.ftl
buildframework/helium/tools/common/templates/integration/validate-policy.log.xml.ftl
buildframework/helium/tools/common/templates/quality/cone-validate.xml.ftl
buildframework/helium/tools/preparation/bom/bom.html.ftl
buildframework/helium/tools/preparation/bom/bom.txt.ftl
buildframework/helium/tools/preparation/bom/bom_delta.html.ftl
buildframework/helium/tools/preparation/bom/bom_delta.txt.ftl
buildframework/helium/tools/quality/compatibility_analyser/ca_config_template.txt
--- a/sbsv1/buildsystem/group/bld.inf	Sun Oct 10 15:22:15 2010 +0300
+++ b/sbsv1/buildsystem/group/bld.inf	Mon Oct 11 11:16:47 2010 +0100
@@ -32,8 +32,8 @@
 ../extension/base/base_rvct_common.mk		/epoc32/tools/makefile_templates/base/base_rvct_common.mk		
 ../extension/base/bootstrap.meta 	/epoc32/tools/makefile_templates/base/bootstrap.meta			
 ../extension/base/bootstrap.mk 		/epoc32/tools/makefile_templates/base/bootstrap.mk
-../extension/base/bootstrap.flm 	/epoc32/tools/makefile_templates/base/bootstrap.flm			
-../extension/base/bootstrap.xml		/epoc32/tools/makefile_templates/base/bootstrap.xml			
+//../extension/base/bootstrap.flm 	/epoc32/tools/makefile_templates/base/bootstrap.flm			
+//../extension/base/bootstrap.xml		/epoc32/tools/makefile_templates/base/bootstrap.xml			
 ../extension/base/config.meta 		/epoc32/tools/makefile_templates/base/config.meta		
 ../extension/base/config.mk 		/epoc32/tools/makefile_templates/base/config.mk		
 ../extension/base/copy_default.meta 	/epoc32/tools/makefile_templates/base/copy_default.meta