From nobody Sun Apr 9 08:01:25 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PvPgq0RcTz4443m; Sun, 9 Apr 2023 08:01:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PvPgp13rFz3LFj; Sun, 9 Apr 2023 08:01:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681027286; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i8x7YMXRXRwHRCQIJz91LQeDb4yT1gkriYk974fnqCQ=; b=x+NPrxBjEiF+zrmGyDeDoiH7pjw/chchAEgm2g1MrDtwZ4IsO03gEvbSErCtLTLztFgEXQ OGUvIhvP9ScEfv7BqpQMQKX/f0QIheG/vX5TLgV3y70a2YQrUYsypbkWiONEFm0r7yoVNC dL2F7V/64fT4VJut7u7+19ykn6pzNffjy7J+YFue2Fe7oU9ZO2r3O1wR/n6uwIpZ7EXYBc ZaQCkRbH99ZrtcDHW6x0eecxVZ9sTxeBWodLEeUfVRyD7PdfNAgc22XhXjBqPuEWx7QO86 +zdSmF3v5xDFN7pX3JFIZWnPODOGKXiwIegNZ+JXDTKxnjSgEGNpMzP6Jc4SCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681027286; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i8x7YMXRXRwHRCQIJz91LQeDb4yT1gkriYk974fnqCQ=; b=vnROntfa9jHGU1EYahxxUOtakEzU07V1sBH2brjwXKtgW/GGTqLM4lxb74216Y9Lmb8bj7 IUqj6M5TpZ/F8d0DcAuVDosM0g+GsDLnp/4prN5WH5Do9DqqFjYID5EIh4NtEGeHHAKr26 5zbJSbrDeLhjSjywssyUg1AkkWDvwdnLJsZ369qPyDdfBzYVwNbVWpRymE1KqcaBLWUNak A63YVRC7io1FfeYXpoClApLQratXKeQT7hegEJnjysi0y+zvh510/5roUh0HmAB2a7D/4w JSkmciLOLerEsnVJilleWYdB61uRO3t1NM7E5JbTw0BXJ0EJoZW+ZZjQUC0nmA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681027286; a=rsa-sha256; cv=none; b=nf8Zo/3a9zg3FrubbMUmVsOMSZVvfYqH/Vgg66hFkodxedzWyEvZCzrQ1N1RMDhzIzy0RI XJJeZWeUcwSVQz2stjuD8loST35wySb2kUiURVVi5Yl3ANjZLHyvZBjZLrsHjnhu4M0AOm sM4mh0YQ8dSnHncU1JEF6t1i4wMO/w0jrijlNO6THG8QPWJucLEDad6Do3HGlylMTsiI36 oiohxowtRiE7uBKdJWg+2nFkng3Bds6YGMupYAG0dyzS9sspLDxbIi9jTcnxmVl9MIQhuE 7qav8z2vwfJOAsysmw1xmKlf8pieVj6tb5UlvzELOK/NAuGCvsHk0Ush3MpPGQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PvPgp08ysz10wq; Sun, 9 Apr 2023 08:01:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33981PUo028788; Sun, 9 Apr 2023 08:01:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33981PWt028773; Sun, 9 Apr 2023 08:01:25 GMT (envelope-from git) Date: Sun, 9 Apr 2023 08:01:25 GMT Message-Id: <202304090801.33981PWt028773@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Hiroki Tagato Subject: git: 7bf327888c90 - main - editors/vscode: switch from VS Market Place to Open VSX Registry List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tagattie X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7bf327888c9057ba0e884ca50ad467d70a4fbbdc Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tagattie: URL: https://cgit.FreeBSD.org/ports/commit/?id=7bf327888c9057ba0e884ca50ad467d70a4fbbdc commit 7bf327888c9057ba0e884ca50ad467d70a4fbbdc Author: Hiroki Tagato AuthorDate: 2023-04-09 07:58:27 +0000 Commit: Hiroki Tagato CommitDate: 2023-04-09 08:01:17 +0000 editors/vscode: switch from VS Market Place to Open VSX Registry According to Microsoft Visual Studio Marketplace Terms of Use[1], "Marketplace Offerings are intended for use only with In-Scope Products and Services and you may install and use Marketplace Offerings only with In-Scope Products and Services." In-Scope Products and Services are "Microsoft Visual Studio, Visual Studio for Mac, Visual Studio Code, GitHub Codespaces, Azure DevOps, Azure DevOps Server, and successor products and services" and does not include Code - OSS. So switch to Open VSX Registry, a community driven, fully open platform for publishing and consuming VS Code extensions. While here, add option for building remote extension host (off by default). [1] https://aka.ms/vsmarketplace-ToU --- editors/vscode/Makefile | 41 ++++++++++++++++------ .../vscode/files/patch-build_npm_postinstall.js | 12 ++++--- editors/vscode/files/patch-product.json | 9 +++-- 3 files changed, 42 insertions(+), 20 deletions(-) diff --git a/editors/vscode/Makefile b/editors/vscode/Makefile index 1ddd526fb9d0..8738380a38a1 100644 --- a/editors/vscode/Makefile +++ b/editors/vscode/Makefile @@ -1,10 +1,9 @@ PORTNAME= vscode DISTVERSION= 1.77.1 +PORTREVISION= 1 CATEGORIES= editors -MASTER_SITES= https://nodejs.org/dist/v${NODE_VER}/:node_headers \ - https://github.com/tagattie/FreeBSD-VSCode/releases/download/${DISTVERSION}/:yarn_cache -DISTFILES= node-v${NODE_VER}-headers${EXTRACT_SUFX}:node_headers \ - yarn-offline-cache-${DISTVERSION}${EXTRACT_SUFX}:yarn_cache \ +MASTER_SITES= https://github.com/tagattie/FreeBSD-VSCode/releases/download/${DISTVERSION}/:yarn_cache +DISTFILES= yarn-offline-cache-${DISTVERSION}${EXTRACT_SUFX}:yarn_cache \ vscode-marketplace-exts-${DISTVERSION}${EXTRACT_SUFX}:yarn_cache DIST_SUBDIR= ${PORTNAME} @@ -58,8 +57,8 @@ RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-pl TEST_DEPENDS= electron${ELECTRON_VER_MAJOR}:devel/electron${ELECTRON_VER_MAJOR} \ bash:shells/bash -USES= desktop-file-utils gl gmake gnome iconv jpeg pkgconfig \ - python:build shebangfix xorg +USES= desktop-file-utils gl gmake gnome iconv jpeg localbase:ldflags \ + pkgconfig python:build shebangfix xorg USE_GITHUB= yes GH_ACCOUNT= microsoft @@ -75,8 +74,8 @@ USE_GNOME= atk cairo pango gdkpixbuf2 gtk30 libxml2 libxslt USE_LDCONFIG= ${DATADIR} -# See ${WRKSRC}/remote/.yarnrc for NODE_VER -NODE_VER= 16.14.2 +# Keep NODE_VER in sync with www/node16 DISTVERSION +NODE_VER= 16.20.0 NODE_VER_MAJOR= ${NODE_VER:C/\..*$//} # See ${WRKSRC}/build/package.json for ESBUILD_VER_BUILD ESBUILD_VER_BUILD= 0.15.5 @@ -99,6 +98,10 @@ MAKE_ENV+= PLAYWRIGHT_BROWSERS_PATH=${WRKDIR}/pw-browsers \ # This is a workaround to avoid filesystem violations during poudriere build MAKE_ENV+= PYTHONDONTWRITEBYTECODE=1 +OPTIONS_DEFINE= REH +OPTIONS_DEFAULT=# none +REH_DESC= Build remote extension host + ELECTRON_DIR= ${.CURDIR}/../../devel/electron19 .include "${ELECTRON_DIR}/Makefile.version" @@ -118,14 +121,19 @@ post-patch: # force use of electron version matching port one ${REINPLACE_CMD} -E 's|^(target ").*(")$$|\1${ELECTRON_VER}\2|' \ ${WRKSRC}/.yarnrc + # force use of node version matching port one + ${REINPLACE_CMD} -E 's|^(target ").*(")$$|\1${NODE_VER}\2|' \ + ${WRKSRC}/remote/.yarnrc # setup yarnrc for using local node headers ${ECHO_CMD} 'nodedir "${LOCALBASE}/share/electron${ELECTRON_VER_MAJOR}/node_headers"' >> \ ${WRKSRC}/.yarnrc - ${ECHO_CMD} 'nodedir "${WRKDIR}/node-v${NODE_VER}"' >> \ + ${ECHO_CMD} 'nodedir "${LOCALBASE}"' >> \ ${WRKSRC}/remote/.yarnrc # setup yarnrc for offline node_modules installation ${ECHO_CMD} 'yarn-offline-mirror "../yarn-offline-cache"' >> \ ${WRKSRC}/.yarnrc + ${ECHO_CMD} 'yarn-offline-mirror "../../yarn-offline-cache"' >> \ + ${WRKSRC}/remote/.yarnrc (cd ${WRKSRC} && \ ${FIND} -E . -type f -iregex '${SHEBANG_REGEX}' \ -exec ${SED} -i '' -e "s|/usr/bin/pgrep|/bin/pgrep|g" {} ';') @@ -182,11 +190,22 @@ do-build: # build and package vscode cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} yarn run tsc -p build/tsconfig.build.json cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} yarn gulp vscode-linux-x64-min - # cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} yarn gulp vscode-reh-linux-x64-min - # cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} yarn gulp vscode-reh-web-linux-x64-min # copy marketplace extensions ${MV} ${WRKDIR}/builtInExtensions/* ${WRKDIR}/VSCode-linux-x64/resources/app/extensions +do-build-REH-on: + # setup download cache for node + ${MKDIR} ${WRKSRC}/.build/node/v${NODE_VER}/linux-x64 + ${CP} ${LOCALBASE}/bin/node ${WRKSRC}/.build/node/v${NODE_VER}/linux-x64 + # build vscode remote extension host + cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} yarn gulp vscode-reh-linux-x64-min + ${MKDIR} ${WRKDIR}/vscode-reh/bin/${SOURCE_COMMIT_HASH} + cd ${WRKDIR}/vscode-reh-linux-x64 && ${TAR} -cf - . | \ + ${TAR} -xf - -C ${WRKDIR}/vscode-reh/bin/${SOURCE_COMMIT_HASH} + cd ${WRKDIR}/vscode-reh && \ + ${TAR} -czf ../vscode-reh-${DISTVERSION}-${OPSYS:tl}${OSREL:R}-${ARCH}.tar.gz . + # cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} yarn gulp vscode-reh-web-linux-x64-min + do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d ${INSTALL_DATA} ${WRKSRC}/resources/completions/bash/code \ diff --git a/editors/vscode/files/patch-build_npm_postinstall.js b/editors/vscode/files/patch-build_npm_postinstall.js index 523afaa94179..81e9a96dc775 100644 --- a/editors/vscode/files/patch-build_npm_postinstall.js +++ b/editors/vscode/files/patch-build_npm_postinstall.js @@ -1,17 +1,21 @@ ---- build/npm/postinstall.js.orig 2022-07-05 18:15:23 UTC +--- build/npm/postinstall.js.orig 2023-04-04 22:49:54 UTC +++ build/npm/postinstall.js -@@ -20,7 +20,9 @@ function yarnInstall(location, opts) { +@@ -20,7 +20,13 @@ function yarnInstall(location, opts) { const raw = process.env['npm_config_argv'] || '{}'; const argv = JSON.parse(raw); const original = argv.original || []; - const args = original.filter(arg => arg === '--ignore-optional' || arg === '--frozen-lockfile' || arg === '--check-files'); + const passargs = ['--ignore-optional', '--frozen-lockfile', '--check-files', '--offline', '--no-progress', '--verbose']; + const args = original.filter(arg => passargs.includes(arg)); -+ args.push('--use-yarnrc=' + process.env.PWD + '/.yarnrc'); ++ if (opts.cwd === 'remote') { ++ args.push('--use-yarnrc=' + process.env.PWD + '/' + opts.cwd + '/.yarnrc'); ++ } else { ++ args.push('--use-yarnrc=' + process.env.PWD + '/.yarnrc'); ++ } if (opts.ignoreEngines) { args.push('--ignore-engines'); delete opts.ignoreEngines; -@@ -73,5 +75,5 @@ for (let dir of dirs) { +@@ -73,5 +79,5 @@ for (let dir of dirs) { yarnInstall(dir, opts); } diff --git a/editors/vscode/files/patch-product.json b/editors/vscode/files/patch-product.json index 6f4ab95bdcc7..e2637d0cf164 100644 --- a/editors/vscode/files/patch-product.json +++ b/editors/vscode/files/patch-product.json @@ -1,14 +1,13 @@ ---- product.json.orig 2022-11-09 00:04:34 UTC +--- product.json.orig 2023-04-04 22:49:54 UTC +++ product.json -@@ -29,6 +29,17 @@ +@@ -29,6 +29,16 @@ "reportIssueUrl": "https://github.com/microsoft/vscode/issues/new", "urlProtocol": "code-oss", "webviewContentExternalBaseUrlTemplate": "https://{{uuid}}.vscode-cdn.net/insider/ef65ac1ba57f57f2a3961bfe94aa20481caca4c6/out/vs/workbench/contrib/webview/browser/pre/", + "documentationUrl": "https://go.microsoft.com/fwlink/?LinkID=533484", + "extensionsGallery": { -+ "serviceUrl": "https://marketplace.visualstudio.com/_apis/public/gallery", -+ "cacheUrl": "https://vscode.blob.core.windows.net/gallery/index", -+ "itemUrl": "https://marketplace.visualstudio.com/items" ++ "serviceUrl": "https://open-vsx.org/vscode/gallery", ++ "itemUrl": "https://open-vsx.org/vscode/item" + }, + "introductoryVideosUrl": "https://go.microsoft.com/fwlink/?linkid=832146", + "keyboardShortcutsUrlLinux": "https://go.microsoft.com/fwlink/?linkid=832144",