ruki 6 年 前
コミット
c22520cf8f

+ 4 - 1
packages/g/glew/xmake.lua

@@ -11,6 +11,10 @@ package("glew")
         add_versions("2.1.0", "2700383d4de2455f06114fbaf872684f15529d4bdc5cdea69b5fb0e9aa7763f1")
     end
 
+    on_load("windows", function (package)
+        package:addvar("links", "glew32s")
+    end)
+
     on_install("windows", function (package)
         os.cp("include", package:installdir())
         if is_arch("x64") then
@@ -20,7 +24,6 @@ package("glew")
             os.cp("bin/Release/Win32/*.dll", package:installdir("lib"))
             os.cp("lib/Release/Win32/*.lib", package:installdir("lib"))
         end
-        package:addvar("links", "glew32s")
     end)
 
     on_install("linux", "macosx", function (package)

+ 4 - 1
packages/l/libuv/xmake.lua

@@ -15,9 +15,12 @@ package("libuv")
         add_deps("autoconf", "automake", "libtool", "pkg-config")
     end
 
+    on_load("windows", function (package)
+        package:addvar("links", "uv_a")
+    end)
+
     on_install("windows", function (package)
         import("package.tools.cmake").install(package)
-        package:addvar("links", "uv_a")
         os.cp("include", package:installdir())
     end)
 

+ 5 - 3
packages/l/libxml2/xmake.lua

@@ -12,18 +12,20 @@ package("libxml2")
         add_deps("autoconf", "automake", "libtool", "pkg-config")
     end
 
+    on_load(function (package)
+        package:addvar("includedirs", "include/libxml2")
+        package:addvar("links", "xml2")
+    end)
+
     if is_plat("windows") and winos.version():gt("winxp") then
         on_install("windows", function (package)
             os.cd("win32")
             os.vrun("cscript configure.js iso8859x=yes iconv=no compiler=msvc cruntime=/MT debug=%s prefix=\"%s\"", package:debug() and "yes" or "no", package:installdir())
             os.vrun("nmake /f Makefile.msvc")
             os.vrun("nmake /f Makefile.msvc install")
-            package:addvar("includedirs", "include/libxml2")
-            package:addvar("links", "libxml2")
         end)
     end
 
     on_install("macosx", "linux", function (package)
         import("package.tools.autoconf").install(package, {"--disable-dependency-tracking", "--without-python", "--without-lzma"})
-        package:addvar("includedirs", "include/libxml2")
     end)

+ 5 - 4
packages/p/pcre2/xmake.lua

@@ -14,16 +14,17 @@ package("pcre2")
         add_deps("cmake")
     end
 
+    on_load(function (package)
+        package:addvar("links", "pcre2-8")
+        package:addvar("defines", "PCRE2_CODE_UNIT_WIDTH=8")
+    end)
+
     if is_plat("windows") and winos.version():gt("winxp") then
         on_install("windows", function (package)
             import("package.tools.cmake").install(package)
-            package:addvar("links", "pcre2-8")
-            package:addvar("defines", "PCRE2_CODE_UNIT_WIDTH=8")
         end)
     end
 
     on_install("macosx", "linux", function (package)
         import("package.tools.autoconf").install(package, {"--enable-jit"})
-        package:addvar("links", "pcre2-8")
-        package:addvar("defines", "PCRE2_CODE_UNIT_WIDTH=8")
     end)

+ 8 - 2
packages/p/python/xmake.lua

@@ -22,6 +22,14 @@ package("python")
         add_versions("3.7.0", "85bb9feb6863e04fb1700b018d9d42d1caac178559ffa453d7e6a436e259fd0d")
     end
 
+    on_load(function (package)
+        if is_host("windows") then
+            package:addenv("PATH", path.join("share", package:name(), package:version_str()))
+        else
+            package:addenv("PATH", path.join("share", package:name(), package:version_str(), "bin"))
+        end
+    end)
+
     on_install("windows", function (package)
         local installdir = package:installdir("share", package:name(), package:version_str())
         if package:version_str():startswith("2.") then
@@ -33,11 +41,9 @@ package("python")
             os.cp("*", installdir)
             os.cp("python.exe", path.join(installdir, "python3.exe"))
         end
-        package:addenv("PATH", path.join("share", package:name(), package:version_str()))
     end)
 
     on_install("macosx", "linux", function (package)
         import("package.tools.autoconf").install(package, {prefix = package:installdir("share", package:name(), package:version_str())})
-        package:addenv("PATH", path.join("share", package:name(), package:version_str(), "bin"))
     end)
 

+ 8 - 2
packages/p/python2/xmake.lua

@@ -17,17 +17,23 @@ package("python2")
         add_versions("2.7.15", "18617d1f15a380a919d517630a9cd85ce17ea602f9bbdc58ddc672df4b0239db")
     end
 
+    on_load(function (package)
+        if is_host("windows") then
+            package:addenv("PATH", path.join("share", package:name(), package:version_str()))
+        else
+            package:addenv("PATH", path.join("share", package:name(), package:version_str(), "bin"))
+        end
+    end)
+
     on_install("windows", function (package)
         local installdir = package:installdir("share", package:name(), package:version_str())
         os.mkdir("targetdir")
         os.vrun("msiexec /a \"%s\" /quiet /qn TARGETDIR=\"%s\"", package:originfile(), path.absolute("targetdir"))
         os.cp("targetdir/*", installdir)
         os.cp("targetdir/python.exe", path.join(installdir, "python2.exe"))
-        package:addenv("PATH", path.join("share", package:name(), package:version_str()))
     end)
 
     on_install("macosx", "linux", function (package)
         import("package.tools.autoconf").install(package, {prefix = package:installdir("share", package:name(), package:version_str())})
-        package:addenv("PATH", path.join("share", package:name(), package:version_str(), "bin"))
     end)
 

+ 8 - 2
packages/p/python3/xmake.lua

@@ -17,15 +17,21 @@ package("python3")
         add_versions("3.7.0", "85bb9feb6863e04fb1700b018d9d42d1caac178559ffa453d7e6a436e259fd0d")
     end
 
+    on_load(function (package)
+        if is_host("windows") then
+            package:addenv("PATH", path.join("share", package:name(), package:version_str()))
+        else
+            package:addenv("PATH", path.join("share", package:name(), package:version_str(), "bin"))
+        end
+    end)
+
     on_install("windows", function (package)
         local installdir = package:installdir("share", package:name(), package:version_str())
         os.cp("*", installdir)
         os.cp("python.exe", path.join(installdir, "python3.exe"))
-        package:addenv("PATH", path.join("share", package:name(), package:version_str()))
     end)
 
     on_install("macosx", "linux", function (package)
         import("package.tools.autoconf").install(package, {prefix = package:installdir("share", package:name(), package:version_str())})
-        package:addenv("PATH", path.join("share", package:name(), package:version_str(), "bin"))
     end)