getting the upgrade test back to work (on windows)

Author: jantje

io.sloeber.core/src/io/sloeber/core/api/SloeberProject.java

@@ -191,7 +191,7 @@ public void run(IProgressMonitor internalMonitor) throws CoreException {
                     Common.log(new Status(IStatus.INFO, io.sloeber.core.Activator.getId(),
                             "Project conversion failed: ", e)); //$NON-NLS-1$
                 }
-                IndexerController.Index(project);
+                IndexerController.index(project);
             }
 
         };
@@ -325,7 +325,7 @@ public void run(IProgressMonitor internalMonitor) throws CoreException {
                 }
                 Common.log(new Status(Const.SLOEBER_STATUS_DEBUG, Activator.getId(),
                         "internal creation of project is done: " + realProjectName)); //$NON-NLS-1$
-                IndexerController.Index(newProjectHandle);
+                IndexerController.index(newProjectHandle);
             }
         };
 
@@ -575,18 +575,11 @@ private boolean readConfig(ICProjectDescription prjCDesc, boolean prjDescWritabl
 
         } else {
 
-            // no config files exist. try to save the day
-            if (IndexerController.isPosponed(myProject)) {
-                Common.log(new Status(IStatus.ERROR, io.sloeber.core.Activator.getId(),
-                        "Trying to get the configuration during project creation? This should not happen!!")); //$NON-NLS-1$
-            } else {
-                // Maybe this is a old Sloeber project with the data in the eclipse build
-                // environment variables
-                readConfigFromCDT(prjCDesc, prjDescWritable);
-
+            // Maybe this is a old Sloeber project with the data in the eclipse build
+            // environment variables
+            if (readConfigFromCDT(prjCDesc, prjDescWritable)) {
                 myNeedToPersist = true;
                 myNeedsClean = true;
-
             }
         }
         isInMemory = true;

io.sloeber.core/src/io/sloeber/core/listeners/IndexerController.java

@@ -38,7 +38,7 @@ public static void doNotIndex(IProject project) {
 		fProjects.add(project);
 		getIndexController();
 	}
-	public static void Index(IProject project) {
+	public static void index(IProject project) {
 		Common.log(new Status(Const.SLOEBER_STATUS_DEBUG, Activator.getId(),"index "+project.getName())); //$NON-NLS-1$
 		fProjects.remove(project);
 		ICProject cProject = CoreModel.getDefault().getCModel().getCProject(project.getName());

io.sloeber.core/src/io/sloeber/core/listeners/resourceChangeListener.java

@@ -31,10 +31,29 @@ public void resourceChanged(IResourceChangeEvent event) {
         IResourceDelta rootDelta = event.getDelta();
         for (IResourceDelta projectDelta : rootDelta.getAffectedChildren()) {
             IResourceDelta sloeberCfgDelta = projectDelta.findMember(new Path("sloeber.cfg"));
-            if (sloeberCfgDelta != null)
+            if (sloeberCfgDelta != null) {
                 if (sloeberCfgDelta.getKind() != IResourceDelta.REMOVED) {
-                    changedSloeberCfgFiles.add(sloeberCfgDelta.getResource().getProject());
+                    IProject iProject = sloeberCfgDelta.getResource().getProject();
+                    // stop the indexer
+                    IndexerController.doNotIndex(iProject);
+                    // log to process later
+                    changedSloeberCfgFiles.add(iProject);
                 }
+            } else {
+                // it is not a new type sloeber project check wether it is an old type sloeber
+                // project
+                IResourceDelta cProjectDelta = projectDelta.findMember(new Path(".cproject"));
+                if (cProjectDelta != null)
+                    if (projectDelta.getFlags() == IResourceDelta.OPEN) {
+                        // as it is a open of a cdt project assume it is a sloeber project.
+                        // We will find out later if not
+                        IProject iProject = cProjectDelta.getResource().getProject();
+                        // stop the indexer
+                        IndexerController.doNotIndex(iProject);
+                        // log to process later
+                        changedSloeberCfgFiles.add(iProject);
+                    }
+            }
         }
 
         // no sloeber.cfg files have been modified
@@ -51,14 +70,16 @@ protected IStatus run(IProgressMonitor monitor) {
                     @Override
                     public void run(IProgressMonitor monitor) throws CoreException {
                         for (IProject curProject : changedSloeberCfgFiles) {
-                            SloeberProject curSloeberProject = SloeberProject.getSloeberProject(curProject, false);
-                            if (curSloeberProject == null) {
-                                // this is not a sloeber project;
-                                //make it one?
-                            }
-                            else{
-                                curSloeberProject.sloeberCfgChanged();
+                            if (curProject.isOpen()) {
+                                SloeberProject curSloeberProject = SloeberProject.getSloeberProject(curProject, false);
+                                if (curSloeberProject == null) {
+                                    // this is not a sloeber project;
+                                    // make it one?
+                                } else {
+                                    curSloeberProject.sloeberCfgChanged();
+                                }
                             }
+                            IndexerController.index(curProject);
                         }
                     }
                 };

io.sloeber.core/src/io/sloeber/core/toolchain/SloeberConfigurationVariableSupplier.java

@@ -19,6 +19,7 @@
 public class SloeberConfigurationVariableSupplier implements IConfigurationEnvironmentVariableSupplier {
     // variables per configuration
     private Map<String, Map<String, String>> myConfigValues = new HashMap<>();
+    private boolean myIsConfigurationBussy = false;
 
     @Override
     public IBuildEnvironmentVariable getVariable(String variableName, IConfiguration configuration,
@@ -74,10 +75,16 @@ private void initializeIfNotYetDone(IConfiguration configuration) {
             // we have some data; asume it is correct
             return;
         }
+        if (myIsConfigurationBussy) {
+            // We are already configurating. Don't go in an endless loop
+            return;
+        }
+        myIsConfigurationBussy = true;
         ICConfigurationDescription confDesc = ManagedBuildManager.getDescriptionForConfiguration(configuration);
         ICProjectDescription projDesc = confDesc.getProjectDescription();
         IProject project = projDesc.getProject();
         SloeberProject sloeberProject = SloeberProject.getSloeberProject(project, false);
         sloeberProject.configure(projDesc, false);
+        myIsConfigurationBussy = false;
     }
 }