[Esbox-commits] r2079 - in trunk: org.maemo.esbox.scratchbox-feature org.maemo.esbox.scratchbox.sb1/META-INF org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/core

[eswartz at garage.maemo.org]

Author: eswartz
Date: 2009-09-01 21:31:38 +0300 (Tue, 01 Sep 2009)
New Revision: 2079

Modified:
   trunk/org.maemo.esbox.scratchbox-feature/feature.xml
   trunk/org.maemo.esbox.scratchbox.sb1/META-INF/MANIFEST.MF
   trunk/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/core/ApplyDoctoolsFixMarkerResolutionGenerator.java
Log:
Merge rev 2078 from work_Ed branch.  Remove autotools reference.

Modified: trunk/org.maemo.esbox.scratchbox-feature/feature.xml
===================================================================
--- trunk/org.maemo.esbox.scratchbox-feature/feature.xml	2009-09-01 18:28:14 UTC (rev 2078)
+++ trunk/org.maemo.esbox.scratchbox-feature/feature.xml	2009-09-01 18:31:38 UTC (rev 2079)
@@ -34,7 +34,6 @@
       <import feature="org.maemo.mica.protocol" version="2.0.0" match="greaterOrEqual"/>
       <import feature="org.maemo.mica.maemosdk" version="2.0.0" match="greaterOrEqual"/>
       <import feature="org.maemo.mica.linux" version="2.0.0" match="greaterOrEqual"/>
-      <import feature="org.maemo.mica.linux.autotools" version="2.0.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin

Modified: trunk/org.maemo.esbox.scratchbox.sb1/META-INF/MANIFEST.MF
===================================================================
--- trunk/org.maemo.esbox.scratchbox.sb1/META-INF/MANIFEST.MF	2009-09-01 18:28:14 UTC (rev 2078)
+++ trunk/org.maemo.esbox.scratchbox.sb1/META-INF/MANIFEST.MF	2009-09-01 18:31:38 UTC (rev 2079)
@@ -12,8 +12,7 @@
  org.maemo.esbox.scratchbox.ui;bundle-version="2.0.0",
  org.maemo.esbox.maemosdk.core;bundle-version="2.0.0",
  org.maemo.mica.linux.packages.core;bundle-version="2.0.0",
- org.maemo.mica.linux.packages.ui;bundle-version="2.0.0",
- org.maemo.mica.cpp.project.builder.autotools;bundle-version="2.0.0";resolution:=optional
+ org.maemo.mica.linux.packages.ui;bundle-version="2.0.0"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-Vendor: INdT / Nokia

Modified: trunk/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/core/ApplyDoctoolsFixMarkerResolutionGenerator.java
===================================================================
--- trunk/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/core/ApplyDoctoolsFixMarkerResolutionGenerator.java	2009-09-01 18:28:14 UTC (rev 2078)
+++ trunk/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/core/ApplyDoctoolsFixMarkerResolutionGenerator.java	2009-09-01 18:31:38 UTC (rev 2079)
@@ -33,7 +33,6 @@
 import org.maemo.mica.common.core.sdk.ISDKTarget;
 import org.maemo.mica.common.project.core.ProjectManager;
 import org.maemo.mica.common.ui.dialogs.DialogUtils;
-import org.maemo.mica.cpp.project.builder.autotools.MicaAutotoolsConstants;
 import org.maemo.mica.internal.api.common.core.sdk.BaseSDKTarget;
 
 /**
@@ -137,16 +136,14 @@
 	 */
 	public boolean hasResolutions(IMarker marker) {
 		try {
-			if (marker.getType().equals(MicaAutotoolsConstants.AUTOTOOLS_PROBLEM_MARKER_TYPE)) {
-				Object message = marker.getAttribute(IMarker.MESSAGE);
-				if (message != null && message.toString().contains("Your intltool is too old")) {
-					// make sure doctools is not already present
-					IResource rsrc = marker.getResource();
-					if (rsrc != null) {
-						ISDKTarget target = ProjectManager.getInstance().getSDKTarget(rsrc.getProject());
-						if (target instanceof IScratchbox1SDKTarget) {
-							return true;
-						}
+			Object message = marker.getAttribute(IMarker.MESSAGE);
+			if (message != null && message.toString().contains("Your intltool is too old")) {
+				// make sure doctools is not already present
+				IResource rsrc = marker.getResource();
+				if (rsrc != null) {
+					ISDKTarget target = ProjectManager.getInstance().getSDKTarget(rsrc.getProject());
+					if (target instanceof IScratchbox1SDKTarget) {
+						return true;
 					}
 				}
 			}