Have gen's "single file C library" be .h not .c

This commit is contained in:
Nigel Tao committed 2018-07-14 09:26:10 +10:00
1 parent eac9ac13d2
commit f2e683ab69
4 files changed
+12 -7

No files matched your search

+2 -2
View File
@@ -78,11 +78,11 @@ var (
func genObj(outDir string, inDir string, cc string, dynamism string, filenames []string) error {
for _, filename := range filenames {
in := filepath.Join(inDir, filename+".c")
in := filepath.Join(inDir, filename+".h")
out := genlibOutFilename(outDir, dynamism, filename)
args := []string(nil)
args = append(args, "-O3", "-std=c99", "-DWUFFS_IMPLEMENTATION")
args = append(args, "-x", "c", "-O3", "-std=c99", "-DWUFFS_IMPLEMENTATION")
if dynamism == "dynamic" {
args = append(args, "-fPIC", "-DPIC")
}
+1 -1
View File
@@ -805,7 +805,7 @@ func (g *gen) writeUse(b *buffer, n *a.Use) error {
}
}
useeFilename := filepath.Join(g.wuffsRoot, "gen", "c", filepath.FromSlash(useDirname)+".c")
useeFilename := filepath.Join(g.wuffsRoot, "gen", "c", filepath.FromSlash(useDirname)+".h")
usee, err := ioutil.ReadFile(useeFilename)
if err != nil {
return err
+1 -1
View File
@@ -178,7 +178,7 @@ func (h *genHelper) genDir(dirname string, qualFilenames []string) error {
suffix := lang
if suffix == "c" {
// TODO: suffix = "h"
suffix = "h"
}
if err := h.genFile(dirname, lang, suffix, out); err != nil {
+8 -3
View File
@@ -57,7 +57,12 @@ func doGenrelease(wuffsRoot string, args []string) error {
revision := findRevision(wuffsRoot)
for _, lang := range langs {
filename, contents, err := doGenrelease1(wuffsRoot, revision, v, lang)
suffix := lang
if suffix == "c" {
suffix = "h"
}
filename, contents, err := doGenrelease1(wuffsRoot, revision, v, lang, suffix)
if err != nil {
return err
}
@@ -68,8 +73,8 @@ func doGenrelease(wuffsRoot string, args []string) error {
return nil
}
func doGenrelease1(wuffsRoot string, revision string, v cf.Version, lang string) (filename string, contents []byte, err error) {
qualFilenames, err := findFiles(filepath.Join(wuffsRoot, "gen", lang), "."+lang)
func doGenrelease1(wuffsRoot string, revision string, v cf.Version, lang string, suffix string) (filename string, contents []byte, err error) {
qualFilenames, err := findFiles(filepath.Join(wuffsRoot, "gen", lang), "."+suffix)
if err != nil {
return "", nil, err
}