# HG changeset patch
# User timkelly
# Date 1264703784 21600
# Node ID c04fe9c0541d4246857b08f2026436981394b7d5
# Parent  80149e1e5ec658cb8346ac4e977ad9816d5ddf6a# Parent  381d143dacc3cbc54e5564fce7b87fa45713aff3
merge commit

diff -r 80149e1e5ec6 -r c04fe9c0541d builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideSBSv1Builder.java
--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideSBSv1Builder.java	Thu Jan 28 12:35:30 2010 -0600
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideSBSv1Builder.java	Thu Jan 28 12:36:24 2010 -0600
@@ -2451,7 +2451,7 @@
 		final IPreferenceStore prefsStore = CarbideBuilderPlugin.getDefault().getPreferenceStore();
 		
 		if (prefsStore.getBoolean(BuilderPreferenceConstants.PREF_DONT_PROMPT_FOR_DEPENDENCY_MISMATCH) == false &&
-				areWeManagingTheMakeFiles && !makeFileHasOurChanges(makefile)) {
+				areWeManagingTheMakeFiles && !makeFileHasOurChanges(makefile) && !WorkbenchUtils.isJUnitRunning()) {
 			
 			// if they are not then the user must have been building from the command line.  this means that
 			// any dependency files that exist could be stale so we need to delete them.  we also need to
diff -r 80149e1e5ec6 -r c04fe9c0541d builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/EnvironmentVarsInfo2.java
--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/EnvironmentVarsInfo2.java	Thu Jan 28 12:35:30 2010 -0600
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/EnvironmentVarsInfo2.java	Thu Jan 28 12:36:24 2010 -0600
@@ -461,8 +461,11 @@
 	private Map<String, String> stringArrayToMap(String[] array) {
 		Map<String, String> map = new HashMap<String, String>(array.length);
 		for (String var : array) {
-			String[] split = var.split("=");
-			map.put(split[0], split[1]);
+			int idx = var.indexOf('=');
+			if (idx > 0)
+				map.put(var.substring(0, idx), var.substring(idx+1));
+			else if (var.length() > 0)
+				map.put(var, "");
 		}
 		
 		return map;
diff -r 80149e1e5ec6 -r c04fe9c0541d debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/CarbideMainTab.java
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/CarbideMainTab.java	Thu Jan 28 12:35:30 2010 -0600
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/CarbideMainTab.java	Thu Jan 28 12:36:24 2010 -0600
@@ -89,11 +89,12 @@
 	}
 
 	@Override
-	public void createControl(Composite parent) {
-		super.createControl(parent);
+	public void createBuildOptionGroup(final Composite parent, int colSpan){
+		super.createBuildOptionGroup(parent, colSpan);
 		fEnableBuildButton.setData(".uid", "CMainTab.EnableBuildButton"); //$NON-NLS-1$ //$NON-NLS-2$
 		fDisableBuildButton.setData(".uid", "CMainTab.DisableBuildButton"); //$NON-NLS-1$ //$NON-NLS-2$
 		fWorkspaceSettingsButton.setData(".uid", "CMainTab.WorkspaceSettingsButton"); //$NON-NLS-1$ //$NON-NLS-2$ 
 		fWorkpsaceSettingsLink.setData(".uid", "CMainTab.WorkspaceSettingsLink"); //$NON-NLS-1$ //$NON-NLS-2$
+		
 	}
 }
\ No newline at end of file