diff --git a/src/BUILD.bazel b/convert/BUILD.bazel similarity index 100% rename from src/BUILD.bazel rename to convert/BUILD.bazel diff --git a/src/README.md b/convert/README.md similarity index 100% rename from src/README.md rename to convert/README.md diff --git a/src/convert.c b/convert/convert.c similarity index 96% rename from src/convert.c rename to convert/convert.c index b6aba4d..a6ce7db 100644 --- a/src/convert.c +++ b/convert/convert.c @@ -1,4 +1,4 @@ -#include "src/convert.h" +#include "convert/convert.h" struct ConvertEngine { ConvertBuildf build; diff --git a/src/convert.h b/convert/convert.h similarity index 99% rename from src/convert.h rename to convert/convert.h index 7960af9..678ad42 100644 --- a/src/convert.h +++ b/convert/convert.h @@ -2,7 +2,7 @@ #define convert_h /* convert.h - character set conversion routines. */ -#include "src/defs.h" +#include "convert/defs.h" /* Error codes. */ enum diff --git a/src/convert_1f.c b/convert/convert_1f.c similarity index 97% rename from src/convert_1f.c rename to convert/convert_1f.c index f987ef5..474fcef 100644 --- a/src/convert_1f.c +++ b/convert/convert_1f.c @@ -1,6 +1,6 @@ /* convert_1f.c - Forward conversion from extended ASCII to UTF-8. */ -#include "src/convert.h" -#include "src/defs.h" +#include "convert/convert.h" +#include "convert/defs.h" struct Convert1fData { /* Unicode characters, encoded in UTF-8, and packed MSB first. Always either diff --git a/src/convert_1r.c b/convert/convert_1r.c similarity index 99% rename from src/convert_1r.c rename to convert/convert_1r.c index ba502c6..cfbab46 100644 --- a/src/convert_1r.c +++ b/convert/convert_1r.c @@ -1,6 +1,6 @@ /* convert_1r.c - Reverse conversion from UTF-8 to extended ASCII. */ -#include "src/convert.h" -#include "src/defs.h" +#include "convert/convert.h" +#include "convert/defs.h" enum { diff --git a/src/convert_test.c b/convert/convert_test.c similarity index 98% rename from src/convert_test.c rename to convert/convert_test.c index 304be9a..e54785f 100644 --- a/src/convert_test.c +++ b/convert/convert_test.c @@ -1,8 +1,8 @@ /* Converter test. */ #define _XOPEN_SOURCE 500 -#include "src/convert.h" -#include "src/test.h" +#include "convert/convert.h" +#include "convert/test.h" #include #include @@ -74,7 +74,7 @@ static void ReadFile(const char *filename, void **datap, size_t *sizep) size_t size, alloc, newalloc, amt; int err; - StringPrintf(fnbuf, sizeof(fnbuf), "src/%s", filename); + StringPrintf(fnbuf, sizeof(fnbuf), "convert/%s", filename); fp = fopen(fnbuf, "rb"); if (fp == NULL) { diff --git a/src/defs.h b/convert/defs.h similarity index 100% rename from src/defs.h rename to convert/defs.h diff --git a/src/resources.h b/convert/resources.h similarity index 100% rename from src/resources.h rename to convert/resources.h diff --git a/src/test.h b/convert/test.h similarity index 94% rename from src/test.h rename to convert/test.h index 46aeaaa..f04fbf6 100644 --- a/src/test.h +++ b/convert/test.h @@ -2,7 +2,7 @@ #define test_h /* test.h - unit testing definitions. */ -#include "src/defs.h" +#include "convert/defs.h" /* List of all data files, terminated by NULL. */ extern const char *const kCharsetFilename[]; diff --git a/src/toolbox.c b/convert/toolbox.c similarity index 96% rename from src/toolbox.c rename to convert/toolbox.c index 68658a3..b2b643d 100644 --- a/src/toolbox.c +++ b/convert/toolbox.c @@ -3,8 +3,8 @@ This is used to run conversion tests on non-Mac OS systems to make development easier. These are not intended to make it possible to port the converter to non-Mac OS systems. */ -#include "src/defs.h" -#include "src/test.h" +#include "convert/defs.h" +#include "convert/test.h" #include #include diff --git a/gen/filenames.go b/gen/filenames.go index 3ce2deb..bb8fcca 100644 --- a/gen/filenames.go +++ b/gen/filenames.go @@ -11,7 +11,7 @@ func writeFilenames(charmaps []string, filename string) error { w := s.writer w.WriteString(header) w.WriteString( - "#include \"src/test.h\"\n" + + "#include \"convert/test.h\"\n" + "const char *const kCharsetFilename[] = {\n") for _, fn := range charmaps { if fn != "" { diff --git a/gen/main.go b/gen/main.go index f080199..e76bc81 100644 --- a/gen/main.go +++ b/gen/main.go @@ -44,7 +44,7 @@ func mainE() error { } destdir := flagDest if destdir == "" { - destdir = filepath.Join(srcdir, "src") + destdir = filepath.Join(srcdir, "convert") } // Read metadata. diff --git a/gen/scriptmap.go b/gen/scriptmap.go index 9cdd24f..7c64d36 100644 --- a/gen/scriptmap.go +++ b/gen/scriptmap.go @@ -79,7 +79,7 @@ func writeMap(d *scriptdata, m []*scriptmap, filename string) error { w := s.writer w.WriteString(header) w.WriteString( - "#include \"src/convert.h\"\n" + + "#include \"convert/convert.h\"\n" + "int GetCharmap(int script, int region) {\n" + "switch (script) {\n") for _, s := range m {