From 8f2cdae0ebba6a073d04a5d5e5b374a38565ae67 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 24 Apr 2014 14:47:55 -0700 Subject: [PATCH 1/4] Install apm from npmjs.org --- package.json | 1 + script/bootstrap | 7 ++----- vendor/apm | 1 - 3 files changed, 3 insertions(+), 6 deletions(-) delete mode 160000 vendor/apm diff --git a/package.json b/package.json index 06fb8ff05..742845ad6 100644 --- a/package.json +++ b/package.json @@ -13,6 +13,7 @@ }, "license": "All Rights Reserved", "atomShellVersion": "0.11.10", + "apmVersion": "0.41.0", "dependencies": { "async": "0.2.6", "atom-keymap": "^0.18.0", diff --git a/script/bootstrap b/script/bootstrap index 5fbd39981..5b233d660 100755 --- a/script/bootstrap +++ b/script/bootstrap @@ -25,8 +25,8 @@ function executeCommands(commands, done, index) { done(null); } -var apmVendorPath = path.resolve(__dirname, '..', 'vendor', 'apm'); var apmInstallPath = path.resolve(__dirname, '..', 'apm'); +var apmVersion = JSON.parse(fs.readFileSync(path.resolve(__dirname, '..', 'package.json'))).apmVersion; if (!fs.existsSync(apmInstallPath)) fs.mkdirSync(apmInstallPath); if (!fs.existsSync(path.join(apmInstallPath, 'node_modules'))) @@ -42,11 +42,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 atom-package-manager@' + apmVersion, options: {cwd: apmInstallPath, ignoreStdout: true}}, echoNewLine, apmPath + ' clean ' + apmFlags, apmPath + ' install --quiet ' + apmFlags, diff --git a/vendor/apm b/vendor/apm deleted file mode 160000 index d349e4526..000000000 --- a/vendor/apm +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d349e4526388f8b5afc218beaa02ffeaf3a4f2e1 From b403f76d8176921422f3deee60ea381b2d8d87e5 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 24 Apr 2014 14:48:10 -0700 Subject: [PATCH 2/4] Remove .gitmodules --- .gitmodules | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 .gitmodules diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index e4335ef79..000000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "vendor/apm"] - path = vendor/apm - url = https://github.com/atom/apm.git From 950964eee3b0a102d76e1ec5de9952a32c0a9efe Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 24 Apr 2014 15:10:58 -0700 Subject: [PATCH 3/4] Remove directory that no longer exists --- script/clean | 1 - 1 file changed, 1 deletion(-) diff --git a/script/clean b/script/clean index 79f31d4b0..e55668215 100755 --- a/script/clean +++ b/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'], From e8090b16f3f1d164efbe621b14d14876c737fe04 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 24 Apr 2014 15:43:19 -0700 Subject: [PATCH 4/4] Move apm version to apm/package.json --- .gitignore | 1 - apm/README.md | 1 + apm/package.json | 11 +++++++++++ package.json | 1 - script/bootstrap | 3 +-- 5 files changed, 13 insertions(+), 4 deletions(-) create mode 100644 apm/README.md create mode 100644 apm/package.json diff --git a/.gitignore b/.gitignore index b2b4cf15a..1d0275d10 100644 --- a/.gitignore +++ b/.gitignore @@ -12,4 +12,3 @@ debug.log docs/output docs/includes spec/fixtures/evil-files/ -/apm diff --git a/apm/README.md b/apm/README.md new file mode 100644 index 000000000..0556f775f --- /dev/null +++ b/apm/README.md @@ -0,0 +1 @@ +This folder is where APM is installed to so that it is bundled with Atom. diff --git a/apm/package.json b/apm/package.json new file mode 100644 index 000000000..9ff4f7e39 --- /dev/null +++ b/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" + } +} diff --git a/package.json b/package.json index 742845ad6..06fb8ff05 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,6 @@ }, "license": "All Rights Reserved", "atomShellVersion": "0.11.10", - "apmVersion": "0.41.0", "dependencies": { "async": "0.2.6", "atom-keymap": "^0.18.0", diff --git a/script/bootstrap b/script/bootstrap index 5b233d660..4af047306 100755 --- a/script/bootstrap +++ b/script/bootstrap @@ -26,7 +26,6 @@ function executeCommands(commands, done, index) { } var apmInstallPath = path.resolve(__dirname, '..', 'apm'); -var apmVersion = JSON.parse(fs.readFileSync(path.resolve(__dirname, '..', 'package.json'))).apmVersion; if (!fs.existsSync(apmInstallPath)) fs.mkdirSync(apmInstallPath); if (!fs.existsSync(path.join(apmInstallPath, 'node_modules'))) @@ -43,7 +42,7 @@ var echoNewLine = process.platform == 'win32' ? 'echo.' : 'echo'; var commands = [ {command: 'npm' + npmFlags + 'install --quiet', options: {cwd: path.resolve(__dirname, '..', 'build'), ignoreStdout: true}}, - {command: npmPath + npmFlags + 'install --quiet atom-package-manager@' + apmVersion, options: {cwd: apmInstallPath, ignoreStdout: true}}, + {command: npmPath + npmFlags + 'install --quiet', options: {cwd: apmInstallPath, ignoreStdout: true}}, echoNewLine, apmPath + ' clean ' + apmFlags, apmPath + ' install --quiet ' + apmFlags,