From 6416ec1cecf3d05878b42bdf02588ecdd31ad12f Mon Sep 17 00:00:00 2001 From: pdagobert Date: Sat, 18 Mar 2023 17:39:10 +0100 Subject: Add test for dub package --- tests/projects/dlang/dub_package/src/main.d | 7 +++++++ tests/projects/dlang/dub_package/test.lua | 6 ++++++ tests/projects/dlang/dub_package/xmake.lua | 8 ++++++++ 3 files changed, 21 insertions(+) create mode 100644 tests/projects/dlang/dub_package/src/main.d create mode 100644 tests/projects/dlang/dub_package/test.lua create mode 100644 tests/projects/dlang/dub_package/xmake.lua diff --git a/tests/projects/dlang/dub_package/src/main.d b/tests/projects/dlang/dub_package/src/main.d new file mode 100644 index 000000000..3a9f9db79 --- /dev/null +++ b/tests/projects/dlang/dub_package/src/main.d @@ -0,0 +1,7 @@ +import util.log; + +void main() +{ + log = Log(stderrLogger, stdoutLogger(LogLevel.info), fileLogger("log")); + log.warn("test"); +} \ No newline at end of file diff --git a/tests/projects/dlang/dub_package/test.lua b/tests/projects/dlang/dub_package/test.lua new file mode 100644 index 000000000..b76241be2 --- /dev/null +++ b/tests/projects/dlang/dub_package/test.lua @@ -0,0 +1,6 @@ +-- main entry +function main(t) + + -- build project + t:build() +end diff --git a/tests/projects/dlang/dub_package/xmake.lua b/tests/projects/dlang/dub_package/xmake.lua new file mode 100644 index 000000000..c9b82dffb --- /dev/null +++ b/tests/projects/dlang/dub_package/xmake.lua @@ -0,0 +1,8 @@ +add_rules("mode.debug", "mode.release") + +add_requires("dub::log 0.4.3") + +target("test") + set_kind("binary") + add_files("src/main.d") + add_packages("dub::log") \ No newline at end of file -- cgit v1.3.1 From 2d5fbc71a783caade10d2c38c16a9e71d31cac13 Mon Sep 17 00:00:00 2001 From: pdagobert Date: Sun, 19 Mar 2023 09:43:31 +0100 Subject: Fix dub find_package for windows paths and package modules --- xmake/modules/package/manager/dub/find_package.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xmake/modules/package/manager/dub/find_package.lua b/xmake/modules/package/manager/dub/find_package.lua index 5d49d695e..372e6bbcf 100644 --- a/xmake/modules/package/manager/dub/find_package.lua +++ b/xmake/modules/package/manager/dub/find_package.lua @@ -49,7 +49,7 @@ function main(name, opt) if pkglist then local pkgdir for _, line in ipairs(pkglist:split('\n', {plain = true})) do - local pkginfo = line:split(':', {plain = true}) + local pkginfo = line:split(': ', {plain = true}) if #pkginfo == 2 then local pkgkey = pkginfo[1]:trim():split(' ', {plain = true}) local pkgpath = pkginfo[2]:trim() -- cgit v1.3.1 From b61e7996260ccdafe32b292ea6c00bd8412e8951 Mon Sep 17 00:00:00 2001 From: pdagobert Date: Sun, 19 Mar 2023 10:16:43 +0100 Subject: Fix pdb generation for dmd and ldc --- xmake/modules/core/tools/dmd.lua | 2 ++ xmake/modules/core/tools/ldc2.lua | 2 ++ 2 files changed, 4 insertions(+) diff --git a/xmake/modules/core/tools/dmd.lua b/xmake/modules/core/tools/dmd.lua index 99e872390..2570bc240 100644 --- a/xmake/modules/core/tools/dmd.lua +++ b/xmake/modules/core/tools/dmd.lua @@ -83,6 +83,8 @@ function nf_symbol(self, level) _g.symbol_maps = maps end return maps[level .. '_' .. kind] or maps[level] + elseif kind == "dcld" then + return "-g" end end diff --git a/xmake/modules/core/tools/ldc2.lua b/xmake/modules/core/tools/ldc2.lua index 3a2dbf160..b9c3d61e1 100644 --- a/xmake/modules/core/tools/ldc2.lua +++ b/xmake/modules/core/tools/ldc2.lua @@ -61,5 +61,7 @@ function nf_symbol(self, level) _g.symbol_maps = maps end return maps[level .. '_' .. kind] or maps[level] + elseif kind == "dcld" then + return "-g" end end -- cgit v1.3.1 From 17c28518c434db16c563ade79b0ec9fc1976c757 Mon Sep 17 00:00:00 2001 From: pdagobert Date: Mon, 27 Mar 2023 03:17:08 +0200 Subject: Dub package test platforms should match console test --- tests/projects/dlang/dub_package/test.lua | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/projects/dlang/dub_package/test.lua b/tests/projects/dlang/dub_package/test.lua index b76241be2..92168a8c1 100644 --- a/tests/projects/dlang/dub_package/test.lua +++ b/tests/projects/dlang/dub_package/test.lua @@ -2,5 +2,9 @@ function main(t) -- build project - t:build() + if is_host("macosx") and os.arch() ~= "arm64" then + t:build() + else + return t:skip("wrong host platform") + end end -- cgit v1.3.1 From a894ed62de8110030f76de2d2c8ca2b885bb6d09 Mon Sep 17 00:00:00 2001 From: pdagobert Date: Mon, 27 Mar 2023 03:21:18 +0200 Subject: Fix dmd/ldc symbols generation --- xmake/modules/core/tools/dmd.lua | 4 ++-- xmake/modules/core/tools/ldc2.lua | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/xmake/modules/core/tools/dmd.lua b/xmake/modules/core/tools/dmd.lua index 2570bc240..e02a1ed0a 100644 --- a/xmake/modules/core/tools/dmd.lua +++ b/xmake/modules/core/tools/dmd.lua @@ -72,7 +72,7 @@ function nf_strip(self, level) end -- make the symbol flag -function nf_symbol(self, level) +function nf_symbol(self, level, target) local kind = self:kind() if language.sourcekinds()[kind] then local maps = _g.symbol_maps @@ -83,7 +83,7 @@ function nf_symbol(self, level) _g.symbol_maps = maps end return maps[level .. '_' .. kind] or maps[level] - elseif kind == "dcld" then + elseif (kind == "dcld" or kind == "dcsh") and target:is_plat("windows") and level == "debug" then return "-g" end end diff --git a/xmake/modules/core/tools/ldc2.lua b/xmake/modules/core/tools/ldc2.lua index b9c3d61e1..5a9f77026 100644 --- a/xmake/modules/core/tools/ldc2.lua +++ b/xmake/modules/core/tools/ldc2.lua @@ -49,7 +49,7 @@ function nf_optimize(self, level) end -- make the symbol flag -function nf_symbol(self, level) +function nf_symbol(self, level, target) local kind = self:kind() if language.sourcekinds()[kind] then local maps = _g.symbol_maps @@ -61,7 +61,7 @@ function nf_symbol(self, level) _g.symbol_maps = maps end return maps[level .. '_' .. kind] or maps[level] - elseif kind == "dcld" then + elseif (kind == "dcld" or kind == "dcsh") and target:is_plat("windows") and level == "debug" then return "-g" end end -- cgit v1.3.1 From feb5d21a6e9a0b657c659a8d28840147fbd5c62d Mon Sep 17 00:00:00 2001 From: pdagobert Date: Mon, 27 Mar 2023 08:10:31 +0200 Subject: Install dub in macos CI --- .github/workflows/macos.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 3aebacf6b..63a208bb1 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -31,6 +31,7 @@ jobs: - name: Installation run: | brew install dmd + brew install dub - name: Tests run: | -- cgit v1.3.1