mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-02-16 18:46:40 -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:
@@ -3,16 +3,16 @@
|
||||
# Copyright (c) Microsoft Corporation. All rights reserved.
|
||||
# Licensed under the Source EULA. See License.txt in the project root for license information.
|
||||
|
||||
# If root, ensure that --user-data-dir is specified
|
||||
# If root, ensure that --user-data-dir or --file-write is specified
|
||||
if [ "$(id -u)" = "0" ]; then
|
||||
for i in $@
|
||||
do
|
||||
if [[ $i == --user-data-dir=* ]]; then
|
||||
DATA_DIR_SET=1
|
||||
if [[ $i == --user-data-dir || $i == --user-data-dir=* || $i == --file-write ]]; then
|
||||
CAN_LAUNCH_AS_ROOT=1
|
||||
fi
|
||||
done
|
||||
if [ -z $DATA_DIR_SET ]; then
|
||||
echo "It is recommended to start SQL Operations Studio as a normal user. To run as root, you must specify an alternate user data directory with the --user-data-dir argument." 1>&2
|
||||
if [ -z $CAN_LAUNCH_AS_ROOT ]; then
|
||||
echo "You are trying to start SQL Operations Studio as a super user which is not recommended. If you really want to, you must specify an alternate user data directory using the --user-data-dir argument." 1>&2
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
@@ -1,18 +1,18 @@
|
||||
Name: @@NAME@@
|
||||
Version: @@VERSION@@
|
||||
Release: @@RELEASE@@.el7
|
||||
Summary: SQL Operations Studio
|
||||
Summary: Code editing. Redefined.
|
||||
Group: Development/Tools
|
||||
Vendor: Microsoft Corporation
|
||||
Packager: Microsoft Corporation
|
||||
Packager: Visual Studio Code Team <vscode-linux@microsoft.com>
|
||||
License: @@LICENSE@@
|
||||
URL: https://github.com/microsoft/sqlopsstudio
|
||||
URL: https://code.visualstudio.com/
|
||||
Icon: @@NAME@@.xpm
|
||||
Requires: @@DEPENDENCIES@@
|
||||
AutoReq: 0
|
||||
|
||||
%description
|
||||
SQL Operations Studio is a data management tool that enables you to work with SQL Server, Azure SQL DB, and SQL DW from Linux. See https://docs.microsoft.com/en-us/sql/sql-operations-studio/what-is for documentation.
|
||||
Visual Studio Code is a new choice of tool that combines the simplicity of a code editor with what developers need for the core edit-build-debug cycle. See https://code.visualstudio.com/docs/setup/linux for installation instructions and FAQ.
|
||||
|
||||
%install
|
||||
mkdir -p %{buildroot}/usr/share/@@NAME@@
|
||||
|
||||
@@ -1,30 +1,3 @@
|
||||
#!/bin/sh
|
||||
|
||||
if test "$1" = "classic"; then
|
||||
shift
|
||||
case $SNAP_ARCH in
|
||||
amd64)
|
||||
TRIPLET="x86_64-linux-gnu"
|
||||
;;
|
||||
armhf)
|
||||
TRIPLET="arm-linux-gnueabihf"
|
||||
;;
|
||||
arm64)
|
||||
TRIPLET="aarch64-linux-gnu"
|
||||
;;
|
||||
*)
|
||||
TRIPLET="$(uname -p)-linux-gnu"
|
||||
;;
|
||||
esac
|
||||
|
||||
# TODO: Swap LD lib paths whenever processes are launched
|
||||
export LD_LIBRARY_PATH_OLD=$LD_LIBRARY_PATH
|
||||
export LD_LIBRARY_PATH=$SNAP/usr/lib:$SNAP/usr/lib/$TRIPLET:$LD_LIBRARY_PATH
|
||||
export LD_LIBRARY_PATH=$SNAP/lib:$SNAP/lib/$TRIPLET:$LD_LIBRARY_PATH
|
||||
fi
|
||||
|
||||
# Correct the TMPDIR path for Chromium Framework/Electron to ensure
|
||||
# libappindicator has readable resources.
|
||||
export TMPDIR=$XDG_RUNTIME_DIR
|
||||
|
||||
exec ${SNAP}/bin/desktop-launch $@
|
||||
exec "$@" --executed-from="$(pwd)" --pid=$$
|
||||
|
||||
@@ -13,17 +13,21 @@ parts:
|
||||
code:
|
||||
plugin: dump
|
||||
source: .
|
||||
after:
|
||||
- desktop-gtk2
|
||||
stage-packages:
|
||||
- gconf2
|
||||
- libasound2
|
||||
- libgconf2-4
|
||||
- libnotify4
|
||||
- libnspr4
|
||||
- libnss3
|
||||
- libpcre3
|
||||
- libpulse0
|
||||
- libxss1
|
||||
- libxtst6
|
||||
# desktop-gtk2 deps below
|
||||
- libxkbcommon0
|
||||
- libgtk2.0-0
|
||||
# - unity-gtk2-module
|
||||
- libappindicator1
|
||||
prime:
|
||||
- -usr/share/dh-python
|
||||
electron-launch:
|
||||
@@ -31,12 +35,8 @@ parts:
|
||||
source: .
|
||||
organize:
|
||||
electron-launch: bin/electron-launch
|
||||
prime:
|
||||
- -monitor.sh
|
||||
- -OLD_VERSION
|
||||
- -*.bz2
|
||||
|
||||
apps:
|
||||
@@NAME@@:
|
||||
command: bin/electron-launch classic ${SNAP}/usr/share/@@NAME@@/bin/@@NAME@@
|
||||
command: bin/electron-launch ${SNAP}/usr/share/@@NAME@@/bin/@@NAME@@
|
||||
desktop: usr/share/applications/@@NAME@@.desktop
|
||||
Reference in New Issue
Block a user