fixed #16: ERROR: Only one copy of bitbake should be run against a build directory

Author: EugenWiens

client/out/src/extension.js

@@ -53,7 +53,7 @@
       "type": "object",
       "title": "Language Server for Bitbake configuration",
       "properties": {
-        "languageServerBitbake.loggingLevel": {
+        "vscode_bitbake.loggingLevel": {
           "type": "string",
           "enum": [
             "error",
@@ -63,17 +63,17 @@
           "default": "error",
           "description": "Adjust the logging level. error: only errors; info: only information that is useful for the user; debug: the same like info, but with additional debug informations"
         },
-        "languageServerBitbake.deepExamine": {
+        "vscode_bitbake.deepExamine": {
           "type": "boolean",
           "default": false,
           "description": "Activates an deeply examine. If a recipe export an extra package that have not the same name like the recipe file the normal scan will not find this packages. If you like to find the packages you have to activate this option."
         },
-        "languageServerBitbake.workingFolder": {
+        "vscode_bitbake.workingFolder": {
           "type": "string",
           "default": "vscode-bitbake-build",
           "description": "Use this setting to specify the build folder. Use other folder than for your regular 'build' to avoid collisions."
         },
-        "languageServerBitbake.pathToBashScriptInterpreter": {
+        "vscode_bitbake.pathToBashScriptInterpreter": {
           "type": "string",
           "default": "/bin/bash",
           "description": "This interpreter is used to run bash scripts"

client/package.json

@@ -28,7 +28,7 @@ export function activate(context: ExtensionContext) {
         // TODO: check new documentSelector
 		documentSelector: [{scheme: 'file', language: 'bitbake'}],
 		synchronize: {
-			configurationSection: 'languageServerBitbake',
+			configurationSection: 'vscode_bitbake',
 
 			// Notify the server about file changes to '.clientrc files contain in the workspace
 			fileEvents: [
@@ -41,7 +41,7 @@ export function activate(context: ExtensionContext) {
 	}
 
 	// Create the language client and start the client.
-	let disposable = new LanguageClient('languageServerBitbake', 'Language Server Bitbake', serverOptions, clientOptions).start();
+	let disposable = new LanguageClient('vscode_bitbake', 'Language Server Bitbake', serverOptions, clientOptions).start();
 
 	// Push the disposable to the context's subscriptions so that the 
 	// client can be deactivated on extension deactivation

client/src/extension.ts

@@ -37,8 +37,8 @@ export class BitBakeProjectScanner {
     private _includes: ElementInfo[] = new Array < ElementInfo > ();
     private _recipes: ElementInfo[] = new Array < ElementInfo > ();
     private _deepExamine: boolean = false;
-    private _settingsScriptInterpreter: string;
-    private _settingsWorkingFolder: string;
+    private _settingsScriptInterpreter: string = '/bin/bash';
+    private _settingsWorkingFolder: string = 'vscode-bitbake-build'; 
     private _settingsBitbakeSourceCmd: string = '.';
 
     private _scanStatus: ScannStatus = {
@@ -150,7 +150,9 @@ export class BitBakeProjectScanner {
                         priority: parseInt(tempElement[2])
                     };
 
-                    this._layers.push(layerElement);
+                    if( (layerElement.name !== undefined) && (layerElement.path!==undefined) && layerElement.priority !==undefined ) {
+                        this._layers.push(layerElement);
+                    }
                 }
             } catch (error) {
                 logger.error(`can not scan available layers error: ${error}`);
@@ -344,8 +346,9 @@ export class BitBakeProjectScanner {
 
     private executeCommandInBitBakeEnvironment(command: string): string {
         let scriptContent: string = this.generateBitBakeCommandScriptFileContent(command);
-        let scriptFileName: string = 'executeBitBakeCmd.sh';
+        let scriptFileName: string = this._projectPath + '/executeBitBakeCmd.sh';
         fs.writeFileSync(scriptFileName, scriptContent );
+        fs.chmodSync(scriptFileName, '0755');
 
         return this.executeCommand(scriptFileName);
     }

server/src/BitBakeProjectScanner.ts

@@ -73,10 +73,10 @@ documents.onDidChangeContent((change) => {
 
 // The settings interface describe the server relevant settings part
 interface Settings {
-	languageServerBitbake: LanguageServerBitbakeSettings;
+	vscode_bitbake: BitbakeSettings;
 }
 
-interface LanguageServerBitbakeSettings {
+interface BitbakeSettings {
 	loggingLevel: string;
 	deepExamine: boolean;
 	workingFolder: string;
@@ -91,10 +91,10 @@ function setSymbolScanner( newSymbolScanner: SymbolScanner ) {
 
 connection.onDidChangeConfiguration((change) => {
 	let settings = < Settings > change.settings;
-	bitBakeProjectScanner.deepExamine = settings.languageServerBitbake.deepExamine;
-	logger.level = settings.languageServerBitbake.loggingLevel;
-	bitBakeProjectScanner.workingPath = settings.languageServerBitbake.workingFolder;
-	bitBakeProjectScanner.scriptInterpreter = settings.languageServerBitbake.pathToBashScriptInterpreter;
+	bitBakeProjectScanner.deepExamine = settings.vscode_bitbake.deepExamine;
+	logger.level = settings.vscode_bitbake.loggingLevel;
+	bitBakeProjectScanner.workingPath = settings.vscode_bitbake.workingFolder;
+	bitBakeProjectScanner.scriptInterpreter = settings.vscode_bitbake.pathToBashScriptInterpreter;
 });
 
 connection.onDidChangeWatchedFiles((change) => {