瀏覽代碼

Fix doxygen (#1008)

* Fix doxygen

* Add spaces
Jérôme Leclercq 3 年之前
父節點
當前提交
ecbb48e2ed
共有 4 個文件被更改,包括 23 次插入22 次删除
  1. 5 1
      packages/b/bison/xmake.lua
  2. 9 20
      packages/d/doxygen/xmake.lua
  3. 5 1
      packages/f/flex/xmake.lua
  4. 4 0
      packages/w/winflexbison/xmake.lua

+ 5 - 1
packages/b/bison/xmake.lua

@@ -19,8 +19,12 @@ package("bison")
         add_deps("m4")
     end
 
+    on_load("macosx", "linux", "bsd", function (package)
+        package:addenv("PATH", "bin")
+    end)
+
     on_install("windows", function (package)
-        -- nothing to do, winflexbison does everything
+        -- handled by winflexbison
     end)
 
     on_install("macosx", "linux", "bsd", function (package)

+ 9 - 20
packages/d/doxygen/xmake.lua

@@ -4,28 +4,17 @@ package("doxygen")
     set_homepage("https://www.doxygen.nl/")
     set_license("GPL-2.0")
 
-    if is_host("windows") then
-        if is_arch("x86") then
-            add_urls("https://doxygen.nl/files/doxygen-$(version).windows.bin.zip")
-            add_versions("1.9.1", "c9782f545be757dac6e424f5347b7bbf1169da927058dc9954d801a5e8399de5")
-        elseif is_arch("x64") then
-            add_urls("https://doxygen.nl/files/doxygen-$(version).windows.x64.bin.zip")
-            add_versions("1.9.1", "deb8e6e5f21c965ec07fd32589d0332eff047f2c8658b5c56be4839a5dd43353")
-        end
-    else
-        add_urls("https://doxygen.nl/files/doxygen-$(version).src.tar.gz")
-        add_versions("1.9.1", "67aeae1be4e1565519898f46f1f7092f1973cce8a767e93101ee0111717091d1")
+    add_urls("https://doxygen.nl/files/doxygen-$(version).src.tar.gz", {alias = "archive"})
+    add_urls("https://github.com/doxygen/doxygen.git", {alias = "github"})
+    add_versions("archive:1.9.3", "f352dbc3221af7012b7b00935f2dfdc9fb67a97d43287d2f6c81c50449d254e0")
+    add_versions("github:1.9.3", "Release_1_9_3")
+    add_versions("github:1.9.2", "Release_1_9_2")
+    add_versions("github:1.9.1", "Release_1_9_1")
 
-        add_deps("cmake", "bison", "flex")
-        add_deps("python 3.x", {kind = "binary"})
-    end
+    add_deps("cmake", "bison", "flex", {private = true})
+    add_deps("python 3.x", {kind = "binary", private = true})
 
-    on_install("@windows", function (package)
-        os.mv("*.exe", package:installdir("bin"))
-        os.mv("*.dll", package:installdir("bin"))
-    end)
-
-    on_install("@macosx", "@linux", function (package)
+    on_install("@windows", "@macosx", "@linux", function (package)
         import("package.tools.cmake").install(package)
     end)
 

+ 5 - 1
packages/f/flex/xmake.lua

@@ -16,8 +16,12 @@ package("flex")
         add_deps("m4")
     end
 
+    on_load("macosx", "linux", function (package)
+        package:addenv("PATH", "bin")
+    end)
+
     on_install("windows", function (package)
-        -- nothing to do, winflexbison does everything
+        -- handled by winflexbison
     end)
 
     on_install("macosx", "linux", function (package)

+ 4 - 0
packages/w/winflexbison/xmake.lua

@@ -13,6 +13,10 @@ package("winflexbison")
 
     add_deps("cmake")
 
+    on_load(function (package)
+        package:addenv("PATH", "bin")
+    end)
+
     on_install("windows", function (package)
         local debugType = (package:debug() and "Debug" or "Release")
         local configs = {}