d0p1/ack
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Wasn't exporting the plat headers; refactor to make this a little cleaner.

Browse source
This commit is contained in:
David Given 2016-08-14 11:01:36 +02:00
parent f253b6a169
commit b549980af2
13 changed files with 80 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lang/basic/lib/build.lua
View file

@ -11,7 +11,7 @@ for _, plat in ipairs(vars.plats) do
deps = {
"h+emheaders",
"lang/cem/libcc.ansi/headers+headers",
"plat/"..plat.."+headers",
"plat/"..plat.."/include+headers",
},
vars = { plat = plat }
}

2
lang/cem/libcc.ansi/build.lua
View file

@ -52,7 +52,7 @@ for _, plat in ipairs(vars.plats) do
hdrs = {}, -- must be empty
deps = {
"lang/cem/libcc.ansi/headers+headers",
"plat/"..plat.."+headers",
"plat/"..plat.."/include+headers",
},
vars = { plat = plat }
}

2
lang/m2/libm2/build.lua
View file

@ -30,7 +30,7 @@ for _, plat in ipairs(vars.plats) do
hdrs = {}, -- must be empty
deps = {
"lang/cem/libcc.ansi/headers+headers",
"plat/"..plat.."+headers",
"plat/"..plat.."/include+headers",
"h+emheaders",
},
vars = { plat = plat }

2
lang/pc/libpc/build.lua
View file

@ -19,7 +19,7 @@ for _, plat in ipairs(vars.plats) do
hdrs = {}, -- must be empty
deps = {
"lang/cem/libcc.ansi/headers+headers",
"plat/"..plat.."+headers",
"plat/"..plat.."/include+headers",
"h+emheaders",
},
vars = { plat = plat }

11
plat/cpm/build-headers.lua
View file

@ -1,11 +0,0 @@
include("plat/build.lua")
acklibrary {
name = "headers",
hdrs = {
["ack/config.h"] = "./include/ack/config.h",
["unistd.h"] = "./include/unistd.h",
["cpm.h"] = "./include/cpm.h",
}
}

1
plat/cpm/build-pkg.lua
View file

@ -18,6 +18,7 @@ installable {
map = {
"+tools",
"+libs",
"./include+pkg",
["$(PLATIND)/cpm/boot.o"] = "+boot"
}
}

25
plat/cpm/include/build.lua Normal file
View file

@ -0,0 +1,25 @@
include("plat/build.lua")
headermap = {}
packagemap = {}
local function addheader(h)
headermap[h] = "./"..h
packagemap["$(PLATIND)/cpm/include/"..h] = "./"..h
end
addheader("ack/config.h")
addheader("cpm.h")
addheader("unistd.h")
acklibrary {
name = "headers",
hdrs = headermap
}
installable {
name = "pkg",
map = packagemap
}

11
plat/linux386/build-headers.lua
View file

@ -1,11 +0,0 @@
include("plat/build.lua")
acklibrary {
name = "headers",
hdrs = {
["ack/config.h"] = "./include/ack/config.h",
["sys/ioctl.h"] = "./include/sys/ioctl.h",
["unistd.h"] = "./include/unistd.h",
}
}

1
plat/linux386/build-pkg.lua
View file

@ -17,6 +17,7 @@ installable {
map = {
"+tools",
"+libs",
"./include+pkg",
["$(PLATIND)/linux386/boot.o"] = "+boot"
}
}

24
plat/linux386/include/build.lua Normal file
View file

@ -0,0 +1,24 @@
include("plat/build.lua")
headermap = {}
packagemap = {}
local function addheader(h)
headermap[h] = "./"..h
packagemap["$(PLATIND)/linux386/include/"..h] = "./"..h
end
addheader("ack/config.h")
addheader("sys/ioctl.h")
addheader("unistd.h")
acklibrary {
name = "headers",
hdrs = headermap
}
installable {
name = "pkg",
map = packagemap
}

10
plat/pc86/build-headers.lua
View file

@ -1,10 +0,0 @@
include("plat/build.lua")
acklibrary {
name = "headers",
hdrs = {
["ack/config.h"] = "./include/ack/config.h",
["unistd.h"] = "./include/unistd.h",
}
}

1
plat/pc86/build-pkg.lua
View file

@ -17,6 +17,7 @@ installable {
map = {
"+tools",
"+libs",
"./include+pkg",
["$(PLATIND)/pc86/boot.o"] = "+boot"
}
}

24
plat/pc86/include/build.lua Normal file
View file

@ -0,0 +1,24 @@
include("plat/build.lua")
headermap = {}
packagemap = {}
local function addheader(h)
headermap[h] = "./"..h
packagemap["$(PLATIND)/pc86/include/"..h] = "./"..h
end
addheader("ack/config.h")
addheader("unistd.h")
acklibrary {
name = "headers",
hdrs = headermap
}
installable {
name = "pkg",
map = packagemap
}