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.
This commit is contained in:
Nigel Tao committed 2018-11-03 11:03:11 +11:00
1 parent 469ab1c9c1
commit 8eb9781a9d
5 files changed
+31 -13

No files matched your search

+9 -7
View File
@@ -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])
}
+3 -2
View File
@@ -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')
+7 -3
View File
@@ -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):]
+2 -1
View File
@@ -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
}
}
+10
View File
@@ -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