From ee4ebaaa95c3eabf6966fdb2238bac212c23cbbd Mon Sep 17 00:00:00 2001 From: Hajime Hoshi Date: Wed, 7 Oct 2020 02:05:01 +0900 Subject: [PATCH] Clean up the 'js' build tags Updates #1129 --- genkeys.go | 1 - internal/devicescale/cinnamon_unix.go | 1 - internal/devicescale/impl_mac.go | 1 - internal/devicescale/impl_unix.go | 1 - internal/glfw/glfw_notwindows.go | 1 - internal/glfw/type.go | 2 -- internal/graphicsdriver/opengl/context_desktop.go | 1 - internal/graphicsdriver/opengl/context_x.go | 3 +-- internal/graphicsdriver/opengl/gl/conversions_notwindows.go | 1 - internal/graphicsdriver/opengl/gl/package.go | 2 -- internal/graphicsdriver/opengl/gl/package_notwindows.go | 1 - internal/graphicsdriver/opengl/gl/package_x.go | 1 - internal/graphicsdriver/opengl/gl/procaddr_notwindows.go | 1 - internal/uidriver/glfw/graphics_opengl.go | 1 - internal/uidriver/glfw/input.go | 1 - internal/uidriver/glfw/keys.go | 1 - internal/uidriver/glfw/ui.go | 1 - internal/uidriver/glfw/ui_unix.go | 1 - internal/uidriver/glfw/window.go | 1 - 19 files changed, 1 insertion(+), 22 deletions(-) diff --git a/genkeys.go b/genkeys.go index 5e80c551e..c9c3a0985 100644 --- a/genkeys.go +++ b/genkeys.go @@ -708,7 +708,6 @@ func main() { switch path { case "internal/uidriver/glfw/keys.go": buildTag = "// +build darwin freebsd linux windows" + - "\n// +build !js" + "\n// +build !android" + "\n// +build !ios" } diff --git a/internal/devicescale/cinnamon_unix.go b/internal/devicescale/cinnamon_unix.go index 29c0ddf99..60ff57062 100644 --- a/internal/devicescale/cinnamon_unix.go +++ b/internal/devicescale/cinnamon_unix.go @@ -13,7 +13,6 @@ // limitations under the License. // +build dragonfly freebsd linux netbsd openbsd solaris -// +build !js // +build !android package devicescale diff --git a/internal/devicescale/impl_mac.go b/internal/devicescale/impl_mac.go index 61a0a42a8..477cebae5 100644 --- a/internal/devicescale/impl_mac.go +++ b/internal/devicescale/impl_mac.go @@ -13,7 +13,6 @@ // limitations under the License. // +build darwin -// +build !js // +build !ios package devicescale diff --git a/internal/devicescale/impl_unix.go b/internal/devicescale/impl_unix.go index fa524457a..21e07f92d 100644 --- a/internal/devicescale/impl_unix.go +++ b/internal/devicescale/impl_unix.go @@ -13,7 +13,6 @@ // limitations under the License. // +build dragonfly freebsd linux netbsd openbsd solaris -// +build !js // +build !android package devicescale diff --git a/internal/glfw/glfw_notwindows.go b/internal/glfw/glfw_notwindows.go index 4f8f5e810..1a5a94bb5 100644 --- a/internal/glfw/glfw_notwindows.go +++ b/internal/glfw/glfw_notwindows.go @@ -13,7 +13,6 @@ // limitations under the License. // +build !windows -// +build !js package glfw diff --git a/internal/glfw/type.go b/internal/glfw/type.go index 1bf949138..9cff47e06 100644 --- a/internal/glfw/type.go +++ b/internal/glfw/type.go @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -// +build !js - package glfw type ( diff --git a/internal/graphicsdriver/opengl/context_desktop.go b/internal/graphicsdriver/opengl/context_desktop.go index 35b4628b5..31c63952f 100644 --- a/internal/graphicsdriver/opengl/context_desktop.go +++ b/internal/graphicsdriver/opengl/context_desktop.go @@ -13,7 +13,6 @@ // limitations under the License. // +build darwin freebsd linux windows -// +build !js // +build !android // +build !ios diff --git a/internal/graphicsdriver/opengl/context_x.go b/internal/graphicsdriver/opengl/context_x.go index f55136ba7..5efab8c32 100644 --- a/internal/graphicsdriver/opengl/context_x.go +++ b/internal/graphicsdriver/opengl/context_x.go @@ -12,9 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -// +build !android -// +build !js // +build freebsd linux +// +build !android package opengl diff --git a/internal/graphicsdriver/opengl/gl/conversions_notwindows.go b/internal/graphicsdriver/opengl/gl/conversions_notwindows.go index 2e78bdaea..c9bb2ee70 100644 --- a/internal/graphicsdriver/opengl/gl/conversions_notwindows.go +++ b/internal/graphicsdriver/opengl/gl/conversions_notwindows.go @@ -1,6 +1,5 @@ // SPDX-License-Identifier: MIT -// +build !js // +build !windows package gl diff --git a/internal/graphicsdriver/opengl/gl/package.go b/internal/graphicsdriver/opengl/gl/package.go index b6876e387..012a60e2e 100644 --- a/internal/graphicsdriver/opengl/gl/package.go +++ b/internal/graphicsdriver/opengl/gl/package.go @@ -1,7 +1,5 @@ // SPDX-License-Identifier: MIT -// +build !js - // Copyright (c) 2010 Khronos Group. // This material may be distributed subject to the terms and conditions // set forth in the Open Publication License, v 1.0, 8 June 1999. diff --git a/internal/graphicsdriver/opengl/gl/package_notwindows.go b/internal/graphicsdriver/opengl/gl/package_notwindows.go index 2a3d5a17a..b85c08ded 100644 --- a/internal/graphicsdriver/opengl/gl/package_notwindows.go +++ b/internal/graphicsdriver/opengl/gl/package_notwindows.go @@ -1,6 +1,5 @@ // SPDX-License-Identifier: MIT -// +build !js // +build !windows package gl diff --git a/internal/graphicsdriver/opengl/gl/package_x.go b/internal/graphicsdriver/opengl/gl/package_x.go index f941f2625..b7f35b03f 100644 --- a/internal/graphicsdriver/opengl/gl/package_x.go +++ b/internal/graphicsdriver/opengl/gl/package_x.go @@ -1,6 +1,5 @@ // SPDX-License-Identifier: MIT -// +build !js // +build freebsd linux package gl diff --git a/internal/graphicsdriver/opengl/gl/procaddr_notwindows.go b/internal/graphicsdriver/opengl/gl/procaddr_notwindows.go index 73bc612c5..fb54e1844 100644 --- a/internal/graphicsdriver/opengl/gl/procaddr_notwindows.go +++ b/internal/graphicsdriver/opengl/gl/procaddr_notwindows.go @@ -1,6 +1,5 @@ // SPDX-License-Identifier: MIT -// +build !js // +build !windows // This file implements GlowGetProcAddress for every supported platform. The diff --git a/internal/uidriver/glfw/graphics_opengl.go b/internal/uidriver/glfw/graphics_opengl.go index c8ba0dfbc..7e1251e3f 100644 --- a/internal/uidriver/glfw/graphics_opengl.go +++ b/internal/uidriver/glfw/graphics_opengl.go @@ -13,7 +13,6 @@ // limitations under the License. // +build freebsd linux windows ebitengl -// +build !js package glfw diff --git a/internal/uidriver/glfw/input.go b/internal/uidriver/glfw/input.go index f5c6a8faa..343421826 100644 --- a/internal/uidriver/glfw/input.go +++ b/internal/uidriver/glfw/input.go @@ -13,7 +13,6 @@ // limitations under the License. // +build darwin freebsd linux windows -// +build !js // +build !android // +build !ios diff --git a/internal/uidriver/glfw/keys.go b/internal/uidriver/glfw/keys.go index 37ce6b848..9fa98f386 100644 --- a/internal/uidriver/glfw/keys.go +++ b/internal/uidriver/glfw/keys.go @@ -15,7 +15,6 @@ // Code generated by genkeys.go using 'go generate'. DO NOT EDIT. // +build darwin freebsd linux windows -// +build !js // +build !android // +build !ios diff --git a/internal/uidriver/glfw/ui.go b/internal/uidriver/glfw/ui.go index bfebf6e4e..6a74f3681 100644 --- a/internal/uidriver/glfw/ui.go +++ b/internal/uidriver/glfw/ui.go @@ -13,7 +13,6 @@ // limitations under the License. // +build darwin freebsd linux windows -// +build !js // +build !android // +build !ios diff --git a/internal/uidriver/glfw/ui_unix.go b/internal/uidriver/glfw/ui_unix.go index fb6c9fab1..e9c45f36d 100644 --- a/internal/uidriver/glfw/ui_unix.go +++ b/internal/uidriver/glfw/ui_unix.go @@ -13,7 +13,6 @@ // limitations under the License. // +build dragonfly freebsd linux netbsd openbsd solaris -// +build !js // +build !android package glfw diff --git a/internal/uidriver/glfw/window.go b/internal/uidriver/glfw/window.go index 319dbbe6c..290fba4fe 100644 --- a/internal/uidriver/glfw/window.go +++ b/internal/uidriver/glfw/window.go @@ -13,7 +13,6 @@ // limitations under the License. // +build darwin freebsd linux windows -// +build !js // +build !android // +build !ios