Merge pull request #28 from aws/test_patches

add script for patching/copy resource/build

Author: aws-spenceng

.gitignore

@@ -1 +1,2 @@
-.DS_Store
+.DS_Store
+.pc

README.md

@@ -8,16 +8,16 @@ Whenever we create a new branch with `vscode` pointing to a specific commit, thi
 
 ## Patching Execution
 
-To properly patch, please follow instructions below:
+To properly patch, please run script:
 
-* After cloning the repo, run `git submodule init` and `git submodule update` to initialize the `vscode` submodule.
-* Use `quilt` to apply patches in sequence using `quilt push -a` from the root directory. 
-    - Install quilt on mac - `brew install quilt`
-* Copy resources with the shell script (also in the root directory) by running these commands:
-    - `chmod +x copy-resources.sh`
-    - `./copy-resources.sh`
+`sh ./scripts/install.sh`
 
-The above steps will result in changes being applied to the `vscode` folder.
+This script will:
+- use `quilt` to pop any existing patches.
+- update the submodule to verify the local version is in parity with source
+- apply all patches with `quilt` from `./patches`
+- runs `./scripts/copy-resource.sh` that will copy patched version of code - oss from `./vscode` into `./patched-vscode` folder along with icon(s) and svg(s) from `./resources` folder
+- runs `yarn install` and downloads built in extensions on patched submodule
 
 ## Troubleshooting and Feedback
 

patches/sagemaker-integration.diff

@@ -100,7 +100,7 @@ Index: sagemaker-code-editor/vscode/product.json
  	"applicationName": "code-oss",
  	"dataFolderName": ".vscode-oss",
  	"win32MutexName": "vscodeoss",
-@@ -34,53 +34,17 @@
+@@ -34,52 +34,16 @@
  	"urlProtocol": "code-oss",
  	"webviewContentExternalBaseUrlTemplate": "https://{{uuid}}.vscode-cdn.net/insider/ef65ac1ba57f57f2a3961bfe94aa20481caca4c6/out/vs/workbench/contrib/webview/browser/pre/",
  	"builtInExtensions": [
@@ -165,9 +165,6 @@ Index: sagemaker-code-editor/vscode/product.json
 +	"linkProtectionTrustedDomains": [
 +		"https://open-vsx.org"
  	]
--}
-\ No newline at end of file
-+}
 Index: sagemaker-code-editor/vscode/src/vs/platform/product/common/product.ts
 ===================================================================
 --- sagemaker-code-editor.orig/vscode/src/vs/platform/product/common/product.ts

copy-resources.sh renamed to scripts/copy-resources.sh

@@ -0,0 +1,32 @@
+#!/bin/bash
+set -e
+
+# Set current project root
+PROJ_ROOT=$(pwd)
+
+# Clean out patches
+printf "\n======== Cleaning out patches ========\n"
+quilt pop -a
+
+# make sure module is current
+printf "\n======== Updating submodule ========\n"
+git submodule update --init
+
+# Apply patches
+printf "\n======== Applying patches ========\n"
+{
+    quilt push -a --leave-rejects --color=auto 
+} || {
+        printf "\nPatching error, review logs!\n"
+        find ./vscode -name "*.rej"
+        exit 1
+}
+
+# Copy resources
+printf "\n======== Copy resources ========\n"
+sh ${PROJ_ROOT}/scripts/copy-resources.sh
+
+# Build the project
+printf "\n======== Building project in ${PROJ_ROOT}/vscode ========\n"
+yarn --cwd "${PROJ_ROOT}/vscode" install --pure-lockfile --verbose
+yarn --cwd "${PROJ_ROOT}/vscode" download-builtin-extensions