diff options
9 files changed, 0 insertions, 207 deletions
diff --git a/tests/projects/go/console_with_pkgs/src/main.go b/tests/projects/go/console_with_pkgs/src/main.go deleted file mode 100644 index 194d6ac86..000000000 --- a/tests/projects/go/console_with_pkgs/src/main.go +++ /dev/null @@ -1,9 +0,0 @@ -package main - -import ( - log "github.com/sirupsen/logrus" -) - -func main() { - log.WithFields(log.Fields{"animal": "walrus"}).Info("A walrus appears") -} diff --git a/tests/projects/go/console_with_pkgs/xmake.lua b/tests/projects/go/console_with_pkgs/xmake.lua deleted file mode 100644 index d3324d855..000000000 --- a/tests/projects/go/console_with_pkgs/xmake.lua +++ /dev/null @@ -1,15 +0,0 @@ -add_rules("mode.debug", "mode.release") - -add_requires("go::github.com/sirupsen/logrus", {alias = "logrus"}) -add_requires("go::golang.org/x/sys/internal/unsafeheader", {alias = "unsafeheader"}) -if is_plat("windows") then - add_requires("go::golang.org/x/sys/windows", {alias = "syshost"}) -else - add_requires("go::golang.org/x/sys/unix", {alias = "syshost"}) -end - -target("test") - set_kind("binary") - add_files("src/*.go") - add_packages("logrus", "syshost", "unsafeheader") - diff --git a/tests/projects/go/static_library_with_pkgs/src/main.go b/tests/projects/go/static_library_with_pkgs/src/main.go deleted file mode 100644 index f2b477453..000000000 --- a/tests/projects/go/static_library_with_pkgs/src/main.go +++ /dev/null @@ -1,7 +0,0 @@ -package main - -func main() { - - Run() -} - diff --git a/tests/projects/go/static_library_with_pkgs/src/test.go b/tests/projects/go/static_library_with_pkgs/src/test.go deleted file mode 100644 index cf10523f9..000000000 --- a/tests/projects/go/static_library_with_pkgs/src/test.go +++ /dev/null @@ -1,12 +0,0 @@ -package main - -import ( - "fmt" - "module" -) - -func Run() { - - fmt.Printf("add: %d\n", module.Add(1, 2)); - fmt.Printf("sub: %d\n", module.Sub(1, 2)); -} diff --git a/tests/projects/go/static_library_with_pkgs/src/test/add.go b/tests/projects/go/static_library_with_pkgs/src/test/add.go deleted file mode 100644 index b87b21138..000000000 --- a/tests/projects/go/static_library_with_pkgs/src/test/add.go +++ /dev/null @@ -1,11 +0,0 @@ -package module - -import ( - log "github.com/sirupsen/logrus" -) - -func Add(a int, b int) int { - log.WithFields(log.Fields{"animal": "walrus"}).Info("A walrus appears") - return a + b; -} - diff --git a/tests/projects/go/static_library_with_pkgs/src/test/sub.go b/tests/projects/go/static_library_with_pkgs/src/test/sub.go deleted file mode 100644 index a24a9abb7..000000000 --- a/tests/projects/go/static_library_with_pkgs/src/test/sub.go +++ /dev/null @@ -1,6 +0,0 @@ -package module - -func Sub(a int, b int) int { - return a - b; -} - diff --git a/tests/projects/go/static_library_with_pkgs/xmake.lua b/tests/projects/go/static_library_with_pkgs/xmake.lua deleted file mode 100644 index 6943a29aa..000000000 --- a/tests/projects/go/static_library_with_pkgs/xmake.lua +++ /dev/null @@ -1,19 +0,0 @@ -add_rules("mode.debug", "mode.release") - -add_requires("go::github.com/sirupsen/logrus", {alias = "logrus"}) -add_requires("go::golang.org/x/sys/internal/unsafeheader", {alias = "unsafeheader"}) -if is_plat("windows") then - add_requires("go::golang.org/x/sys/windows", {alias = "syshost"}) -else - add_requires("go::golang.org/x/sys/unix", {alias = "syshost"}) -end - -target("module") - set_kind("static") - add_files("src/test/*.go") - add_packages("logrus", "syshost", "unsafeheader") - -target("test") - set_kind("binary") - add_deps("module") - add_files("src/*.go") diff --git a/xmake/modules/package/manager/go/find_package.lua b/xmake/modules/package/manager/go/find_package.lua deleted file mode 100644 index 785ead994..000000000 --- a/xmake/modules/package/manager/go/find_package.lua +++ /dev/null @@ -1,49 +0,0 @@ ---!A cross-platform build utility based on Lua --- --- Licensed under the Apache License, Version 2.0 (the "License"); --- you may not use this file except in compliance with the License. --- You may obtain a copy of the License at --- --- http://www.apache.org/licenses/LICENSE-2.0 --- --- Unless required by applicable law or agreed to in writing, software --- distributed under the License is distributed on an "AS IS" BASIS, --- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. --- See the License for the specific language governing permissions and --- limitations under the License. --- --- Copyright (C) 2015-present, Xmake Open Source Community. --- --- @author ruki --- @file find_package.lua --- - --- imports -import("core.base.option") -import("core.project.config") -import("core.package.package") - --- get the package install directory -function _go_get_installdir(name, opt) - local name = "go_" .. name:lower() - local dir = path.join(package.installdir(), name:sub(1, 1):lower(), name) - if opt.require_version then - dir = path.join(dir, opt.require_version) - end - return path.join(dir, opt.buildhash) -end - --- find package using the go package manager --- --- @param name the package name --- @param opt the options, e.g. {verbose = true, version = "1.12.x") --- -function main(name, opt) - local result - local installdir = _go_get_installdir(name, opt) - for _, libraryfile in ipairs(os.files(path.join(installdir, "lib", "**.a"))) do - result = {version = opt.require_version, linkdirs = path.join(installdir, "lib"), includedirs = path.join(installdir, "lib")} - break - end - return result -end diff --git a/xmake/modules/package/manager/go/install_package.lua b/xmake/modules/package/manager/go/install_package.lua deleted file mode 100644 index b6c0143a2..000000000 --- a/xmake/modules/package/manager/go/install_package.lua +++ /dev/null @@ -1,79 +0,0 @@ ---!A cross-platform build utility based on Lua --- --- Licensed under the Apache License, Version 2.0 (the "License"); --- you may not use this file except in compliance with the License. --- You may obtain a copy of the License at --- --- http://www.apache.org/licenses/LICENSE-2.0 --- --- Unless required by applicable law or agreed to in writing, software --- distributed under the License is distributed on an "AS IS" BASIS, --- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. --- See the License for the specific language governing permissions and --- limitations under the License. --- --- Copyright (C) 2015-present, Xmake Open Source Community. --- --- @author ruki --- @file install_package.lua --- - --- imports -import("core.base.option") -import("core.project.config") -import("lib.detect.find_tool") -import("core.package.package") -import("private.tools.go.goenv") - --- get the package cache directory -function _go_get_cachedir(name, opt) - local name = "go_" .. name:lower() - return path.join(package.cachedir(), name:sub(1, 1), name, opt.require_version) -end - --- get the package install directory -function _go_get_installdir(name, opt) - local name = "go_" .. name:lower() - local dir = path.join(package.installdir(), name:sub(1, 1):lower(), name) - if opt.require_version then - dir = path.join(dir, opt.require_version) - end - return path.join(dir, opt.buildhash) -end - --- install package --- --- @param name the package name, e.g. go::github.com/sirupsen/logrus --- @param opt the options, e.g. { verbose = true, mode = "release", plat = , arch = , require_version = "x.x.x", buildhash = "xxxxxx"} --- --- @return true or false --- -function main(name, opt) - - -- TODO we do not yet support the installation of go packages in specific versions - local version = opt.require_version - assert(not version or version == "latest" or version == "master", "we can only support to install go packages without version!") - - -- find go - local go = find_tool("go") - if not go then - raise("go not found!") - end - - -- get plat and arch - local goos = goenv.GOOS(opt.plat) - local goarch = goenv.GOARCH(opt.arch) - - -- get go package to cachedir/pkg/${goos}_${goarch}/github.com/xxx/*.a - local cachedir = _go_get_cachedir(name, opt) - os.tryrm(cachedir) - os.mkdir(cachedir) - os.vrunv(go.program, {"get", "-u", name}, {envs = {GOPATH = cachedir, GOOS = goos, GOARCH = goarch}, curdir = cachedir}) - - -- install go package - local installdir = _go_get_installdir(name, opt) - local pkgdir = path.join(cachedir, "pkg", goos .. "_" .. goarch) - os.tryrm(installdir) - os.mkdir(path.join(installdir, "lib")) - os.vcp(path.join(pkgdir, "**.a"), path.join(installdir, "lib"), {rootdir = pkgdir}) -end |