diff options
| -rw-r--r-- | development/vscode/product.json.patch (renamed from development/vscode/vscode-1.11.2.patch) | 26 | ||||
| -rw-r--r-- | development/vscode/vscode.SlackBuild | 22 | ||||
| -rw-r--r-- | development/vscode/vscode.info | 6 |
3 files changed, 37 insertions, 17 deletions
diff --git a/development/vscode/vscode-1.11.2.patch b/development/vscode/product.json.patch index 5485624b17..283fd1c494 100644 --- a/development/vscode/vscode-1.11.2.patch +++ b/development/vscode/product.json.patch @@ -1,23 +1,35 @@ -diff -ur vscode-1.11.1.old/product.json vscode-1.11.1/product.json ---- vscode-1.11.1.old/product.json 2017-04-06 10:42:12.000000000 -0300 -+++ vscode-1.11.1/product.json 2017-04-07 06:58:55.098944732 -0300 -@@ -14,5 +14,16 @@ - "win32ShellNameShort": "C&ode - OSS", +diff -rupN a/product.json b/product.json +--- a/product.json 2016-09-08 14:48:45.419566181 -0700 ++++ b/product.json 2016-09-08 14:49:43.000000000 -0700 +@@ -1,6 +1,6 @@ + { + "nameShort": "Code - OSS", +- "nameLong": "Code - OSS", ++ "nameLong": "Visual Studio Code - OSS", + "applicationName": "code-oss", + "dataFolderName": ".vscode-oss", + "win32MutexName": "vscodeoss", +@@ -12,5 +12,19 @@ + "win32AppUserModelId": "Microsoft.CodeOSS", "darwinBundleIdentifier": "com.visualstudio.code.oss", "reportIssueUrl": "https://github.com/Microsoft/vscode/issues/new", - "urlProtocol": "code-oss" -} \ No newline at end of file + "urlProtocol": "code-oss", ++ "welcomePage": "http://go.microsoft.com/fwlink/?LinkId=723048", ++ "quality": "stable", + "extensionsGallery": { + "serviceUrl": "https://marketplace.visualstudio.com/_apis/public/gallery", + "cacheUrl": "https://vscode.blob.core.windows.net/gallery/index", + "itemUrl": "https://marketplace.visualstudio.com/items" + }, -+ "welcomePage": "http://go.microsoft.com/fwlink/?LinkId=723048", + "documentationUrl": "http://go.microsoft.com/fwlink/?LinkID=533484#vscode", + "releaseNotesUrl": "http://go.microsoft.com/fwlink/?LinkID=533483#vscode", + "twitterUrl": "http://go.microsoft.com/fwlink/?LinkID=533687", + "requestFeatureUrl": "http://go.microsoft.com/fwlink/?LinkID=533482", -+ "privacyStatementUrl": "http://go.microsoft.com/fwlink/?LinkID=528096&clcid=0x409" ++ "privacyStatementUrl": "http://go.microsoft.com/fwlink/?LinkID=528096&clcid=0x409", ++ "commit": "376c52b955428d205459bea6619fc161fc8faacf", ++ "date": "2017-06-14T03:04:00Z" +} + diff --git a/development/vscode/vscode.SlackBuild b/development/vscode/vscode.SlackBuild index 8609019502..c8ab786394 100644 --- a/development/vscode/vscode.SlackBuild +++ b/development/vscode/vscode.SlackBuild @@ -23,7 +23,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=vscode -VERSION=${VERSION:-1.11.2} +VERSION=${VERSION:-1.13.1} +COMMIT=${COMMIT:-376c52b955428d205459bea6619fc161fc8faacf} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -62,19 +63,26 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -patch -p1 < $CWD/vscode-$VERSION.patch +patch -p1 < ${CWD}/product.json.patch ./scripts/npm.sh install --arch=$BUILDARCH --unsafe-perm -node --max_old_space_size=1024 ./node_modules/.bin/gulp vscode-linux-${BUILDARCH}-min +node --max_old_space_size=2048 ./node_modules/.bin/gulp vscode-linux-${BUILDARCH} cd $TMP/VSCode-linux-$BUILDARCH +# https://github.com/Microsoft/vscode/issues/25935 +( cd resources/app + sed -i "s/\"date\".*/&\n\t\"commit\": \"${COMMIT}\",/" product.json +) + # Copy binary files -mkdir -p "${PKG}/opt/${PRGNAM}-${VERSION}" -cp -rvf * "${PKG}/opt/${PRGNAM}-${VERSION}" -R +mkdir -p "${PKG}/usr/share/code-oss" +cp -rvf * "${PKG}/usr/share/code-oss" -R # Link executable to usr/bin mkdir -p "${PKG}/usr/bin" -ln -s "/opt/${PRGNAM}-${VERSION}/bin/code-oss" "${PKG}"/usr/bin/code-oss +( cd $PKG/usr/bin + ln -s "../share/code-oss/bin/code-oss" +) # copy desktop shortcut mkdir -p "${PKG}/usr/share/applications" @@ -82,7 +90,7 @@ install -m644 "${CWD}/${PRGNAM}.desktop" "${PKG}/usr/share/applications/${PRGNAM # copy vscode icon mkdir -p "${PKG}/usr/share/icons" -install -m644 "${PKG}/opt/${PRGNAM}-${VERSION}/resources/app/resources/linux/code.png" \ +install -m644 "${PKG}/usr/share/code-oss/resources/app/resources/linux/code.png" \ "${PKG}/usr/share/icons/${PRGNAM}.png" # copy license and slackbuild diff --git a/development/vscode/vscode.info b/development/vscode/vscode.info index e198c60ae7..0db66a5a09 100644 --- a/development/vscode/vscode.info +++ b/development/vscode/vscode.info @@ -1,8 +1,8 @@ PRGNAM="vscode" -VERSION="1.11.2" +VERSION="1.13.1" HOMEPAGE="https://code.visualstudio.com/" -DOWNLOAD="https://github.com/Microsoft/vscode/archive/1.11.2/vscode-1.11.2.tar.gz" -MD5SUM="3a5118d66e4a45687fc56e3934ea320c" +DOWNLOAD="https://github.com/Microsoft/vscode/archive/1.13.1/vscode-1.13.1.tar.gz" +MD5SUM="48c92eb01bdbbceacfa07054177b19bb" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="nodejs" |