diff --git a/packages/l/luajit/xmake.lua b/packages/l/luajit/xmake.lua index 008a7719a..0ea2c9bf0 100644 --- a/packages/l/luajit/xmake.lua +++ b/packages/l/luajit/xmake.lua @@ -64,7 +64,6 @@ package("luajit") end) on_test(function (package) - print(os.getenv("PATH")) os.vrun("luajit -e \"print('hello xmake!')\"") assert(package:has_cfuncs("lua_pcall", {includes = "luajit.h"})) end) diff --git a/packages/p/python/xmake.lua b/packages/p/python/xmake.lua index 93c7f2358..06612a7e5 100644 --- a/packages/p/python/xmake.lua +++ b/packages/p/python/xmake.lua @@ -1,6 +1,5 @@ package("python") - set_kind("binary") set_homepage("https://www.python.org/") set_description("The python programming language.") @@ -40,50 +39,44 @@ package("python") add_deps("openssl", {host = true}) end + add_resources("3.7.0", "setuptools", "https://files.pythonhosted.org/packages/c2/f7/c7b501b783e5a74cf1768bc174ee4fb0a8a6ee5af6afa92274ff964703e0/setuptools-40.8.0.zip", "6e4eec90337e849ade7103723b9a99631c1f0d19990d6e8412dc42f5ae8b304d") + add_resources("3.7.0", "pip", "https://files.pythonhosted.org/packages/36/fa/51ca4d57392e2f69397cd6e5af23da2a8d37884a605f9e3f2d3bfdc48397/pip-19.0.3.tar.gz", "6e6f197a1abfb45118dbb878b5c859a0edbdd33fd250100bc015b67fded4b9f2") + add_resources("3.7.0", "wheel", "https://files.pythonhosted.org/packages/b7/cf/1ea0f5b3ce55cacde1e84cdde6cee1ebaff51bd9a3e6c7ba4082199af6f6/wheel-0.33.1.tar.gz", "66a8fd76f28977bb664b098372daef2b27f60dc4d1688cfab7b37a09448f0e9d") + + add_resources("2.7.15", "setuptools", "https://files.pythonhosted.org/packages/c2/f7/c7b501b783e5a74cf1768bc174ee4fb0a8a6ee5af6afa92274ff964703e0/setuptools-40.8.0.zip", "6e4eec90337e849ade7103723b9a99631c1f0d19990d6e8412dc42f5ae8b304d") + add_resources("2.7.15", "pip", "https://files.pythonhosted.org/packages/36/fa/51ca4d57392e2f69397cd6e5af23da2a8d37884a605f9e3f2d3bfdc48397/pip-19.0.3.tar.gz", "6e6f197a1abfb45118dbb878b5c859a0edbdd33fd250100bc015b67fded4b9f2") + add_resources("2.7.15", "wheel", "https://files.pythonhosted.org/packages/b7/cf/1ea0f5b3ce55cacde1e84cdde6cee1ebaff51bd9a3e6c7ba4082199af6f6/wheel-0.33.1.tar.gz", "66a8fd76f28977bb664b098372daef2b27f60dc4d1688cfab7b37a09448f0e9d") + on_load(function (package) + + -- add PATH + package:addenv("PATH", "bin") + + -- set includedirs + local version = package:version() + if version:ge("3.0") then + package:add("includedirs", ("include/python%d.%dm"):format(version:major(), version:minor())) + end + + -- define install_resources() package:data_set("install_resources", function() -- imports - import("net.http") - import("utils.archive") import("lib.detect.find_file") -- set python environments - local version = package:version() local envs = {} - if is_host("windows") and package:version():ge("3.0") then + if is_host("windows") and version:ge("3.0") then envs.PYTHONPATH = package:installdir("Lib", "site-packages") else envs.PYTHONPATH = package:installdir("lib", "python" .. version:major() .. "." .. version:minor(), "site-packages") end package:addenv("PYTHONPATH", envs.PYTHONPATH) - + -- install resources - local resources = - { - setuptools = - { - url = "https://files.pythonhosted.org/packages/c2/f7/c7b501b783e5a74cf1768bc174ee4fb0a8a6ee5af6afa92274ff964703e0/setuptools-40.8.0.zip", - sha256 = "6e4eec90337e849ade7103723b9a99631c1f0d19990d6e8412dc42f5ae8b304d" - }, - pip = - { - url = "https://files.pythonhosted.org/packages/36/fa/51ca4d57392e2f69397cd6e5af23da2a8d37884a605f9e3f2d3bfdc48397/pip-19.0.3.tar.gz", - sha256 = "6e6f197a1abfb45118dbb878b5c859a0edbdd33fd250100bc015b67fded4b9f2" - }, - wheel = - { - url = "https://files.pythonhosted.org/packages/b7/cf/1ea0f5b3ce55cacde1e84cdde6cee1ebaff51bd9a3e6c7ba4082199af6f6/wheel-0.33.1.tar.gz", - sha256 = "66a8fd76f28977bb664b098372daef2b27f60dc4d1688cfab7b37a09448f0e9d" - } - } local python = path.join(package:installdir("bin"), "python" .. (is_host("windows") and ".exe" or "")) - for name, resource in pairs(resources) do - local resourcefile = path.join(os.curdir(), path.filename(resource.url)) - local resourcedir = resourcefile .. ".dir" - http.download(resource.url, resourcefile) - assert(resource.sha256 == hash.sha256(resourcefile), "resource(%s): unmatched checksum!", name) - assert(archive.extract(resourcefile, resourcedir), "resource(%s): extract failed!", name) + for _, name in ipairs({"setuptools", "pip", "wheel"}) do + local resourcedir = assert(package:resourcedir(name), "resource(%s): not found!", name) local setupfile = assert(find_file("setup.py", path.join(resourcedir, "*")), "resource(%s): setup.py not found!", name) local oldir = os.cd(path.directory(setupfile)) os.vrunv(python, {"setup.py", "install", "--prefix=" .. package:installdir()}, {envs = envs}) @@ -164,6 +157,8 @@ package("python") os.cp(path.join(package:installdir("bin"), "python3"), path.join(package:installdir("bin"), "python")) os.cp(path.join(package:installdir("bin"), "python3-config"), path.join(package:installdir("bin"), "python-config")) end + + -- install resources package:data("install_resources")() end) @@ -172,4 +167,7 @@ package("python") os.vrun("python -c \"import pip\"") os.vrun("python -c \"import setuptools\"") os.vrun("python -c \"import wheel\"") + if not package:is_plat("windows") then + assert(package:has_cfuncs("PyModule_New", {includes = "Python.h"})) + end end) diff --git a/packages/p/python2/xmake.lua b/packages/p/python2/xmake.lua index 16f90410b..4feb90f1c 100644 --- a/packages/p/python2/xmake.lua +++ b/packages/p/python2/xmake.lua @@ -1,6 +1,5 @@ package("python2") - set_kind("binary") set_homepage("https://www.python.org/") set_description("The python programming language.") @@ -21,46 +20,35 @@ package("python2") if is_host("macosx", "linux") then add_deps("openssl", {host = true}) end + + add_resources("2.7.15", "setuptools", "https://files.pythonhosted.org/packages/c2/f7/c7b501b783e5a74cf1768bc174ee4fb0a8a6ee5af6afa92274ff964703e0/setuptools-40.8.0.zip", "6e4eec90337e849ade7103723b9a99631c1f0d19990d6e8412dc42f5ae8b304d") + add_resources("2.7.15", "pip", "https://files.pythonhosted.org/packages/36/fa/51ca4d57392e2f69397cd6e5af23da2a8d37884a605f9e3f2d3bfdc48397/pip-19.0.3.tar.gz", "6e6f197a1abfb45118dbb878b5c859a0edbdd33fd250100bc015b67fded4b9f2") + add_resources("2.7.15", "wheel", "https://files.pythonhosted.org/packages/b7/cf/1ea0f5b3ce55cacde1e84cdde6cee1ebaff51bd9a3e6c7ba4082199af6f6/wheel-0.33.1.tar.gz", "66a8fd76f28977bb664b098372daef2b27f60dc4d1688cfab7b37a09448f0e9d") on_load(function (package) + + -- add PATH + package:addenv("PATH", "bin") + + -- set includedirs + local version = package:version() + package:add("includedirs", ("include/python%d.%d"):format(version:major(), version:minor())) + + -- define install_resources() package:data_set("install_resources", function() -- imports - import("net.http") - import("utils.archive") import("lib.detect.find_file") -- set python environments - local version = package:version() - local envs = {PYTHONPATH = package:installdir("lib", "python" .. version:major() .. "." .. version:minor(), "site-packages")} + local envs = {} + envs.PYTHONPATH = package:installdir("lib", "python" .. version:major() .. "." .. version:minor(), "site-packages") package:addenv("PYTHONPATH", envs.PYTHONPATH) - + -- install resources - local resources = - { - setuptools = - { - url = "https://files.pythonhosted.org/packages/c2/f7/c7b501b783e5a74cf1768bc174ee4fb0a8a6ee5af6afa92274ff964703e0/setuptools-40.8.0.zip", - sha256 = "6e4eec90337e849ade7103723b9a99631c1f0d19990d6e8412dc42f5ae8b304d" - }, - pip = - { - url = "https://files.pythonhosted.org/packages/36/fa/51ca4d57392e2f69397cd6e5af23da2a8d37884a605f9e3f2d3bfdc48397/pip-19.0.3.tar.gz", - sha256 = "6e6f197a1abfb45118dbb878b5c859a0edbdd33fd250100bc015b67fded4b9f2" - }, - wheel = - { - url = "https://files.pythonhosted.org/packages/b7/cf/1ea0f5b3ce55cacde1e84cdde6cee1ebaff51bd9a3e6c7ba4082199af6f6/wheel-0.33.1.tar.gz", - sha256 = "66a8fd76f28977bb664b098372daef2b27f60dc4d1688cfab7b37a09448f0e9d" - } - } local python = path.join(package:installdir("bin"), "python" .. (is_host("windows") and ".exe" or "")) - for name, resource in pairs(resources) do - local resourcefile = path.join(os.curdir(), path.filename(resource.url)) - local resourcedir = resourcefile .. ".dir" - http.download(resource.url, resourcefile) - assert(resource.sha256 == hash.sha256(resourcefile), "resource(%s): unmatched checksum!", name) - assert(archive.extract(resourcefile, resourcedir), "resource(%s): extract failed!", name) + for _, name in ipairs({"setuptools", "pip", "wheel"}) do + local resourcedir = assert(package:resourcedir(name), "resource(%s): not found!", name) local setupfile = assert(find_file("setup.py", path.join(resourcedir, "*")), "resource(%s): setup.py not found!", name) local oldir = os.cd(path.directory(setupfile)) os.vrunv(python, {"setup.py", "install", "--prefix=" .. package:installdir()}, {envs = envs}) @@ -84,6 +72,38 @@ package("python2") table.insert(configs, "--datadir=" .. package:installdir("share")) table.insert(configs, "--datarootdir=" .. package:installdir("share")) + -- add flags + local cflags = {} + local ldflags = {} + if package:is_plat("macosx") then + local xcode_dir = get_config("xcode") + local xcode_sdkver = get_config("xcode_sdkver") + if xcode_dir and xcode_sdkver then + -- help Python's build system (setuptools/pip) to build things on SDK-based systems + -- the setup.py looks at "-isysroot" to get the sysroot (and not at --sysroot) + local xcode_sdkdir = xcode_dir .. "/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX" .. xcode_sdkver .. ".sdk" + table.insert(cflags, "-isysroot " .. xcode_sdkdir) + table.insert(cflags, "-I" .. path.join(xcode_sdkdir, "/usr/include")) + table.insert(ldflags, "-isysroot " .. xcode_sdkdir) + + -- for the Xlib.h, Python needs this header dir with the system Tk + -- yep, this needs the absolute path where zlib needed a path relative to the SDK. + table.insert(cflags, "-I" .. path.join(xcode_sdkdir, "/System/Library/Frameworks/Tk.framework/Versions/8.5/Headers")) + end + + -- avoid linking to libgcc https://mail.python.org/pipermail/python-dev/2012-February/116205.html + local target_minver = get_config("target_minver") + if target_minver then + table.insert(configs, "MACOSX_DEPLOYMENT_TARGET=" .. target_minver) + end + end + if #cflags > 0 then + table.insert(configs, "CFLAGS=" .. table.concat(cflags, " ")) + end + if #ldflags > 0 then + table.insert(configs, "LDFLAGS=" .. table.concat(ldflags, " ")) + end + -- add openssl libs path for detecting io.gsub("setup.py", "/usr/local/ssl", package:dep("openssl"):installdir()) @@ -104,4 +124,7 @@ package("python2") os.vrun("python2 -c \"import pip\"") os.vrun("python2 -c \"import setuptools\"") os.vrun("python2 -c \"import wheel\"") + if not package:is_plat("windows") then + assert(package:has_cfuncs("PyModule_New", {includes = "Python.h"})) + end end)