v0.32.0

Author: vladdu

CHANGES

@@ -1,3 +1,11 @@
+List of user visible changes between 0.31.0 and 0.32.0 (20160414)
+
+f065b88 #261 - search installed runtimes in $PATH too
+e1424fb append RpcMonitor stats to erlide.log instead of a separate file
+db786e5 make location of erlide log configurable
+454e9a0 output only warnings and errors in the console
+f8c4860 #263 - Add action to clear all model caches
+
 List of user visible changes between 0.30.1 and 0.31.0 (20160404)
 
 334684b indentation: add 'indent width' parameter

Jenkinsfile

@@ -0,0 +1,30 @@
+node {
+	wrap([$class: 'TimestamperBuildWrapper']) {
+		stage 'Checkout'
+			//checkout scm
+			//currentBuild.setName("${env.GIT_REVISION}__${env.BUILD_NUMBER}") 
+
+		stage 'Compile'
+			wrap([$class: 'Xvfb', additionalOptions: '', assignedLabels: '', displayNameOffset: 1, installationName: 'xvfb', screen: '1024x768x24']) {
+				sh "bundle install"
+				sh "rake -f org.erlide.releng/Rakefile build_help run_tests"
+			}
+
+		stage 'Analyze'
+			step([$class: 'WarningsPublisher', canComputeNew: false, canResolveRelativePaths: false, consoleParsers: [[parserName: 'Buckminster']], defaultEncoding: '', excludePattern: '', healthy: '', includePattern: '', messagesPattern: '', unHealthy: ''])
+
+			step([$class: 'TasksPublisher', canComputeNew: false, defaultEncoding: '', excludePattern: '', healthy: '', high: 'FIXME,XXX', low: '', normal: 'TODO', pattern: '**/*.java,**/*.?rl,**/*.xtend', unHealthy: ''])
+
+			step([$class: 'AnalysisPublisher', canComputeNew: false, defaultEncoding: '', healthy: '', unHealthy: ''])
+
+			step([$class: 'JUnitResultArchiver', testResults: '**/junit.xml,**/.eunit/*.xml'])
+
+			// locks
+
+			// jacoco
+
+		stage 'Publish'
+			//step([$class: 'ArtifactArchiver', artifacts: 'buildroot/**/*.*', fingerprint: true])
+	}
+}
+

org.erlide.backend.tests/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Backend Tests
 Bundle-SymbolicName: org.erlide.backend.tests
-Bundle-Version: 0.24.1.qualifier
+Bundle-Version: 0.32.0.qualifier
 Bundle-Vendor: erlide.org
 Fragment-Host: org.erlide.backend;bundle-version="0.19.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6

org.erlide.backend/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.erlide.backend;singleton:=true
-Bundle-Version: 0.24.19.qualifier
+Bundle-Version: 0.32.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin

org.erlide.backend/src/org/erlide/backend/debug/model/ErlangDebugTarget.java

@@ -27,11 +27,9 @@
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.IContributor;
-import org.eclipse.core.runtime.IExtensionRegistry;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.RegistryFactory;
 import org.eclipse.debug.core.DebugException;
 import org.eclipse.debug.core.DebugPlugin;
 import org.eclipse.debug.core.ILaunch;
@@ -41,13 +39,13 @@
 import org.eclipse.debug.core.model.IProcess;
 import org.eclipse.debug.core.model.IThread;
 import org.eclipse.jdt.annotation.NonNull;
+import org.erlide.backend.BackendUtils;
 import org.erlide.backend.api.IBackend;
 import org.erlide.backend.debug.BeamUtil;
 import org.erlide.backend.debug.DebuggerEventDaemon;
 import org.erlide.backend.debug.ErlangLineBreakpoint;
 import org.erlide.backend.debug.ErlideDebug;
 import org.erlide.backend.debug.IErlangDebugNode;
-import org.erlide.backend.internal.BackendActivator;
 import org.erlide.engine.ErlangEngine;
 import org.erlide.engine.model.IErlModel;
 import org.erlide.engine.model.root.ErlangProjectProperties;
@@ -56,8 +54,8 @@
 import org.erlide.util.IDisposable;
 import org.erlide.util.erlang.ErlUtils;
 import org.erlide.util.erlang.OtpErlang;
-import org.erlide.util.erlang.SignatureException;
 import org.erlide.util.erlang.OtpParserException;
+import org.erlide.util.erlang.SignatureException;
 import org.osgi.framework.Bundle;
 
 import com.ericsson.otp.erlang.OtpErlangAtom;
