From 42ce5c604e74edbb12a07151b0fb2c83f6723169 Mon Sep 17 00:00:00 2001 From: PucklaMotzer09 Date: Sat, 5 Mar 2022 14:40:48 +0100 Subject: [PATCH] Add scons 4.3.0 (#1041) * Add scons 4.3.0 * Change PYTHONPATH when calling setup.py * Use envs = syntax * Use env = installdir * Update xmake.lua * Update xmake.lua Co-authored-by: ruki --- packages/s/scons/xmake.lua | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/packages/s/scons/xmake.lua b/packages/s/scons/xmake.lua index 60d932d80..52b6dae12 100644 --- a/packages/s/scons/xmake.lua +++ b/packages/s/scons/xmake.lua @@ -7,6 +7,7 @@ package("scons") add_urls("https://github.com/SCons/scons/archive/refs/tags/$(version).zip", "https://github.com/SCons/scons.git") add_versions("4.1.0", "106259e92ba001feae5b50175bcec92306d0420bb08229fb037440cf303fcfc3") + add_versions("4.3.0", "c8cb3be5861c05a46250c60938857b9711c29a1500001da187e36dc05ee70295") add_deps("python 3.x", {kind = "binary"}) @@ -22,9 +23,15 @@ package("scons") package:addenv("PYTHONPATH", PYTHONPATH, PYTHONPATH1) -- setup.py install needs these - io.writefile("build/doc/man/scons.1", "") - io.writefile("build/doc/man/scons-time.1", "") - io.writefile("build/doc/man/sconsign.1", "") + if package:version():ge("4.3.0") then + io.writefile("scons.1", "") + io.writefile("scons-time.1", "") + io.writefile("sconsign.1", "") + else + io.writefile("build/doc/man/scons.1", "") + io.writefile("build/doc/man/scons-time.1", "") + io.writefile("build/doc/man/sconsign.1", "") + end os.vrunv("python", {"setup.py", "install", "--prefix", package:installdir()}) if package:is_plat("windows") then