Merge pull request #1904 from atom/ks-remove-apm-submodule

Remove apm submodule

.gitignore

@@ -12,4 +12,3 @@ debug.log
 docs/output
 docs/includes
 spec/fixtures/evil-files/
-/apm

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "vendor/apm"]
-	path = vendor/apm
-	url = https://github.com/atom/apm.git

apm/README.md

@@ -0,0 +1 @@
+This folder is where APM is installed to so that it is bundled with Atom.

apm/package.json

@@ -0,0 +1,11 @@
+{
+  "name": "atom-bundled-apm",
+  "description": "Atom's bundled APM",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/atom/atom.git"
+  },
+  "dependencies": {
+    "atom-package-manager": "0.41.0"
+  }
+}

script/bootstrap

@@ -25,7 +25,6 @@ function executeCommands(commands, done, index) {
     done(null);
 }
 
-var apmVendorPath = path.resolve(__dirname, '..', 'vendor', 'apm');
 var apmInstallPath = path.resolve(__dirname, '..', 'apm');
 if (!fs.existsSync(apmInstallPath))
   fs.mkdirSync(apmInstallPath);
@@ -42,11 +41,8 @@ var packagesToDedupe = ['fs-plus', 'humanize-plus', 'oniguruma', 'roaster', 'sea
 var echoNewLine = process.platform == 'win32' ? 'echo.' : 'echo';
 
 var commands = [
-  'git submodule --quiet sync',
-  'git submodule --quiet update --recursive --init',
   {command: 'npm' + npmFlags + 'install --quiet', options: {cwd: path.resolve(__dirname, '..', 'build'), ignoreStdout: true}},
-  {command: npmPath + npmFlags + 'install --quiet', options: {cwd: apmVendorPath, ignoreStdout: true}},
-  {command: npmPath + npmFlags + 'install --quiet ' + apmVendorPath, options: {cwd: apmInstallPath, ignoreStdout: true}},
+  {command: npmPath + npmFlags + 'install --quiet', options: {cwd: apmInstallPath, ignoreStdout: true}},
   echoNewLine,
   apmPath + ' clean ' + apmFlags,
   apmPath + ' install --quiet ' + apmFlags,

script/clean

@@ -18,7 +18,6 @@ var commands = [
   [__dirname, '..', 'node_modules'],
   [__dirname, '..', 'build', 'node_modules'],
   [__dirname, '..', 'apm', 'node_modules'],
-  [__dirname, '..', 'vendor', 'apm', 'node_modules'],
   [__dirname, '..', 'atom-shell'],
   [home, '.atom', '.node-gyp'],
   [home, '.atom', 'storage'],