@@ -499,11 +497,10 @@ private void distributeDebuggerCode() {
 
         final List<OtpErlangTuple> modules = new ArrayList<OtpErlangTuple>(
                 debuggerModules.size());
+        final String ver = backend.getRuntime().getVersion().asMajor().toString()
+                .toLowerCase();
         for (final String module : debuggerModules) {
-            final String ver = backend.getRuntime().getVersion().asMajor().toString()
-                    .toLowerCase();
-            final String bundleName = "org.erlide.kernel.debugger." + ver;
-            OtpErlangBinary b = getDebuggerBeam(module, bundleName);
+            OtpErlangBinary b = getDebuggerBeam(module, "org.erlide.kernel.debugger.otp");
             if (b == null) {
                 b = getDebuggerBeam(module, "org.erlide.kernel.debugger");
             }
@@ -513,7 +510,7 @@ private void distributeDebuggerCode() {
                         filename, b);
                 modules.add(t);
             } else {
-                ErlLogger.warn("Could not find debugger module %s", module);
+                ErlLogger.warn("Could not find debugger module %s (%s)", module, ver);
             }
         }
         ErlideDebug.distributeDebuggerCode(backend.getOtpRpc(), modules);
@@ -532,10 +529,8 @@ private OtpErlangBinary getDebuggerBeam(final String module,
         final String beamname = module + ".beam";
         final Bundle bundle = Platform.getBundle(bundleName);
 
-        final IExtensionRegistry reg = RegistryFactory.getRegistry();
-        final IConfigurationElement[] els = reg
-                .getConfigurationElementsFor(BackendActivator.PLUGIN_ID, "codepath");
-
+        final IConfigurationElement[] els = BackendUtils
+                .getCodepathConfigurationElements();
         for (final IConfigurationElement el : els) {
             final IContributor c = el.getContributor();
             final String name = c.getName();
@@ -588,26 +583,30 @@ private List<String> getDebuggerModules() {
             ErlLogger.warn("debugger bundle was not found...");
             return new ArrayList<String>();
         }
-        final List<String> dbg_modules = getModulesFromBundle(debugger);
+        final List<String> dbg_modules = getModulesFromBundle(debugger, null);
 
-        final String ver = backend.getRuntime().getVersion().asMajor().toString()
-                .toLowerCase();
-        final Bundle debugger_otp = Platform
-                .getBundle("org.erlide.kernel.debugger." + ver);
+        final Bundle debugger_otp = Platform.getBundle("org.erlide.kernel.debugger.otp");
         if (debugger_otp == null) {
-            ErlLogger.warn("debugger %s bundle was not found...", ver);
+            ErlLogger.error("debugger bundle was not found!");
             return dbg_modules;
         }
-        final List<String> dbg_otp_modules = getModulesFromBundle(debugger_otp);
+        final String ver = backend.getRuntime().getVersion().asMajor().toString()
+                .toLowerCase();
+        final List<String> dbg_otp_modules = getModulesFromBundle(debugger_otp, ver);
 
         dbg_modules.addAll(dbg_otp_modules);
         return dbg_modules;
     }
 
-    private List<String> getModulesFromBundle(final Bundle bundle) {
+    private List<String> getModulesFromBundle(final Bundle bundle, final String ver) {
         final List<String> modules = Lists.newArrayList();
+        final String path = ver == null ? "/debugger" : "/debugger/" + ver;
         @SuppressWarnings("rawtypes")
-        final Enumeration beams = bundle.findEntries("/ebin", "*.beam", false);
+        final Enumeration beams = bundle.findEntries(path, "*.beam", false);
+        if (beams == null) {
+            ErlLogger.error("No beams found in %s!", bundle);
+            return modules;
+        }
         while (beams.hasMoreElements()) {
             final URL beam = (URL) beams.nextElement();
             modules.add(new Path(beam.getPath()).removeFileExtension().lastSegment());

org.erlide.branding/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: erlide - Erlang language tools
 Bundle-SymbolicName: org.erlide.branding;singleton:=true
-Bundle-Version: 0.30.0.qualifier
+Bundle-Version: 0.32.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
  org.eclipse.ui.intro.universal;bundle-version="3.2.500",

org.erlide.core.tests/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: erlide core Tests Fragment
 Bundle-SymbolicName: org.erlide.core.tests;singleton:=true
-Bundle-Version: 0.24.9.qualifier
+Bundle-Version: 0.32.0.qualifier
 Bundle-Vendor: erlide.org
 Fragment-Host: org.erlide.core;bundle-version="0.14.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6

org.erlide.core/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.erlide.core; singleton:=true
-Bundle-Version: 0.24.15.qualifier
+Bundle-Version: 0.32.0.qualifier
 Bundle-Activator: org.erlide.core.ErlangPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin

org.erlide.core/src/org/erlide/core/ErlangCore.java

@@ -8,8 +8,6 @@
  *******************************************************************************/
 package org.erlide.core;
 
-import java.text.SimpleDateFormat;
-import java.util.Date;
 import java.util.logging.Level;
 
 import org.eclipse.core.resources.ISaveContext;
@@ -48,14 +46,14 @@ public final class ErlangCore {
     private final ErlangCoreLogger logger;
 
     public ErlangCore(final Plugin plugin, final IWorkspace workspace,
-            final IExtensionRegistry extensionRegistry, final String logDir,
+            final IExtensionRegistry extensionRegistry,
             final ErlangDebugOptionsManager erlangDebugOptionsManager) {
         this.plugin = plugin;
         this.workspace = workspace;
         this.extensionRegistry = extensionRegistry;
         this.erlangDebugOptionsManager = erlangDebugOptionsManager;
         featureVersion = "?";
-        logger = new ErlangCoreLogger(plugin, logDir);
+        logger = new ErlangCoreLogger(plugin);
     }
 
     public void start() throws CoreException {
@@ -91,10 +89,9 @@ public void stop() {
         final String location = ResourcesPlugin.getWorkspace().getRoot().getLocation()
                 .toPortableString();
 
-        final String dateNow = new SimpleDateFormat("yyyyMMdd_HHmmss").format(new Date());
-
         RpcMonitor.cleanupOldLogs(location, "rpc_monitor");
-        RpcMonitor.dump(location + "/rpc_monitor-" + dateNow + ".dump");
+        ErlLogger.getInstance().dispose();
+        RpcMonitor.dump(ErlLogger.getInstance().getLogFile());
     }
 
     public IWorkspace getWorkspace() {
@@ -128,8 +125,8 @@ public void rollback(final ISaveContext context1) {
                 @Override
                 public void saving(final ISaveContext context1) throws CoreException {
                     try {
-                        InstanceScope.INSTANCE.getNode(
-                                plugin.getBundle().getSymbolicName()).flush();
+                        InstanceScope.INSTANCE
+                                .getNode(plugin.getBundle().getSymbolicName()).flush();
                     } catch (final BackingStoreException e) {
                         // ignore
                     }
@@ -157,8 +154,8 @@ public boolean isTracing(final String traceOption) {
         }
         final String globalTraceValue = Platform
                 .getDebugOption(ERLIDE_GLOBAL_TRACE_OPTION);
-        final String value = Platform.getDebugOption(ERLIDE_GLOBAL_TRACE_OPTION + "/"
-                + traceOption);
+        final String value = Platform
+                .getDebugOption(ERLIDE_GLOBAL_TRACE_OPTION + "/" + traceOption);
         if ("true".equalsIgnoreCase(globalTraceValue) && "true".equalsIgnoreCase(value)) {
             return true;
         }

org.erlide.core/src/org/erlide/core/ErlangCoreLogger.java

@@ -1,10 +1,13 @@
 package org.erlide.core;
 
+import java.io.File;
 import java.util.logging.Level;
 
 import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.MultiStatus;
+import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.Plugin;
 import org.eclipse.core.runtime.Status;
@@ -15,12 +18,12 @@ public class ErlangCoreLogger {
     private final Plugin plugin;
     private final ErlLogger logger;
 
-    public ErlangCoreLogger(final Plugin plugin, final String logDir) {
+    public ErlangCoreLogger(final Plugin plugin) {
         this.plugin = plugin;
         logger = ErlLogger.getInstance();
-        final String dir = getLogDir(logDir);
-        log(Level.INFO, "Erlide log is in " + dir);
-        logger.setLogDir(dir);
+        final String logFile = getLogFile();
+        log(Level.INFO, "Erlide log is in " + logFile);
+        logger.setLogFile(logFile);
     }
 
     public void debug(final String message) {
@@ -41,9 +44,8 @@ public void log(final IStatus status) {
 
     public void log(final Level lvl, final String status) {
         logger.log(lvl, status);
-        plugin.getLog().log(
-                new Status(getSeverityFromLevel(lvl), plugin.getBundle()
-                        .getSymbolicName(), status));
+        plugin.getLog().log(new Status(getSeverityFromLevel(lvl),
+                plugin.getBundle().getSymbolicName(), status));
     }
 
     public void log(final String msg, final Throwable thr) {
@@ -73,18 +75,20 @@ public void logErrorStatus(final String message, final IStatus status) {
         log(multi);
     }
 
-    public static String getLogDir(final String logDir) {
+    public static String getLogFile() {
         final IPreferencesService service = Platform.getPreferencesService();
-        final String key = "erlide_log_directory";
         final String pluginId = ErlangCore.PLUGIN_ID;
-        final String s = service.getString(pluginId, key, logDir, null);
-        String dir;
-        if (s != null) {
-            dir = s;
+        final String file = service.getString(pluginId, "log_file", "erlide.log", null);
+        final IPath path = new Path(file);
+        String location;
+        if (!path.isAbsolute()) {
+            final IPath wroot = ResourcesPlugin.getWorkspace().getRoot().getLocation();
+            location = wroot.append(file).toPortableString();
         } else {
-            dir = ResourcesPlugin.getWorkspace().getRoot().getLocation().toString();
+            location = file;
         }
-        return dir;
+        new File(location).getParentFile().mkdirs();
+        return location;
     }
 
     private static Level getLevelFromSeverity(final int severity) {