Ensure that parallel parsing sbs calls pass on --no-depend-generate and --no-depend-include (as these influence makefile generation).
Make .DEFAULT a double-colon target, so we don't have to worry about duplicate instances due to -include.
Code review updates.
--- a/sbsv2/raptor/lib/flm/e32abiv2.flm Thu Feb 04 14:09:55 2010 +0000
+++ b/sbsv2/raptor/lib/flm/e32abiv2.flm Fri Feb 05 18:31:38 2010 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+# Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
# All rights reserved.
# This component and the accompanying materials are made available
# under the terms of the License "Eclipse Public License v1.0"
--- a/sbsv2/raptor/lib/flm/gccxml.flm Thu Feb 04 14:09:55 2010 +0000
+++ b/sbsv2/raptor/lib/flm/gccxml.flm Fri Feb 05 18:31:38 2010 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+# Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
# All rights reserved.
# This component and the accompanying materials are made available
# under the terms of the License "Eclipse Public License v1.0"
--- a/sbsv2/raptor/lib/flm/tools2common.flm Thu Feb 04 14:09:55 2010 +0000
+++ b/sbsv2/raptor/lib/flm/tools2common.flm Fri Feb 05 18:31:38 2010 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+# Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
# All rights reserved.
# This component and the accompanying materials are made available
# under the terms of the License "Eclipse Public License v1.0"
--- a/sbsv2/raptor/lib/flm/win32.flm Thu Feb 04 14:09:55 2010 +0000
+++ b/sbsv2/raptor/lib/flm/win32.flm Fri Feb 05 18:31:38 2010 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+# Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
# All rights reserved.
# This component and the accompanying materials are made available
# under the terms of the License "Eclipse Public License v1.0"
--- a/sbsv2/raptor/python/raptor.py Thu Feb 04 14:09:55 2010 +0000
+++ b/sbsv2/raptor/python/raptor.py Fri Feb 05 18:31:38 2010 +0000
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+# Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
# All rights reserved.
# This component and the accompanying materials are made available
# under the terms of the License "Eclipse Public License v1.0"
@@ -329,6 +329,12 @@
if build.timing == True:
cli_options += " --timing"
+ if build.noDependInclude == True:
+ cli_options += " --no-depend-include"
+
+ if build.noDependGenerate == True:
+ cli_options += " --no-depend-generate"
+
nc = len(self.children)
number_blocks = build.jobs
--- a/sbsv2/raptor/python/raptor_cli.py Thu Feb 04 14:09:55 2010 +0000
+++ b/sbsv2/raptor/python/raptor_cli.py Fri Feb 05 18:31:38 2010 +0000
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+# Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
# All rights reserved.
# This component and the accompanying materials are made available
# under the terms of the License "Eclipse Public License v1.0"
--- a/sbsv2/raptor/python/raptor_make.py Thu Feb 04 14:09:55 2010 +0000
+++ b/sbsv2/raptor/python/raptor_make.py Fri Feb 05 18:31:38 2010 +0000
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+# Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
# All rights reserved.
# This component and the accompanying materials are made available
# under the terms of the License "Eclipse Public License v1.0"
@@ -178,13 +178,14 @@
# Unless dependency processing has been eschewed via the CLI, use a .DEFAULT target to
# trap missing dependencies (ignoring user config files that we know are usually absent)
- if not Raptor.noDependGenerate and not Raptor.noDependInclude:
+ if not (self.raptor.noDependGenerate or self.raptor.noDependInclude):
self.makefile_prologue += """
+
$(FLMHOME)/user/final.mk:
$(FLMHOME)/user/default.flm:
$(FLMHOME)/user/globals.mk:
-.DEFAULT:
+.DEFAULT::
@echo "<warning>Missing dependency detected: $@</warning>"
"""
--- a/sbsv2/raptor/test/smoke_suite/dependencies.py Thu Feb 04 14:09:55 2010 +0000
+++ b/sbsv2/raptor/test/smoke_suite/dependencies.py Fri Feb 05 18:31:38 2010 +0000
@@ -16,6 +16,7 @@
from raptor_tests import AntiTargetSmokeTest
from raptor_meta import BldInfFile
+import os
def run():
t = AntiTargetSmokeTest()
@@ -181,6 +182,10 @@
]
t.targets = hostPlatformTargets
t.run(hostPlatform)
+
+ # clean-up
+ os.remove("smoke_suite/test_resources/dependencies/dependency.cpp")
+ os.remove("smoke_suite/test_resources/dependencies/dependency.rss")
t.id = "98"
t.name = "dependencies"
--- a/sbsv2/raptor/test/unit_suite/raptor_cli_unit.py Thu Feb 04 14:09:55 2010 +0000
+++ b/sbsv2/raptor/test/unit_suite/raptor_cli_unit.py Fri Feb 05 18:31:38 2010 +0000
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
# All rights reserved.
# This component and the accompanying materials are made available
# under the terms of the License "Eclipse Public License v1.0"