mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-21 08:47:28 +01:00
Ship as a "single file C library"
This commit is contained in:
1 parent
85c4de47b9
commit
a0bafff465
45 files changed
+9655
-16510
No files matched your search
+5
-15
@@ -175,21 +175,13 @@ func (h *genHelper) genDir(dirname string, qualFilenames []string) error {
|
||||
return err
|
||||
}
|
||||
out := stdout.Bytes()
|
||||
if err := h.genFile(dirname, lang, lang, out); err != nil {
|
||||
return err
|
||||
|
||||
suffix := lang
|
||||
if suffix == "c" {
|
||||
// TODO: suffix = "h"
|
||||
}
|
||||
|
||||
// Special-case the "c" generator to also write a .h file.
|
||||
if lang != "c" || packageName == "base" {
|
||||
continue
|
||||
}
|
||||
|
||||
if i := bytes.Index(out, cHeaderEndsHere); i >= 0 {
|
||||
out = out[:i]
|
||||
} else {
|
||||
return fmt.Errorf("%s: output did not contain %q", command, cHeaderEndsHere)
|
||||
}
|
||||
if err := h.genFile(dirname, "c", "h", out); err != nil {
|
||||
if err := h.genFile(dirname, lang, suffix, out); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
@@ -201,8 +193,6 @@ func (h *genHelper) genDir(dirname string, qualFilenames []string) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
var cHeaderEndsHere = []byte("\n// !! C HEADER ENDS HERE.\n\n")
|
||||
|
||||
func (h *genHelper) genDirDependencies(qualifiedFilenames []string) error {
|
||||
files, err := generate.ParseFiles(&h.tm, qualifiedFilenames, nil)
|
||||
if err != nil {
|
||||
|
||||
+9
-17
@@ -64,21 +64,6 @@ func doGenrelease(wuffsRoot string, args []string) error {
|
||||
if err := writeFile(filename, contents); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
// Special-case the "c" generator to also write a .h file.
|
||||
if lang != "c" {
|
||||
continue
|
||||
}
|
||||
|
||||
filename = filename[:len(filename)-1] + "h"
|
||||
if i := bytes.Index(contents, cHeaderEndsHere); i >= 0 {
|
||||
contents = contents[:i]
|
||||
} else {
|
||||
return fmt.Errorf("wuffs-c output did not contain %q", cHeaderEndsHere)
|
||||
}
|
||||
if err := writeFile(filename, contents); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
@@ -106,8 +91,15 @@ func doGenrelease1(wuffsRoot string, revision string, v cf.Version, lang string)
|
||||
return "", nil, err
|
||||
}
|
||||
|
||||
wv := fmt.Sprintf("wuffs-v%d.%d", v.Major, v.Minor)
|
||||
return filepath.Join(wuffsRoot, "release", lang, wv, wv+"."+lang), stdout.Bytes(), nil
|
||||
base := "unsupported-snapshot"
|
||||
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
|
||||
}
|
||||
|
||||
func findRevision(wuffsRoot string) string {
|
||||
|
||||
Reference in new issue
Block a user