Merge branch 'pu'

Jenkinsfile

@@ -123,8 +123,8 @@ def buildEclipse() {
 }
 
 def buildServer() {
-    sh "cd ide && ./build escriptize && cd .."
-    step([$class: 'ArtifactArchiver', artifacts: "ide/_build/default/bin/erlide_ide", fingerprint: true])
+    sh "cd server && ./build escriptize && cd .."
+    step([$class: 'ArtifactArchiver', artifacts: "server/_build/default/bin/erlide_server", fingerprint: true])
 }
 
 @NonCPS

build

@@ -25,16 +25,22 @@ export REBAR_COLOR="low"
 #export QUIET=1
 
 main() {
-    arg=$1
+    arg=${1:-compile}
 
     setup_otp
     find . -name build | xargs chmod u+x
 
-    if [ "$arg" != "test" ]; then
-        cmds="do clean -a, compile -v"
-    else
-        cmds="do eunit -c -v, cover -v"
-    fi
+    case "$arg" in
+        "compile")
+            cmds="do clean -a, compile -v"
+            ;;
+        "test")
+            cmds="do eunit -c -v, cover -v"
+            ;;
+        "verify")
+            cmds="do xref, dialyzer"
+            ;;
+    esac
 
     set -e
     cd common
@@ -43,6 +49,11 @@ main() {
     ./build $cmds
     cd ../ide
     ./build $cmds
+    cd ../server
+    ./build $cmds
+    if [ "$arg" == "compile" ] ; then
+        ./build escriptize
+    fi
 
     cd ..
 }

build_utils.sh

@@ -1,6 +1,6 @@
 #! /bin/bash -e
 
-declare -A OTP_VSNS=( ["17"]="17.5" ["18"]="18.3" ["19"]="19.3")
+declare -A OTP_VSNS=( ["17"]="17.5" ["18"]="18.3" ["19"]="19.3" ["20"]="20.0")
 
 build_project() {
     REBAR=$1
@@ -11,7 +11,7 @@ build_project() {
     shift
 
     echo ""
-    echo "Building $PRJ with OTP ${OTP_VSNS[$VSN]}..."
+    echo "Building --$PRJ-- with OTP ${OTP_VSNS[$VSN]}..."
     ~/erlide_tools/${OTP_VSNS[$VSN]}/bin/escript $REBAR "$@"
 }
 

common/apps/erlide_builder/src/erlide_builder.erl

@@ -71,7 +71,7 @@ compile_options(F, Options, OutputDir) ->
 format_compile_msg(L, Marker) when is_list(L) ->
     lists:flatten([format_compile_msg(X, Marker) || X <- L]);
 format_compile_msg({File, L}, Marker) ->
-    [{Ln, File, iolist_to_binary(M:format_error(D)), Marker} || {Ln, M, D} <- L].
+    [{Ln, File, unicode:characters_to_binary(lists:flatten(M:format_error(D))), Marker} || {Ln, M, D} <- L].
 
 mk_includes(L) ->
     [{i, X} || X <- L].

debugger/build

@@ -6,7 +6,8 @@ cd ../erlide_debugger_18
 ./build "$@"
 cd ../erlide_debugger_19
 ./build "$@"
-
+cd ../erlide_debugger_20
+./build "$@"
 cd ../erlide_debugger
 ./build "$@"
 

debugger/erlide_debugger_20/.project

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

debugger/erlide_debugger_20/.settings/org.eclipse.core.resources.prefs

@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=ISO-8859-1

debugger/erlide_debugger_20/.settings/org.erlide.core.prefs

@@ -0,0 +1,17 @@
+backend_version=19.0
+compiler/warn_deprecated_function=true
+compiler/warn_export_all=true
+compiler/warn_export_vars=true
+compiler/warn_obsolete_guard=true
+compiler/warn_shadow_vars=true
+compiler/warn_unused_function=true
+compiler/warn_unused_import=true
+compiler/warn_unused_record=true
+compiler/warn_unused_vars=true
+eclipse.preferences.version=1
+external_includes=
+external_modules=
+include_dirs=include;
+output_dir=ebin
+source_dirs=src;
+use_pathz=false

debugger/erlide_debugger_20/build

@@ -0,0 +1,8 @@
+#! /bin/bash
+
+source ../../build_utils.sh
+
+dir=`pwd`
+prj=`basename $dir`
+
+build_project ../../rebar3 $prj 20 "$@"