improve specfile for pack

5 files changed, 8 insertions, 25 deletions

diff --git a/xmake/plugins/pack/nsis/main.lua b/xmake/plugins/pack/nsis/main.lua
index b8f6d4dc4..c24c718fe 100644
--- a/xmake/plugins/pack/nsis/main.lua
+++ b/xmake/plugins/pack/nsis/main.lua
@@ -250,9 +250,9 @@ end
 function _pack_nsis(makensis, package)
 
     -- install the initial specfile
-    local specfile = package:specfile()
+    local specfile = path.join(package:buildir(), package:basename() .. ".nsi")
     if not os.isfile(specfile) then
-        local specfile_template = path.join(os.programdir(), "scripts", "xpack", "nsis", "makensis.nsi")
+        local specfile_template = package:get("specfile") or path.join(os.programdir(), "scripts", "xpack", "nsis", "makensis.nsi")
         os.cp(specfile_template, specfile)
     end
 
diff --git a/xmake/plugins/pack/runself/main.lua b/xmake/plugins/pack/runself/main.lua
index 8f25c3e80..eb5c01fb1 100644
--- a/xmake/plugins/pack/runself/main.lua
+++ b/xmake/plugins/pack/runself/main.lua
@@ -108,9 +108,9 @@ end
 function _pack_runself(makeself, package)
 
     -- install the initial specfile
-    local specfile = package:specfile()
+    local specfile = path.join(package:buildir(), package:basename() .. ".lsm")
     if not os.isfile(specfile) then
-        local specfile_template = path.join(os.programdir(), "scripts", "xpack", "runself", "makeself.lsm")
+        local specfile_template = package:get("specfile") or path.join(os.programdir(), "scripts", "xpack", "runself", "makeself.lsm")
         os.cp(specfile_template, specfile)
     end
 
diff --git a/xmake/plugins/pack/srpm/main.lua b/xmake/plugins/pack/srpm/main.lua
index b6b5467c8..e8630ba58 100644
--- a/xmake/plugins/pack/srpm/main.lua
+++ b/xmake/plugins/pack/srpm/main.lua
@@ -202,9 +202,9 @@ function _pack_srpm(rpmbuild, package)
     end
 
     -- install the initial specfile
-    local specfile = package:specfile()
+    local specfile = path.join(package:buildir(), package:basename() .. ".spec")
     if not os.isfile(specfile) then
-        local specfile_template = path.join(os.programdir(), "scripts", "xpack", "srpm", "srpm.spec")
+        local specfile_template = package:get("specfile") or path.join(os.programdir(), "scripts", "xpack", "srpm", "srpm.spec")
         os.cp(specfile_template, specfile)
     end
 
diff --git a/xmake/plugins/pack/wix/main.lua b/xmake/plugins/pack/wix/main.lua
index 95b6a4a7f..a99ecdb6e 100644
--- a/xmake/plugins/pack/wix/main.lua
+++ b/xmake/plugins/pack/wix/main.lua
@@ -258,9 +258,9 @@ end
 function _pack_wix(wix, package)
 
     -- install the initial specfile
-    local specfile = package:specfile()
+    local specfile = path.join(package:buildir(), package:basename() .. ".wxs")
     if not os.isfile(specfile) then
-        local specfile_template = path.join(os.programdir(), "scripts", "xpack", "wix", "msi.wxs")
+        local specfile_template = package:get("specfile") or path.join(os.programdir(), "scripts", "xpack", "wix", "msi.wxs")
         os.cp(specfile_template, specfile)
     end
 
diff --git a/xmake/plugins/pack/xpack.lua b/xmake/plugins/pack/xpack.lua
index ccf76ebf5..6d82536d4 100644
--- a/xmake/plugins/pack/xpack.lua
+++ b/xmake/plugins/pack/xpack.lua
@@ -319,23 +319,6 @@ function xpack:specvars()
     return specvars
 end
 
--- get the specfile path
-function xpack:specfile()
-    local specfile = self:get("specfile")
-    if not specfile then
-        local extensions = {
-            wix     = ".wxs",
-            nsis    = ".nsi",
-            srpm    = ".spec",
-            rpm     = ".spec",
-            runself = ".lsm"
-        }
-        local extension = extensions[self:format()] or ".spec"
-        specfile = path.join(self:buildir(), self:basename() .. extension)
-    end
-    return specfile
-end
-
 -- get the extension
 function xpack:extension()
     local extension = self:get("extension")