mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-01-14 01:25:37 -05:00
Merge VS Code 1.21 source code (#1067)
* Initial VS Code 1.21 file copy with patches * A few more merges * Post npm install * Fix batch of build breaks * Fix more build breaks * Fix more build errors * Fix more build breaks * Runtime fixes 1 * Get connection dialog working with some todos * Fix a few packaging issues * Copy several node_modules to package build to fix loader issues * Fix breaks from master * A few more fixes * Make tests pass * First pass of license header updates * Second pass of license header updates * Fix restore dialog issues * Remove add additional themes menu items * fix select box issues where the list doesn't show up * formatting * Fix editor dispose issue * Copy over node modules to correct location on all platforms
This commit is contained in:
@@ -17,6 +17,12 @@ set CODE=".build\electron\%NAMESHORT%"
|
||||
node build\lib\electron.js
|
||||
if %errorlevel% neq 0 node .\node_modules\gulp\bin\gulp.js electron
|
||||
|
||||
:: Manage build-in extensions
|
||||
if "%1"=="--builtin" goto builtin
|
||||
|
||||
:: Sync built-in extensions
|
||||
node build\lib\builtInExtensions.js
|
||||
|
||||
:: Build
|
||||
if not exist out node .\node_modules\gulp\bin\gulp.js compile
|
||||
|
||||
@@ -34,6 +40,13 @@ set ELECTRON_ENABLE_STACK_DUMPING=1
|
||||
:: %CODE% --js-flags="--trace-hydrogen --trace-phase=Z --trace-deopt --code-comments --hydrogen-track-positions --redirect-code-traces" . %*
|
||||
|
||||
%CODE% . %*
|
||||
goto end
|
||||
|
||||
:builtin
|
||||
%CODE% build/builtin
|
||||
|
||||
:end
|
||||
|
||||
popd
|
||||
|
||||
endlocal
|
||||
endlocal
|
||||
@@ -24,6 +24,15 @@ function code() {
|
||||
# Get electron
|
||||
node build/lib/electron.js || ./node_modules/.bin/gulp electron
|
||||
|
||||
# Manage built-in extensions
|
||||
if [[ "$1" == "--builtin" ]]; then
|
||||
exec "$CODE" build/builtin
|
||||
return
|
||||
fi
|
||||
|
||||
# Sync built-in extensions
|
||||
node build/lib/builtInExtensions.js
|
||||
|
||||
# Build
|
||||
test -d out || ./node_modules/.bin/gulp compile
|
||||
|
||||
|
||||
Reference in New Issue
Block a user