[releng] fix building server

vladdu · vladdu · commit 1bd5ad26ac85 · 2017-04-21T21:14:02.000+02:00
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -123,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
diff --git a/ide/build b/ide/build
@@ -5,4 +5,7 @@ source ../build_utils.sh
 dir=`pwd`
 prj=`basename $dir`
 
+export LOCALDEP_DIR=`pwd`
+export REBAR_COLOR="low"
+
 build_project ../rebar3 $prj 19 "$@"
diff --git a/ide/rebar.config b/ide/rebar.config
@@ -6,7 +6,7 @@
     ]}.
 
 {deps, [
-        {erlide_common, {localdep, "common/apps/erlide_common"}},
+        {erlide_common, {localdep, "../common/apps/erlide_common"}},
         {jsx, ".*", {git, "https://github.com/talentdeficit/jsx.git", {branch, "v2.8.2"}}}
     ]}.
 
diff --git a/ide/rebar.lock b/ide/rebar.lock
@@ -1,4 +1,4 @@
-[{<<"erlide_common">>,{localdep,"common/apps/erlide_common"},0},
+[{<<"erlide_common">>,{localdep,"../common/apps/erlide_common"},0},
  {<<"jsx">>,
   {git,"https://github.com/talentdeficit/jsx.git",
        {ref,"d4b6d3dc5fd9e759ff7a0c476654ea5124f5bae9"}},

Original file line number	Diff line number	Diff line change
`@@ -123,8 +123,8 @@ def buildEclipse() {`
`123`	`123`	`}`
`124`	`124`
`125`	`125`	`def buildServer() {`
`126`		`- sh "cd server && ./build && cd .."`
`127`		`- step([$class: 'ArtifactArchiver', artifacts: "server/erlide_ide", fingerprint: true])`
	`126`	`+ sh "cd ide && ./build escriptize && cd .."`
	`127`	`+ step([$class: 'ArtifactArchiver', artifacts: "ide/_build/default/bin/erlide_ide", fingerprint: true])`
`128`	`128`	`}`
`129`	`129`
`130`	`130`	`@NonCPS`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-[{<<"erlide_common">>,{localdep,"common/apps/erlide_common"},0},`
	`1`	`+[{<<"erlide_common">>,{localdep,"../common/apps/erlide_common"},0},`
`2`	`2`	`{<<"jsx">>,`
`3`	`3`	`{git,"https://github.com/talentdeficit/jsx.git",`
`4`	`4`	`{ref,"d4b6d3dc5fd9e759ff7a0c476654ea5124f5bae9"}},`