diff --git a/examples/injected-from-dependency/ahook.d b/examples/injected-from-dependency/ahook.d deleted file mode 100644 index d894409..0000000 --- a/examples/injected-from-dependency/ahook.d +++ /dev/null @@ -1,14 +0,0 @@ -module ahook; - -version(D_BetterC) { - pragma(crt_constructor) - extern(C) void someInitializer() { - import core.stdc.stdio; - printf("Hook ran!\n"); - } -} else { - shared static this() { - import std.stdio; - writeln("We have a runtime!!!!"); - } -} diff --git a/examples/injected-from-dependency/dependency/ahook.d b/examples/injected-from-dependency/dependency/ahook.d new file mode 100644 index 0000000..d894409 --- /dev/null +++ b/examples/injected-from-dependency/dependency/ahook.d @@ -0,0 +1,14 @@ +module ahook; + +version(D_BetterC) { + pragma(crt_constructor) + extern(C) void someInitializer() { + import core.stdc.stdio; + printf("Hook ran!\n"); + } +} else { + shared static this() { + import std.stdio; + writeln("We have a runtime!!!!"); + } +} diff --git a/examples/injected-from-dependency/dependency/dub.json b/examples/injected-from-dependency/dependency/dub.json new file mode 100644 index 0000000..419a4af --- /dev/null +++ b/examples/injected-from-dependency/dependency/dub.json @@ -0,0 +1,9 @@ +{ + "name": "toload", + "description": "Example to showcase injection of a source file from a dependency dependency.", + "targetType": "library", + "buildOptions": ["betterC"], + "sourcePaths": ["source"], + "importPaths": ["source"], + "injectSourceFiles": ["ahook.d"] +} diff --git a/examples/injected-from-dependency/dependency/source/something.d b/examples/injected-from-dependency/dependency/source/something.d new file mode 100644 index 0000000..c21c87d --- /dev/null +++ b/examples/injected-from-dependency/dependency/source/something.d @@ -0,0 +1,11 @@ +module something; + +void doSomething() { + import core.stdc.stdio; + + version(D_BetterC) { + printf("druntime is not in the executable :(\n"); + } else { + printf("druntime is in executable!\n"); + } +} diff --git a/examples/injected-from-dependency/dub.json b/examples/injected-from-dependency/dub.json deleted file mode 100644 index 7446c7c..0000000 --- a/examples/injected-from-dependency/dub.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "description": "Some test code for Have_druntime version", - "name": "injected-from-dependency", - "targetType": "executable", - - "dependencies": { - ":toload": "*" - }, - - "subPackages": [ - { - "name": "toload", - "buildOptions": ["betterC"], - "sourcePaths": ["toload"], - "importPaths": ["toload"], - "injectSourceFiles": ["ahook.d"] - } - ] -} diff --git a/examples/injected-from-dependency/source/entry.d b/examples/injected-from-dependency/source/entry.d deleted file mode 100644 index 6b4ed7c..0000000 --- a/examples/injected-from-dependency/source/entry.d +++ /dev/null @@ -1,4 +0,0 @@ -void main() { - import something; - doSomething(); -} diff --git a/examples/injected-from-dependency/toload/something.d b/examples/injected-from-dependency/toload/something.d deleted file mode 100644 index fca88f1..0000000 --- a/examples/injected-from-dependency/toload/something.d +++ /dev/null @@ -1,12 +0,0 @@ -module something; - -void doSomething() { - import core.stdc.stdio; - - version(D_BetterC) { - printf("druntime is not in the executable :(\n"); - - } else { - printf("druntime is in executable!\n"); - } -} diff --git a/examples/injected-from-dependency/usage/dub.json b/examples/injected-from-dependency/usage/dub.json new file mode 100644 index 0000000..7e2b410 --- /dev/null +++ b/examples/injected-from-dependency/usage/dub.json @@ -0,0 +1,8 @@ +{ + "name": "runner", + "description": "Example to showcase injection of a source file from a dependency runner.", + "targetType": "executable", + "dependencies": { + "toload": {"path": "../dependency"} + } +} \ No newline at end of file diff --git a/examples/injected-from-dependency/usage/source/entry.d b/examples/injected-from-dependency/usage/source/entry.d new file mode 100644 index 0000000..6b4ed7c --- /dev/null +++ b/examples/injected-from-dependency/usage/source/entry.d @@ -0,0 +1,4 @@ +void main() { + import something; + doSomething(); +}