From 7a1e1ecce3546eaf3e41e3fbb3e574c006938844 Mon Sep 17 00:00:00 2001 From: Jonathan M Davis Date: Thu, 28 Mar 2013 21:33:13 -0700 Subject: [PATCH] Another attempt at making d-yaml work with dub. Creating a symlink in source to the dyaml directory does not actually result in a symlink when another package grabs d-yaml as a dependency via dub, and even if it did, it wouldn't work on Windows. So, this moves the source into source so that it'll actually work, and cdc.d has been adjusted accordingly so that building with it should still work. --- cdc.d | 2 +- source/dyaml | 1 - {dyaml => source/dyaml}/all.d | 0 {dyaml => source/dyaml}/anchor.d | 0 {dyaml => source/dyaml}/composer.d | 0 {dyaml => source/dyaml}/constructor.d | 0 {dyaml => source/dyaml}/dumper.d | 0 {dyaml => source/dyaml}/emitter.d | 0 {dyaml => source/dyaml}/encoding.d | 0 {dyaml => source/dyaml}/escapes.d | 0 {dyaml => source/dyaml}/event.d | 0 {dyaml => source/dyaml}/exception.d | 0 {dyaml => source/dyaml}/fastcharsearch.d | 0 {dyaml => source/dyaml}/flags.d | 0 {dyaml => source/dyaml}/linebreak.d | 0 {dyaml => source/dyaml}/loader.d | 0 {dyaml => source/dyaml}/node.d | 0 {dyaml => source/dyaml}/parser.d | 0 {dyaml => source/dyaml}/queue.d | 0 {dyaml => source/dyaml}/reader.d | 0 {dyaml => source/dyaml}/representer.d | 0 {dyaml => source/dyaml}/resolver.d | 0 {dyaml => source/dyaml}/scanner.d | 0 {dyaml => source/dyaml}/serializer.d | 0 {dyaml => source/dyaml}/style.d | 0 {dyaml => source/dyaml}/tag.d | 0 {dyaml => source/dyaml}/tagdirective.d | 0 {dyaml => source/dyaml}/token.d | 0 {dyaml => source/dyaml}/zerostring.d | 0 yaml.d => source/yaml.d | 0 30 files changed, 1 insertion(+), 2 deletions(-) delete mode 120000 source/dyaml rename {dyaml => source/dyaml}/all.d (100%) rename {dyaml => source/dyaml}/anchor.d (100%) rename {dyaml => source/dyaml}/composer.d (100%) rename {dyaml => source/dyaml}/constructor.d (100%) rename {dyaml => source/dyaml}/dumper.d (100%) rename {dyaml => source/dyaml}/emitter.d (100%) rename {dyaml => source/dyaml}/encoding.d (100%) rename {dyaml => source/dyaml}/escapes.d (100%) rename {dyaml => source/dyaml}/event.d (100%) rename {dyaml => source/dyaml}/exception.d (100%) rename {dyaml => source/dyaml}/fastcharsearch.d (100%) rename {dyaml => source/dyaml}/flags.d (100%) rename {dyaml => source/dyaml}/linebreak.d (100%) rename {dyaml => source/dyaml}/loader.d (100%) rename {dyaml => source/dyaml}/node.d (100%) rename {dyaml => source/dyaml}/parser.d (100%) rename {dyaml => source/dyaml}/queue.d (100%) rename {dyaml => source/dyaml}/reader.d (100%) rename {dyaml => source/dyaml}/representer.d (100%) rename {dyaml => source/dyaml}/resolver.d (100%) rename {dyaml => source/dyaml}/scanner.d (100%) rename {dyaml => source/dyaml}/serializer.d (100%) rename {dyaml => source/dyaml}/style.d (100%) rename {dyaml => source/dyaml}/tag.d (100%) rename {dyaml => source/dyaml}/tagdirective.d (100%) rename {dyaml => source/dyaml}/token.d (100%) rename {dyaml => source/dyaml}/zerostring.d (100%) rename yaml.d => source/yaml.d (100%) diff --git a/cdc.d b/cdc.d index 2df92bc..5ef26c9 100755 --- a/cdc.d +++ b/cdc.d @@ -165,7 +165,7 @@ void main(string[] args) auto dbg = ["-debug", "-gc"]; auto optimize = ["-O", "-inline", "-release", "-noboundscheck"]; auto profile = ["-O", "-release", "-noboundscheck", "-gc"]; - auto lib_src = ["dyaml/", "yaml.d"]; + auto lib_src = ["source"]; void compile_(string[] args, string[] files) { diff --git a/source/dyaml b/source/dyaml deleted file mode 120000 index 00c7277..0000000 --- a/source/dyaml +++ /dev/null @@ -1 +0,0 @@ -../dyaml/ \ No newline at end of file diff --git a/dyaml/all.d b/source/dyaml/all.d similarity index 100% rename from dyaml/all.d rename to source/dyaml/all.d diff --git a/dyaml/anchor.d b/source/dyaml/anchor.d similarity index 100% rename from dyaml/anchor.d rename to source/dyaml/anchor.d diff --git a/dyaml/composer.d b/source/dyaml/composer.d similarity index 100% rename from dyaml/composer.d rename to source/dyaml/composer.d diff --git a/dyaml/constructor.d b/source/dyaml/constructor.d similarity index 100% rename from dyaml/constructor.d rename to source/dyaml/constructor.d diff --git a/dyaml/dumper.d b/source/dyaml/dumper.d similarity index 100% rename from dyaml/dumper.d rename to source/dyaml/dumper.d diff --git a/dyaml/emitter.d b/source/dyaml/emitter.d similarity index 100% rename from dyaml/emitter.d rename to source/dyaml/emitter.d diff --git a/dyaml/encoding.d b/source/dyaml/encoding.d similarity index 100% rename from dyaml/encoding.d rename to source/dyaml/encoding.d diff --git a/dyaml/escapes.d b/source/dyaml/escapes.d similarity index 100% rename from dyaml/escapes.d rename to source/dyaml/escapes.d diff --git a/dyaml/event.d b/source/dyaml/event.d similarity index 100% rename from dyaml/event.d rename to source/dyaml/event.d diff --git a/dyaml/exception.d b/source/dyaml/exception.d similarity index 100% rename from dyaml/exception.d rename to source/dyaml/exception.d diff --git a/dyaml/fastcharsearch.d b/source/dyaml/fastcharsearch.d similarity index 100% rename from dyaml/fastcharsearch.d rename to source/dyaml/fastcharsearch.d diff --git a/dyaml/flags.d b/source/dyaml/flags.d similarity index 100% rename from dyaml/flags.d rename to source/dyaml/flags.d diff --git a/dyaml/linebreak.d b/source/dyaml/linebreak.d similarity index 100% rename from dyaml/linebreak.d rename to source/dyaml/linebreak.d diff --git a/dyaml/loader.d b/source/dyaml/loader.d similarity index 100% rename from dyaml/loader.d rename to source/dyaml/loader.d diff --git a/dyaml/node.d b/source/dyaml/node.d similarity index 100% rename from dyaml/node.d rename to source/dyaml/node.d diff --git a/dyaml/parser.d b/source/dyaml/parser.d similarity index 100% rename from dyaml/parser.d rename to source/dyaml/parser.d diff --git a/dyaml/queue.d b/source/dyaml/queue.d similarity index 100% rename from dyaml/queue.d rename to source/dyaml/queue.d diff --git a/dyaml/reader.d b/source/dyaml/reader.d similarity index 100% rename from dyaml/reader.d rename to source/dyaml/reader.d diff --git a/dyaml/representer.d b/source/dyaml/representer.d similarity index 100% rename from dyaml/representer.d rename to source/dyaml/representer.d diff --git a/dyaml/resolver.d b/source/dyaml/resolver.d similarity index 100% rename from dyaml/resolver.d rename to source/dyaml/resolver.d diff --git a/dyaml/scanner.d b/source/dyaml/scanner.d similarity index 100% rename from dyaml/scanner.d rename to source/dyaml/scanner.d diff --git a/dyaml/serializer.d b/source/dyaml/serializer.d similarity index 100% rename from dyaml/serializer.d rename to source/dyaml/serializer.d diff --git a/dyaml/style.d b/source/dyaml/style.d similarity index 100% rename from dyaml/style.d rename to source/dyaml/style.d diff --git a/dyaml/tag.d b/source/dyaml/tag.d similarity index 100% rename from dyaml/tag.d rename to source/dyaml/tag.d diff --git a/dyaml/tagdirective.d b/source/dyaml/tagdirective.d similarity index 100% rename from dyaml/tagdirective.d rename to source/dyaml/tagdirective.d diff --git a/dyaml/token.d b/source/dyaml/token.d similarity index 100% rename from dyaml/token.d rename to source/dyaml/token.d diff --git a/dyaml/zerostring.d b/source/dyaml/zerostring.d similarity index 100% rename from dyaml/zerostring.d rename to source/dyaml/zerostring.d diff --git a/yaml.d b/source/yaml.d similarity index 100% rename from yaml.d rename to source/yaml.d