a
/
code-server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add commit, date, and checksums to product.json

This commit is contained in:
Asher 2019-08-02 20:29:48 -05:00
parent 5b64cb3400
commit 950bfce420
No known key found for this signature in database
GPG Key ID: D63C1EF81242354A
2 changed files with 38 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/tasks.bash
View File

@ -72,10 +72,10 @@ function build-code-server() {
cd "${buildPath}" && yarn --production --force --build-from-source cd "${buildPath}" && yarn --production --force --build-from-source
rm "${buildPath}/"{package.json,yarn.lock,.yarnrc} rm "${buildPath}/"{package.json,yarn.lock,.yarnrc}
local json="{\"codeServerVersion\": \"${codeServerVersion}\"}" local packageJson="{\"codeServerVersion\": \"${codeServerVersion}\"}"
cp -r "${sourcePath}/.build/extensions" "${buildPath}" cp -r "${sourcePath}/.build/extensions" "${buildPath}"
node "${rootPath}/scripts/merge.js" "${sourcePath}/package.json" "${rootPath}/scripts/package.json" "${buildPath}/package.json" "${json}" node "${rootPath}/scripts/merge.js" "${sourcePath}/package.json" "${rootPath}/scripts/package.json" "${buildPath}/package.json" "${packageJson}"
node "${rootPath}/scripts/merge.js" "${sourcePath}/product.json" "${rootPath}/scripts/product.json" "${buildPath}/product.json" node "${rootPath}/scripts/merge.js" "${sourcePath}/.build/product.json" "${rootPath}/scripts/product.json" "${buildPath}/product.json"
cp -r "${sourcePath}/out-vscode${min}" "${buildPath}/out" cp -r "${sourcePath}/out-vscode${min}" "${buildPath}/out"
# Only keep production dependencies for the server. # Only keep production dependencies for the server.

43
scripts/vscode.patch
View File

@ -11,7 +11,7 @@ index 0dd2e5abf1..fc6875f3c2 100644
// All Build // All Build
const compileBuildTask = task.define('compile-build', task.parallel(compileClientBuildTask, compileExtensionsBuildTask)); const compileBuildTask = task.define('compile-build', task.parallel(compileClientBuildTask, compileExtensionsBuildTask));
diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
index 84a6be26e8..7fb43686cd 100644 index 84a6be26e8..e50618be3a 100644
--- a/build/gulpfile.vscode.js --- a/build/gulpfile.vscode.js
+++ b/build/gulpfile.vscode.js +++ b/build/gulpfile.vscode.js
@@ -34,7 +34,8 @@ const deps = require('./dependencies'); @@ -34,7 +34,8 @@ const deps = require('./dependencies');
@ -85,16 +85,27 @@ index 84a6be26e8..7fb43686cd 100644
), ),
common.optimizeTask({ common.optimizeTask({
src: 'out-build', src: 'out-build',
@@ -127,6 +134,20 @@ const minifyVSCodeTask = task.define('minify-vscode', task.series( @@ -104,7 +111,8 @@ const optimizeVSCodeTask = task.define('optimize-vscode', task.series(
common.minifyTask('out-vscode', `${sourceMappingURLBase}/core`) header: BUNDLED_FILE_HEADER,
out: 'out-vscode',
bundleInfo: undefined
- })
+ }),
+ () => writeProduct()
));
@@ -124,9 +132,36 @@ const minifyVSCodeTask = task.define('minify-vscode', task.series(
util.rimraf('out-vscode-min'),
optimizeIndexJSTask
),
- common.minifyTask('out-vscode', `${sourceMappingURLBase}/core`)
+ common.minifyTask('out-vscode', `${sourceMappingURLBase}/core`),
+ () => writeProduct('out-vscode-min')
)); ));
+function packageExtensionsTask() { +function packageExtensionsTask() {
+ return () => { + return () => ext.packageExtensionsStream().pipe(vfs.dest(path.join(root, '.build')));
+ const destination = path.join(root, ".build");
+ const sources = ext.packageExtensionsStream();
+ return sources.pipe(vfs.dest(destination));
+ };
+} +}
+gulp.task(task.define('extensions-build-package', task.series( +gulp.task(task.define('extensions-build-package', task.series(
+ compileExtensionsBuildTask, + compileExtensionsBuildTask,
@ -102,6 +113,22 @@ index 84a6be26e8..7fb43686cd 100644
+))); +)));
+gulp.task(optimizeVSCodeTask); +gulp.task(optimizeVSCodeTask);
+gulp.task(minifyVSCodeTask); +gulp.task(minifyVSCodeTask);
+function writeProduct(sourceFolderName) {
+ const checksums = sourceFolderName && computeChecksums(sourceFolderName, [
+ 'vs/workbench/workbench.web.api.js',
+ 'vs/workbench/workbench.web.api.css',
+ 'vs/code/browser/workbench/workbench.html',
+ 'vs/code/browser/workbench/workbench.js',
+ 'vs/server/src/cli.js',
+ 'vs/server/src/uriTransformer.js',
+ 'vs/server/src/login/index.html'
+ ]);
+ const date = new Date().toISOString();
+ const productJsonUpdate = { commit, date, checksums };
+ return gulp.src(['product.json'], { base: '.' })
+ .pipe(json(productJsonUpdate))
+ .pipe(vfs.dest(path.join(root, '.build')));
+}
+ +
// Package // Package