Merge branch 'pu'

Author: vladdu

.gitignore

@@ -24,3 +24,6 @@ build/
 TEST-*.*
 
 
+
+server/erlide_ide
+*.crashdump

Jenkinsfile

@@ -25,7 +25,16 @@ pipeline {
 			steps{
 				script {
 					compile()
-					analyze()
+					analyze1()
+				}
+			}
+		}
+
+		stage('Test') {
+			steps{
+				script {
+					test()
+					analyze2()
 				}
 			}
 		}
@@ -61,14 +70,9 @@ pipeline {
 
 def checkout() {
     deleteDir()
-    if(env.BRANCH_NAME != null) { // multi branch
-        checkout scm
-        git_branch = env.BRANCH_NAME
-    } else {
-        git url: '[email protected]:vladdu/erlide_kernel.git', branch: 'pu'
-        sh 'git symbolic-ref --short HEAD > GIT_BRANCH'
-        git_branch=readFile('GIT_BRANCH').trim()
-    }
+    checkout scm
+    git_branch = env.BRANCH_NAME
+
     sh('git rev-parse HEAD > GIT_COMMIT')
     git_commit=readFile('GIT_COMMIT')
     short_commit=git_commit.take(6)
@@ -79,13 +83,24 @@ def checkout() {
 def compile() {
     sh "chmod u+x build"
     sh "./build"
+     sleep 2L
+}
+
+def test() {
+    sh "chmod u+x build"
+    sh "./build test"
+    sleep 2L
+    sh "find . -name \"TEST-*.xml\" -exec xargs rename -v 's/\"//' {} \\;"
 }
 
-def analyze() {
-    step([$class: 'WarningsPublisher', canComputeNew: false, canResolveRelativePaths: false,
-        consoleParsers: [[parserName: 'Erlang Compiler (erlc)']],
+def analyze1() {
+    step([$class: 'WarningsPublisher', canComputeNew: false, canResolveRelativePaths: true, canRunOnFailed: true,
+        consoleParsers: [[parserName: 'Erlang Compiler (erlc)'], [parserName: 'Maven']],
         excludePattern: '', healthy: '', includePattern: '', messagesPattern: '', unHealthy: ''])
     step([$class: 'TasksPublisher', canComputeNew: false, excludePattern: '**/_build/**/*.*', healthy: '', high: 'FIXME,XXX', low: '', normal: 'TODO', pattern: '**/*.erl,**/*.hrl', unHealthy: ''])
+}
+
+def analyze2() {
     step([$class: 'AnalysisPublisher', canComputeNew: false, healthy: '', unHealthy: ''])
     step([$class: 'JUnitResultArchiver', allowEmptyResults: true, testResults: '**/TEST*.xml'])
 	//step([$class: 'JacocoPublisher', exclusionPattern: '', sourcePattern: '**/src/'])
@@ -108,8 +123,8 @@ def buildEclipse() {
 }
 
 def buildServer() {
-    sh "cd server && ./build && cd .."
-    step([$class: 'ArtifactArchiver', artifacts: "server/erlide_ide", fingerprint: true])
+    sh "cd ide && ./build escriptize && cd .."
+    step([$class: 'ArtifactArchiver', artifacts: "ide/_build/default/bin/erlide_ide", fingerprint: true])
 }
 
 @NonCPS

build

@@ -25,11 +25,18 @@ export REBAR_COLOR="low"
 #export QUIET=1
 
 main() {
+    arg=$1
+
     setup_otp
     find . -name build | xargs chmod u+x
 
-    cmds="do clean -a, compile, eunit -c -v, cover -v"
+    if [ "$arg" != "test" ]; then
+        cmds="do clean -a, compile -v"
+    else
+        cmds="do eunit -c -v, cover -v"
+    fi
 
+    set -e
     cd common
     ./build $cmds
     cd ../debugger
@@ -40,4 +47,4 @@ main() {
     cd ..
 }
 
-time main
+main "$@"

build_utils.sh

@@ -1,6 +1,6 @@
-#! /bin/bash
+#! /bin/bash -e
 
-declare -A OTP_VSNS=( ["17"]="17.5" ["18"]="18.3" ["19"]="19.2")
+declare -A OTP_VSNS=( ["17"]="17.5" ["18"]="18.3" ["19"]="19.3")
 
 build_project() {
     REBAR=$1

common/apps/erlide_builder/.project

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>erlide_builder</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.erlide.core.erlbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.erlide.core.erlnature</nature>
+	</natures>
+</projectDescription>

common/apps/erlide_builder/.settings/org.erlide.core.prefs

@@ -0,0 +1,7 @@
+backend_version=17.0
+eclipse.preferences.version=1
+external_includes=
+external_modules=
+include_dirs=include;
+output_dir=ebin
+source_dirs=src;

common/apps/erlide_builder/.settings/org.erlide.model.prefs

@@ -0,0 +1,3 @@
+builderData=INTERNAL|compile|clean|test|
+configType=INTERNAL
+eclipse.preferences.version=1

common/apps/erlide_common/include/.keep renamed to common/apps/erlide_builder/include/.keep

@@ -4,7 +4,6 @@
    {erlide_context, builder},
    {registered,   []},
    {applications, [kernel, stdlib, erlide_common]},
-   {env,          []},
-   {mod, {erlide_builder_app, []}}
+   {env,          []}
    ]}
 .