Skip to content

Commit

Permalink
Minimal changes to address project name change
Browse files Browse the repository at this point in the history
- Minimal changes required to reflect project name change #48
- New lock
- Updated ecosystem
- Version bump
  • Loading branch information
exsilium committed Oct 24, 2018
1 parent d5536d3 commit ef49a8f
Show file tree
Hide file tree
Showing 7 changed files with 145 additions and 138 deletions.
26 changes: 13 additions & 13 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -68,16 +68,16 @@ plugins-client/lib.ace/www/worker/worker-language.js plugins-client/lib.ace/www/
$(wildcard node_modules/ace/*/*) \
Makefile.dryice.js
mkdir -p plugins-client/lib.ace/www/worker
rm -rf /tmp/c9_worker_build
mkdir -p /tmp/c9_worker_build/ext
ln -s `pwd`/plugins-client/ext.language /tmp/c9_worker_build/ext/language
ln -s `pwd`/plugins-client/ext.codecomplete /tmp/c9_worker_build/ext/codecomplete
ln -s `pwd`/plugins-client/ext.jslanguage /tmp/c9_worker_build/ext/jslanguage
ln -s `pwd`/plugins-client/ext.csslanguage /tmp/c9_worker_build/ext/csslanguage
ln -s `pwd`/plugins-client/ext.htmllanguage /tmp/c9_worker_build/ext/htmllanguage
ln -s `pwd`/plugins-client/ext.linereport /tmp/c9_worker_build/ext/linereport
ln -s `pwd`/plugins-client/ext.linereport_php /tmp/c9_worker_build/ext/linereport_php
ln -s `pwd`/plugins-client/ext.linereport_python /tmp/c9_worker_build/ext/linereport_python
rm -rf /tmp/pln_worker_build
mkdir -p /tmp/pln_worker_build/ext
ln -s `pwd`/plugins-client/ext.language /tmp/pln_worker_build/ext/language
ln -s `pwd`/plugins-client/ext.codecomplete /tmp/pln_worker_build/ext/codecomplete
ln -s `pwd`/plugins-client/ext.jslanguage /tmp/pln_worker_build/ext/jslanguage
ln -s `pwd`/plugins-client/ext.csslanguage /tmp/pln_worker_build/ext/csslanguage
ln -s `pwd`/plugins-client/ext.htmllanguage /tmp/pln_worker_build/ext/htmllanguage
ln -s `pwd`/plugins-client/ext.linereport /tmp/pln_worker_build/ext/linereport
ln -s `pwd`/plugins-client/ext.linereport_php /tmp/pln_worker_build/ext/linereport_php
ln -s `pwd`/plugins-client/ext.linereport_python /tmp/pln_worker_build/ext/linereport_python
node Makefile.dryice.js worker
cp node_modules/ace/build/src/worker* plugins-client/lib.ace/www/worker

Expand All @@ -101,11 +101,11 @@ gzip:
gzip -9 -v -q -f $$i ; \
done

c9core: apf ace core worker mode theme
core: apf ace core worker mode theme

package_clean: helper_clean c9core ext
package_clean: helper_clean core ext

package: helper c9core ext
package: helper core ext

test check:
test/run-tests.sh
2 changes: 1 addition & 1 deletion Makefile.dryice.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ function main(args) {
var project = {
roots: [
ACE_HOME + "/lib",
"/tmp/c9_worker_build",
"/tmp/pln_worker_build",
__dirname + "/node_modules/treehugger/lib"
],
textPluginPattern: /^ace\/requirejs\/text!/
Expand Down
File renamed without changes.
14 changes: 7 additions & 7 deletions ecosystem.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"apps" : [{
"name" : "cloud9",
"name" : "pylon",
"script" : "server.js",
"args" : ["-l", "0.0.0.0", "-p", "8181", "--username", process.env.C9_USERNAME, "--password", process.env.C9_PASSWORD],
"args" : ["-l", "0.0.0.0", "-p", "8181", "--username", process.env.PLN_USERNAME, "--password", process.env.PLN_PASSWORD],
"node_args" : "",
"merge_logs" : true
}],
Expand All @@ -11,14 +11,14 @@
"staging" : {
"user" : process.env.PM2_DEPLOY_STAGING_USER,
"host" : process.env.PM2_DEPLOY_STAGING_HOST,
"repo" : "https://github.com/exsilium/cloud9.git",
"repo" : "https://github.com/pylonide/pylon.git",
"ref" : "origin/development",
"path" : "/home/" + process.env.PM2_DEPLOY_STAGING_USER + "/www/cloud9",
"path" : "/home/" + process.env.PM2_DEPLOY_STAGING_USER + "/www/pylon",
"ssh-options" : ["StrictHostKeyChecking=no", "PasswordAuthentication=no"],
"pre-setup" : "mkdir /home/" + process.env.PM2_DEPLOY_STAGING_USER + "/workspace",
"post-setup" : "echo 'export C9_USERNAME=" + process.env.PM2_DEPLOY_STAGING_USERNAME + "' >> ~/.bashrc && " +
"echo 'export C9_PASSWORD=" + process.env.PM2_DEPLOY_STAGING_PASSWORD + "' >> ~/.bashrc && " +
"echo 'export C9_WORKSPACE=/home/" + process.env.PM2_DEPLOY_STAGING_USER + "/workspace' >> ~/.bashrc",
"post-setup" : "echo 'export PLN_USERNAME=" + process.env.PM2_DEPLOY_STAGING_USERNAME + "' >> ~/.bashrc && " +
"echo 'export PLN_PASSWORD=" + process.env.PM2_DEPLOY_STAGING_PASSWORD + "' >> ~/.bashrc && " +
"echo 'export PLN_WORKSPACE=/home/" + process.env.PM2_DEPLOY_STAGING_USER + "/workspace' >> ~/.bashrc",
"pre-deploy" : "pm2 stop all; rm -rf node_modules",
"post-deploy" : "npm install && pm2 start ecosystem.json",
"env" : {
Expand Down
Loading

0 comments on commit ef49a8f

Please sign in to comment.