From 8eb9781a9dfe8832afdd6ea2e04a829b397f0f0a Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Sat, 3 Nov 2018 11:03:11 +1100 Subject: [PATCH] Have gen/c code use relative includes For example, gen/c/wuffs-std-gif.h now #include's "./wuffs-std-lzw.h" instead of "std/lzw.h", which removes the need to configure an -I directory when compiling it. --- cmd/wuffs-c/genlib.go | 16 +++++++++------- cmd/wuffs-c/internal/cgen/cgen.go | 5 +++-- cmd/wuffs-c/release.go | 10 +++++++--- cmd/wuffs/gen.go | 3 ++- cmd/wuffs/release.go | 10 ++++++++++ 5 files changed, 31 insertions(+), 13 deletions(-) diff --git a/cmd/wuffs-c/genlib.go b/cmd/wuffs-c/genlib.go index 460d5001..3db4d88c 100644 --- a/cmd/wuffs-c/genlib.go +++ b/cmd/wuffs-c/genlib.go @@ -35,6 +35,11 @@ func doGenlib(args []string) error { } args = flags.Args() + filenames := make([]string, len(args)) + for i, arg := range args { + filenames[i] = "wuffs-" + strings.Replace(filepath.ToSlash(arg), "/", "-", -1) + } + if *dstdirFlag == "" { return fmt.Errorf("empty -dstdir flag") } @@ -53,10 +58,10 @@ func doGenlib(args []string) error { if err := os.MkdirAll(outDir, 0755); err != nil { return err } - if err := genObj(outDir, *srcdirFlag, cc, dynamism, args); err != nil { + if err := genObj(outDir, *srcdirFlag, cc, dynamism, filenames); err != nil { return err } - if err := genLib(outDir, cc, dynamism, args); err != nil { + if err := genLib(outDir, cc, dynamism, filenames); err != nil { return err } } @@ -82,7 +87,7 @@ func genObj(outDir string, inDir string, cc string, dynamism string, filenames [ out := genlibOutFilename(outDir, dynamism, filename) args := []string(nil) - args = append(args, "-x", "c", "-O3", "-std=c99", "-DWUFFS_IMPLEMENTATION", "-I", inDir) + args = append(args, "-x", "c", "-O3", "-std=c99", "-DWUFFS_IMPLEMENTATION") if dynamism == "dynamic" { args = append(args, "-fPIC", "-DPIC") } @@ -127,8 +132,5 @@ func genLib(outDir string, cc string, dynamism string, filenames []string) error } func genlibOutFilename(outDir string, dynamism string, filename string) string { - filename = strings.Replace(filename, "/", "-", -1) - filename = strings.Replace(filename, "\\", "-", -1) - filename = filepath.Join(outDir, filename+objExtensions[dynamism]) - return filename + return filepath.Join(outDir, filename+objExtensions[dynamism]) } diff --git a/cmd/wuffs-c/internal/cgen/cgen.go b/cmd/wuffs-c/internal/cgen/cgen.go index 8ad0e3f6..615ee212 100644 --- a/cmd/wuffs-c/internal/cgen/cgen.go +++ b/cmd/wuffs-c/internal/cgen/cgen.go @@ -376,9 +376,10 @@ func (g *gen) genIncludes(b *buffer) error { } sort.Strings(usesList) - b.writes("#include \"base.h\"\n") + b.writes("#include \"./wuffs-base.h\"\n") for _, use := range usesList { - b.printf("#include \"%s.h\"\n", use) + b.printf("#include \"./wuffs-%s.h\"\n", + strings.Replace(use, "/", "-", -1)) } b.writeb('\n') diff --git a/cmd/wuffs-c/release.go b/cmd/wuffs-c/release.go index 37c51154..9b7ebfaf 100644 --- a/cmd/wuffs-c/release.go +++ b/cmd/wuffs-c/release.go @@ -53,7 +53,7 @@ func doGenrelease(args []string) error { // Calculate the base directory. baseDir := "" for _, filename := range args { - if filepath.Base(filename) != "base.h" { + if filepath.Base(filename) != "wuffs-base.h" { continue } baseDir = filepath.Dir(filename) @@ -188,7 +188,7 @@ func (h *genReleaseHelper) parse(relFilename string, s []byte) error { f.fragments[1] = s[:i] } - if relFilename == "base.h" && (h.version != cf.Version{}) { + if relFilename == "wuffs-base.h" && (h.version != cf.Version{}) { if subs, err := h.substituteWuffsVersion(f.fragments[0]); err != nil { return err } else { @@ -227,6 +227,10 @@ func (h *genReleaseHelper) gen(w *bytes.Buffer, relFilename string, which int, d } depth++ + if strings.HasPrefix(relFilename, "./") { + relFilename = relFilename[2:] + } + if h.seen[relFilename] { return nil } @@ -250,7 +254,7 @@ func (h *genReleaseHelper) gen(w *bytes.Buffer, relFilename string, which int, d func (h *genReleaseHelper) substituteWuffsVersion(s []byte) ([]byte, error) { ret := []byte(nil) if i := bytes.Index(s, grVOverride); i < 0 { - return nil, fmt.Errorf("could not find %q in %s", grVOverride, "base.h") + return nil, fmt.Errorf("could not find %q in %s", grVOverride, "wuffs-base.h") } else { ret = append(ret, s[:i]...) s = s[i+len(grVOverride):] diff --git a/cmd/wuffs/gen.go b/cmd/wuffs/gen.go index 2ebfe441..88668973 100644 --- a/cmd/wuffs/gen.go +++ b/cmd/wuffs/gen.go @@ -204,7 +204,8 @@ func (h *genHelper) genDir(dirname string, qualFilenames []string) error { suffix = "h" } - if err := h.genFile(dirname, lang, suffix, out); err != nil { + flatDirname := fmt.Sprintf("wuffs-%s", strings.Replace(dirname, "/", "-", -1)) + if err := h.genFile(flatDirname, lang, suffix, out); err != nil { return err } } diff --git a/cmd/wuffs/release.go b/cmd/wuffs/release.go index 1a3a9a2b..b9724fe7 100644 --- a/cmd/wuffs/release.go +++ b/cmd/wuffs/release.go @@ -45,6 +45,16 @@ func genrelease(wuffsRoot string, langs []string, v cf.Version) error { } func genreleaseLang(wuffsRoot string, revision string, v cf.Version, lang string, suffix string) (filename string, contents []byte, err error) { + // During a transitional period (starting in November 2018), remove any + // existing wuffs-c generated files that use the old naming scheme (e.g. + // "base.h" or "std/gif.h") instead of the new naming scheme (e.g. + // "wuffs-base.h" or "wuffs-std-gif.h"). + if lang == "c" { + baseDir := filepath.Join(wuffsRoot, "gen", lang) + os.Remove(filepath.Join(baseDir, "base.h")) + os.RemoveAll(filepath.Join(baseDir, "std")) + } + qualFilenames, err := findFiles(filepath.Join(wuffsRoot, "gen", lang), "."+suffix) if err != nil { return "", nil, err