Merge pull request #2612 from ajaxorg/fusm

Get rid of SourceMint + (kind of) Windows support

Author: Mostafa Eweda

README.md

@@ -34,31 +34,23 @@ We support the newer versions of Chrome, Firefox and Safari.
 
 ## Installation and Usage
 
+If installing on Windows, please refer to [Installation on Windows](##installation-on-windows-experimental).
+
 Requirements:
 
   * NodeJS `>= 0.6.16`
   * NPM `>= 1.1.16`
-  * libxml-dev
+  * libxml2-dev
 
 Install:
-```sh
-# Be sure you have sourcemint installed:
-npm install -g sm
-
-# Then:
-sm clone --dev https://github.com/ajaxorg/cloud9/tree/master cloud9
-
-# or
-git clone https://github.com/ajaxorg/cloud9.git cloud9
-cd cloud9
-sm install
-```
 
+    git clone https://github.com/ajaxorg/cloud9.git
+    cd cloud9
+    npm install
 
-The above install steps create a `cloud9` directory in your current directory. Just `cd` into it
-and run `bin/cloud9.sh` to start:
+The above install steps create a `cloud9` directory with a `bin/cloud9.sh`
+script that can be used to start Cloud9:
 
-    cd cloud9
     bin/cloud9.sh
 
 Optionally, you may specify the directory you'd like to edit:
@@ -84,59 +76,34 @@ Cloud9 is compatible with all connect authentication layers,
 to implement your own, please see the `plugins-server/cloud9.connect.basic-auth` plugin
 on how we added basic authentication.
 
-## Updating
-
-To update to the latest version (if this doesn't work, just make a fresh clone):
-
-    git pull
-    sm update
-
-`sm update` does not currently install missing npm dependencies. To do so use:
+## Installation on Windows (experimental)
 
-    sm install
+If you're running Cloud9 on Windows you'll have to follow these steps as well:
 
-## Development
+  * Install [Grep for Windows](http://gnuwin32.sourceforge.net/downlinks/grep.php)
+  * Add `C:\Program Files (x86)\GnuWin32\bin` to your [PATH](http://www.computerhope.com/issues/ch000549.htm)
+  * Open a new instance of `cmd` with elevated rights (right click 'Run as adminstrator')
+  * Now follow the steps under 'Install'
+  * *Please note that the `npm install` fails due to a libxml error, but you can ignore that for now.*
 
-To work on a subcomponent that is copied into node_modules, you can use `sm edit`.
-For instance, to work on ACE, run the following from the checkout root:
+To start Cloud9, please don't start through `bin/cloud9.sh` but rather via:
 
-    sm edit ace
+    node server.js [args]
 
-This is somewhat equivalent to `npm link` but instead of linking to a system wide
-shared package it clones the source into the node_modules/<name> directory.
-The idea is to only "edit" when you need to make changes and when done issue
-"sm save <name>" (not yet implemented) which will pull up sourcetree to commit,
-push code and switch package back to read mode (frozen). The status page
+Please note that there will be errors displayed regarding the `find` command,
+and that some features might not work.
+Feel free to improve the Windows experience and open a pull request.
 
-    sm status
-
-shows problematic and improvement oriented action steps to improve the state of
-the program. These relate to git status and dependency changes that need to be
-made to bring the dependencies up to date and ready to publish which leads to deployment.
-
-The line on the status page will have a (W) if it is setup for editing.
-
-To launch Sourcetree for all dirty/ahead repositories in the dependency
-tree use (need to have Sourcetree command-line tools installed (`stree`)):
-
-    sm fix
-
-The sourcemint package manager works alongside NPM so to link in a
-(system-wide shared) NPM package use:
-
-    rm -R node_modules/architect
-    npm link architect
-
-`sm` always works on your program sub-tree other than pulling things in
-from the cache.
+## Updating
 
-To view help info for cloud9 use:
+To update to the latest version (if this doesn't work, just make a fresh clone):
 
-    sm help
+    git pull
+    npm update
 
-To view usage info for `sm` use:
+`npm update` does not currently install missing dependencies. To do so use:
 
-    sm -h
+    npm install
 
 ## Open Source Projects Used
 

configs/default.js

@@ -5,14 +5,14 @@ var argv = require('optimist').argv;
 var path = require("path");
 
 var clientExtensions = {};
-var clientDirs = fs.readdirSync(__dirname + "/../plugins-client");
+var clientDirs = fs.readdirSync(path.join(__dirname, "/../plugins-client"));
 for (var i = 0; i < clientDirs.length; i++) {
     var dir = clientDirs[i];
     if (dir.indexOf("ext.") !== 0)
         continue;
 
     var name = dir.split(".")[1];
-    clientExtensions[name] = __dirname + "/../plugins-client/" + dir;
+    clientExtensions[name] = path.join(__dirname, "../plugins-client/", dir);
 }
 
 var projectDir = (argv.w && path.resolve(process.cwd(), argv.w)) || process.cwd();
@@ -30,10 +30,6 @@ var config = [
         packagePath: "connect-architect/connect",
         port: port,
         host: host
-    }, {
-        packagePath: "./cloud9.sourcemint",
-        prefix: "/static/bundles",
-        plugins: clientExtensions
     }, {
         packagePath: "connect-architect/connect.static",
         prefix: "/static"

package.json

@@ -10,12 +10,9 @@
         "cli": "./scripts/help.js"
     },
 
-    "pm": "sm",
     "dependencies": {
         "connect": "1.8.7",
 
-        "sourcemint-loader-js": "0.x",
-        "sourcemint-platform-nodejs": "0.x",
         "http-error": "0.0.1",
         "simple-template": "0.0.1",
 
@@ -32,7 +29,14 @@
         "smith": "0.1.9",
         "smith.io": "0.0.36",
         "vfs-architect": "0.0.2",
-        "jsDAV": "0.2.4"
+        "jsDAV": "https://github.com/ajaxorg/jsDAV/tarball/209289355d69adde11dbcd0c83e6dd24a6d9184a",
+
+        "ace": "https://github.com/ajaxorg/ace/tarball/cc2a2c9e056c6d4049f8849ec3ad72974de37177",
+        "apf": "https://github.com/ajaxorg/apf/tarball/145f65bd24ae83f041418dd01a9c51d278045f3f",
+        "asyncjs": "https://github.com/ajaxorg/async.js/tarball/0b4ed5608a32c280a7690b5f52883d8d1fc0de08",
+        "v8debug": "https://github.com/ajaxorg/lib-v8debug/tarball/d2fac9b09724cb2e75e2807191eace9bc27d3b52",
+        "packager": "https://github.com/ajaxorg/packager/tarball/bee2a82c6d5e2875024bfdc83937e98092ccf04f",
+        "treehugger": "https://github.com/ajaxorg/treehugger/tarball/b22d7ad712f76a7e7b1070ab339d567dfbf059b1"
     },
 
     "devDependencies": {
@@ -43,16 +47,6 @@
         "vfs-nodefs-adapter": "~0.3.0"
     },
 
-    "mappings": {
-        "ace":          ["npm", "https://github.com/ajaxorg/ace/tarball/cc2a2c9e056c6d4049f8849ec3ad72974de37177"],
-        "apf":          ["npm", "https://github.com/ajaxorg/apf/tarball/145f65bd24ae83f041418dd01a9c51d278045f3f"],
-        "asyncjs":      ["npm", "https://github.com/ajaxorg/async.js/tarball/0b4ed5608a32c280a7690b5f52883d8d1fc0de08"],
-        "v8debug":      ["npm", "https://github.com/ajaxorg/lib-v8debug/tarball/d2fac9b09724cb2e75e2807191eace9bc27d3b52"],
-        "packager":     ["npm", "https://github.com/ajaxorg/packager/tarball/bee2a82c6d5e2875024bfdc83937e98092ccf04f"],
-        "treehugger":   ["npm", "https://github.com/ajaxorg/treehugger/tarball/b22d7ad712f76a7e7b1070ab339d567dfbf059b1"],
-        "runjs":        ["npm", "https://github.com/c9/runjs/tarball/347ad9627fb4a1d63458bc66ea40f0bf1efbf05c"]
-    },
-
     "repository" : {
         "type" : "git",
          "url" : "git://github.com/ajaxorg/cloud9.git"

plugins-server/cloud9.client-plugins/package.json

@@ -11,8 +11,7 @@
         "provides": ["client-plugins"],
         "consumes": [
             "static",
-            "log",
-            "sourcemint"
+            "log"
         ]
     }
 }

plugins-server/cloud9.core/ide.js

@@ -45,7 +45,7 @@ var Ide = module.exports = function(options) {
         plugins: options.plugins,
         bundledPlugins: options.bundledPlugins || [],
         requirejsConfig: options.requirejsConfig,
-        projectName: options.projectName || this.workspaceDir.split("/").pop(),
+        projectName: options.projectName || Path.basename(this.workspaceDir),
         version: options.version,
         extra: options.extra,
         hosted: !!options.hosted,