mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-21 08:47:28 +01:00
Generate .c files instead of .h files
The files' contents haven't changed (other than some relative #include's that refer to other .c files). Some build systems have difficulty recognizing .h files as things to be compiled, instead of just things referred to by things to be compiled.
This commit is contained in:
1 parent
b0429923fc
commit
04c91f1410
24 files changed
+40
-49
No files matched your search
@@ -83,11 +83,11 @@ var (
|
||||
|
||||
func genObj(outDir string, inDir string, cc string, dynamism string, filenames []string) error {
|
||||
for _, filename := range filenames {
|
||||
in := filepath.Join(inDir, filename+".h")
|
||||
in := filepath.Join(inDir, filename+".c")
|
||||
out := genlibOutFilename(outDir, dynamism, filename)
|
||||
|
||||
args := []string(nil)
|
||||
args = append(args, "-x", "c", "-O3", "-std=c99", "-DWUFFS_IMPLEMENTATION")
|
||||
args = append(args, "-O3", "-std=c99", "-DWUFFS_IMPLEMENTATION")
|
||||
if dynamism == "dynamic" {
|
||||
args = append(args, "-fPIC", "-DPIC")
|
||||
}
|
||||
|
||||
@@ -416,9 +416,9 @@ func (g *gen) genIncludes(b *buffer) error {
|
||||
}
|
||||
sort.Strings(usesList)
|
||||
|
||||
b.writes("#include \"./wuffs-base.h\"\n")
|
||||
b.writes("#include \"./wuffs-base.c\"\n")
|
||||
for _, use := range usesList {
|
||||
b.printf("#include \"./wuffs-%s.h\"\n",
|
||||
b.printf("#include \"./wuffs-%s.c\"\n",
|
||||
strings.Replace(use, "/", "-", -1))
|
||||
}
|
||||
|
||||
|
||||
@@ -53,7 +53,7 @@ func doGenrelease(args []string) error {
|
||||
// Calculate the base directory.
|
||||
baseDir := ""
|
||||
for _, filename := range args {
|
||||
if filepath.Base(filename) != "wuffs-base.h" {
|
||||
if filepath.Base(filename) != "wuffs-base.c" {
|
||||
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 == "wuffs-base.h" && (h.version != cf.Version{}) {
|
||||
if relFilename == "wuffs-base.c" && (h.version != cf.Version{}) {
|
||||
if subs, err := h.substituteWuffsVersion(f.fragments[0]); err != nil {
|
||||
return err
|
||||
} else {
|
||||
@@ -254,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, "wuffs-base.h")
|
||||
return nil, fmt.Errorf("could not find %q in %s", grVOverride, "wuffs-base.c")
|
||||
} else {
|
||||
ret = append(ret, s[:i]...)
|
||||
s = s[i+len(grVOverride):]
|
||||
|
||||
+4
-9
@@ -199,13 +199,8 @@ func (h *genHelper) genDir(dirname string, qualFilenames []string) error {
|
||||
}
|
||||
out := stdout.Bytes()
|
||||
|
||||
suffix := lang
|
||||
if suffix == "c" {
|
||||
suffix = "h"
|
||||
}
|
||||
|
||||
flatDirname := fmt.Sprintf("wuffs-%s", strings.Replace(dirname, "/", "-", -1))
|
||||
if err := h.genFile(flatDirname, lang, suffix, out); err != nil {
|
||||
if err := h.genFile(flatDirname, lang, out); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
@@ -237,9 +232,9 @@ func (h *genHelper) genDirDependencies(qualifiedFilenames []string) error {
|
||||
return h.gen("base", false)
|
||||
}
|
||||
|
||||
func (h *genHelper) genFile(dirname string, lang string, suffix string, out []byte) error {
|
||||
func (h *genHelper) genFile(dirname string, lang string, out []byte) error {
|
||||
return writeFile(
|
||||
filepath.Join(h.wuffsRoot, "gen", lang, filepath.FromSlash(dirname)+"."+suffix),
|
||||
filepath.Join(h.wuffsRoot, "gen", lang, filepath.FromSlash(dirname)+"."+lang),
|
||||
out,
|
||||
)
|
||||
}
|
||||
@@ -310,7 +305,7 @@ func (h *genHelper) genWuffs(dirname string, qualifiedFilenames []string) error
|
||||
}
|
||||
}
|
||||
}
|
||||
return h.genFile(dirname, "wuffs", "wuffs", out.Bytes())
|
||||
return h.genFile(dirname, "wuffs", out.Bytes())
|
||||
}
|
||||
|
||||
func (h *genHelper) genlibAffected() error {
|
||||
|
||||
+4
-13
@@ -28,12 +28,7 @@ import (
|
||||
func genrelease(wuffsRoot string, langs []string, v cf.Version) error {
|
||||
revision := findRevision(wuffsRoot)
|
||||
for _, lang := range langs {
|
||||
suffix := lang
|
||||
if suffix == "c" {
|
||||
suffix = "h"
|
||||
}
|
||||
|
||||
filename, contents, err := genreleaseLang(wuffsRoot, revision, v, lang, suffix)
|
||||
filename, contents, err := genreleaseLang(wuffsRoot, revision, v, lang)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -44,7 +39,7 @@ func genrelease(wuffsRoot string, langs []string, v cf.Version) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func genreleaseLang(wuffsRoot string, revision string, v cf.Version, lang string, suffix string) (filename string, contents []byte, err error) {
|
||||
func genreleaseLang(wuffsRoot string, revision string, v cf.Version, lang 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.
|
||||
@@ -55,7 +50,7 @@ func genreleaseLang(wuffsRoot string, revision string, v cf.Version, lang string
|
||||
os.RemoveAll(filepath.Join(baseDir, "std"))
|
||||
}
|
||||
|
||||
qualFilenames, err := findFiles(filepath.Join(wuffsRoot, "gen", lang), "."+suffix)
|
||||
qualFilenames, err := findFiles(filepath.Join(wuffsRoot, "gen", lang), "."+lang)
|
||||
if err != nil {
|
||||
return "", nil, err
|
||||
}
|
||||
@@ -81,11 +76,7 @@ func genreleaseLang(wuffsRoot string, revision string, v cf.Version, lang string
|
||||
if v.Major != 0 || v.Minor != 0 {
|
||||
base = fmt.Sprintf("wuffs-v%d.%d", v.Major, v.Minor)
|
||||
}
|
||||
ext := lang
|
||||
if ext == "c" {
|
||||
ext = "h"
|
||||
}
|
||||
return filepath.Join(wuffsRoot, "release", lang, base+"."+ext), stdout.Bytes(), nil
|
||||
return filepath.Join(wuffsRoot, "release", lang, base+"."+lang), stdout.Bytes(), nil
|
||||
}
|
||||
|
||||
func findRevision(wuffsRoot string) string {
|
||||
|
||||
Reference in new issue
Block a user