svn commit: r520731 - in head/editors: . vscode vscode/files

Baptiste Daroussin bapt at FreeBSD.org
Tue Dec 24 08:41:33 UTC 2019


On Mon, Dec 23, 2019 at 05:23:22PM +0000, Luca Pizzamiglio wrote:
> Author: pizzamig
> Date: Mon Dec 23 17:23:22 2019
> New Revision: 520731
> URL: https://svnweb.freebsd.org/changeset/ports/520731
> 
> Log:
>   editors/vscode: Add new port
>   
>   Add vscode to the portstree. the popular editor developed by Microsoft and
>   based on Electron.
>   Many thanks to the maintainer Hiroki for his very appreciated work on it.
> 
> Added:
>   head/editors/vscode/
>   head/editors/vscode/Makefile   (contents, props changed)
>   head/editors/vscode/distinfo   (contents, props changed)
>   head/editors/vscode/files/
>   head/editors/vscode/files/extra-patch-build_gulpfile.extensions.js   (contents, props changed)
>   head/editors/vscode/files/package.json-build   (contents, props changed)
>   head/editors/vscode/files/package.json-package   (contents, props changed)
>   head/editors/vscode/files/package.json-remote-build   (contents, props changed)
>   head/editors/vscode/files/package.json-remote-package   (contents, props changed)
>   head/editors/vscode/files/patch-build_lib_snapshotLoader.ts   (contents, props changed)
>   head/editors/vscode/files/patch-build_npm_postinstall.js   (contents, props changed)
>   head/editors/vscode/files/patch-extensions_emmet_src_test_testUtils.ts   (contents, props changed)
>   head/editors/vscode/files/patch-extensions_vscode-api-tests_src_utils.ts   (contents, props changed)
>   head/editors/vscode/files/patch-extensions_vscode-test-resolver_scripts_terminateProcess.sh   (contents, props changed)
>   head/editors/vscode/files/patch-extensions_vscode-test-resolver_src_util_processes.ts   (contents, props changed)
>   head/editors/vscode/files/patch-product.json   (contents, props changed)
>   head/editors/vscode/files/patch-resources_linux_bin_code.sh   (contents, props changed)
>   head/editors/vscode/files/patch-src_bootstrap.js   (contents, props changed)
>   head/editors/vscode/files/patch-src_paths.js   (contents, props changed)
>   head/editors/vscode/files/patch-src_vs_base_common_platform.ts   (contents, props changed)
>   head/editors/vscode/files/patch-src_vs_code_electron-main_app.ts   (contents, props changed)
>   head/editors/vscode/files/patch-src_vs_workbench_api_browser_mainThreadTask.ts   (contents, props changed)
>   head/editors/vscode/files/patch-src_vs_workbench_contrib_extensions_browser_extensionEditor.ts   (contents, props changed)
>   head/editors/vscode/files/patch-src_vs_workbench_services_extensions_node_proxyResolver.ts   (contents, props changed)
>   head/editors/vscode/files/patch-test_automation_src_code.ts   (contents, props changed)
>   head/editors/vscode/files/patch-test_smoke_src_main.ts   (contents, props changed)
>   head/editors/vscode/files/yarnrc-offline-mirror   (contents, props changed)
>   head/editors/vscode/pkg-descr   (contents, props changed)
>   head/editors/vscode/pkg-plist   (contents, props changed)
> Modified:
>   head/editors/Makefile
> 
> Modified: head/editors/Makefile
> ==============================================================================
> --- head/editors/Makefile	Mon Dec 23 16:14:51 2019	(r520730)
> +++ head/editors/Makefile	Mon Dec 23 17:23:22 2019	(r520731)
> @@ -248,6 +248,7 @@
>      SUBDIR += vim
>      SUBDIR += vim-console
>      SUBDIR += vim-tiny
> +    SUBDIR += vscode
>      SUBDIR += web-mode
>      SUBDIR += with-editor
>      SUBDIR += wordgrinder
> 
> Added: head/editors/vscode/Makefile
> ==============================================================================
> --- /dev/null	00:00:00 1970	(empty, because file is newly added)
> +++ head/editors/vscode/Makefile	Mon Dec 23 17:23:22 2019	(r520731)
> @@ -0,0 +1,254 @@
> +# $FreeBSD$
> +
> +PORTNAME=	vscode
> +DISTVERSION=	1.41.0
> +CATEGORIES=	editors
> +MASTER_SITES=	https://atom.io/download/electron/v${ELECTRON_VER}/:electron_headers \
> +		https://github.com/electron/electron/releases/download/v${ELECTRON_VER}/:electron_linux \
> +		https://nodejs.org/dist/v${NODE_VER}/:node_headers \
> +		https://registry.yarnpkg.com/vscode-ripgrep/-/:vscode_ripgrep \
> +		https://github.com/tagattie/FreeBSD-VSCode/releases/download/${DISTVERSION}/:yarn_cache
> +DISTFILES=	node-v${ELECTRON_VER}-headers${EXTRACT_SUFX}:electron_headers \
> +		electron-v${ELECTRON_VER}-linux-x64.zip:electron_linux \
> +		ffmpeg-v${ELECTRON_VER}-linux-x64.zip:electron_linux \
> +		node-v${NODE_VER}-headers${EXTRACT_SUFX}:node_headers \
> +		vscode-ripgrep-${VSCODE_RIPGREP_VER}.tgz:vscode_ripgrep
> +DIST_SUBDIR=	${PORTNAME}
> +EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
> +
> +MAINTAINER=	tagattie at yandex.com
> +COMMENT=	Visual Studio Code - Open Source ("Code - OSS")
> +
> +LICENSE=	MIT
> +LICENSE_FILE=	${WRKSRC}/LICENSE.txt
> +
> +ONLY_FOR_ARCHS=	amd64
> +
> +BUILD_DEPENDS=	electron:devel/electron6 \
> +		rg:textproc/ripgrep \
> +		npm:www/npm-node10 \
> +		yarn:www/yarn-node10
> +LIB_DEPENDS=	libatk-bridge-2.0.so:accessibility/at-spi2-atk \
> +		libsnappy.so:archivers/snappy \
> +		libasound.so:audio/alsa-lib \
> +		libFLAC.so:audio/flac \
> +		libopus.so:audio/opus \
> +		libdbus-1.so:devel/dbus \
> +		libinotify.so:devel/libinotify \
> +		libnotify.so:devel/libnotify \
> +		libpci.so:devel/libpci \
> +		libnspr4.so:devel/nspr \
> +		libpcre2-8.so:devel/pcre2 \
> +		libre2.so:devel/re2 \
> +		libdrm.so:graphics/libdrm \
> +		libwebp.so:graphics/webp \
> +		libavcodec.so:multimedia/ffmpeg \
> +		libvpx.so:multimedia/libvpx \
> +		libopenh264.so:multimedia/openh264 \
> +		libcups.so:print/cups \
> +		libfreetype.so:print/freetype2 \
> +		libharfbuzz.so:print/harfbuzz \
> +		libsecret-1.so:security/libsecret \
> +		libnss3.so:security/nss \
> +		libexpat.so:textproc/expat2 \
> +		libfontconfig.so:x11-fonts/fontconfig
> +RUN_DEPENDS=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins \
> +		xdg-open:devel/xdg-utils \
> +		bash:shells/bash
> +TEST_DEPENDS=	electron:devel/electron6 \
> +		bash:shells/bash
> +
> +USES=		desktop-file-utils gl gmake gnome jpeg pkgconfig \
> +		python:2.7,build shebangfix xorg
> +
> +USE_GITHUB=	yes
> +GH_ACCOUNT=	microsoft
> +
> +SOURCE_COMMIT_HASH=	9579eda04fdb3a9bba2750f15193e5fafe16b959
> +
> +BINARY_ALIAS=	python=${PYTHON_CMD}
> +
> +USE_XORG=	x11 xcb xcomposite xcursor xdamage xext xfixes xi xkbfile \
> +		xrandr xrender xscrnsaver xtst
> +USE_GL=		gl glesv2
> +USE_GNOME=	atk cairo pango gdkpixbuf2 gtk30 libxml2 libxslt
> +
> +USE_LDCONFIG=	${DATADIR}
> +
> +ELECTRON_VER=	6.1.6	# keep in sync with devel/electron6
> +NODE_VER=	12.4.0
> +VSCODE_RIPGREP_VER=	1.5.7
> +
> +SHEBANG_FILES=	extensions/vscode-test-resolver/scripts/terminateProcess.sh \
> +		resources/linux/bin/code.sh \
> +		scripts/test.sh
> +
> +DATADIR=	${PREFIX}/share/code-oss
> +TMPDIR=		${WRKDIR}
> +
> +MAKE_ENV+=	BUILD_SOURCEVERSION=${SOURCE_COMMIT_HASH} \
> +		PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=1 \
> +		XDG_CACHE_HOME=${WRKDIR}/.cache
> +
> +OPTIONS_DEFINE=	POUDRIERE
> +POUDRIERE_DESC=	Support build with poudriere (KEEP THIS ON)
> +OPTIONS_DEFAULT=	POUDRIERE

I don't think you should use a POUDRIERE option, you should instead use the
PACKAGE_BUILDING knob, which every package builders are supposed to export.

This makes is not limited to poudriere, should achieve what you do expect and
prevent showing a "weird" option to end users

Best regards,
Bapt
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/svn-ports-all/attachments/20191224/76fd0cc3/attachment.sig>


More information about the svn-ports-all mailing list