Merge pull request #3981 from GoaLitiuM/d-win-fixes

Fix D support on Windows

12 files changed, 76 insertions, 30 deletions

diff --git a/test cases/d/3 shared library/installed_files.txt b/test cases/d/3 shared library/installed_files.txt
index d6a4dadf0..6658947af 100644
--- a/test cases/d/3 shared library/installed_files.txt
+++ b/test cases/d/3 shared library/installed_files.txt
@@ -1,2 +1,4 @@
 usr/bin/app_d?exe
-usr/lib/libstuff.so
+?msvc:usr/bin/stuff.dll
+?msvc:usr/lib/stuff.lib
+?gcc:usr/lib/libstuff.so
diff --git a/test cases/d/3 shared library/libstuff.d b/test cases/d/3 shared library/libstuff.d
index 676a643a9..8205490f7 100644
--- a/test cases/d/3 shared library/libstuff.d
+++ b/test cases/d/3 shared library/libstuff.d
@@ -1,9 +1,14 @@
-
 import std.stdio;
 import std.string : format;
 
-int printLibraryString (string str)
+export int printLibraryString (string str)
 {
     writeln ("Library says: %s".format (str));
     return 4;
 }
+
+version (Windows)
+{
+    import core.sys.windows.dll;
+    mixin SimpleDllMain;
+}
diff --git a/test cases/d/3 shared library/libstuff.di b/test cases/d/3 shared library/libstuff.di
new file mode 100644
index 000000000..b6454b180
--- /dev/null
+++ b/test cases/d/3 shared library/libstuff.di
@@ -0,0 +1,3 @@
+module libstuff;
+
+int printLibraryString (string str);
diff --git a/test cases/d/3 shared library/meson.build b/test cases/d/3 shared library/meson.build
index 461624248..64f972b73 100644
--- a/test cases/d/3 shared library/meson.build
+++ b/test cases/d/3 shared library/meson.build
@@ -11,11 +11,13 @@ ldyn = shared_library('stuff', 'libstuff.d', install : true)
 ed = executable('app_d', 'app.d', link_with : ldyn, install : true)
 test('linktest_dyn', ed)
 
-# test D attributes for pkg-config
-pkgc = import('pkgconfig')
-pkgc.generate(name: 'test',
-              libraries: ldyn,
-              subdirs: 'd/stuff',
-              description: 'A test of D attributes to pkgconfig.generate.',
-              d_module_versions: ['Use_Static']
-)
+if host_machine.system() != 'windows'
+  # test D attributes for pkg-config
+  pkgc = import('pkgconfig')
+  pkgc.generate(name: 'test',
+            libraries: ldyn,
+            subdirs: 'd/stuff',
+            description: 'A test of D attributes to pkgconfig.generate.',
+            d_module_versions: ['Use_Static']
+  )
+endif
diff --git a/test cases/d/4 library versions/installed_files.txt b/test cases/d/4 library versions/installed_files.txt
index b997e5392..2cf8d4b78 100644
--- a/test cases/d/4 library versions/installed_files.txt
+++ b/test cases/d/4 library versions/installed_files.txt
@@ -1,9 +1,17 @@
-usr/lib/libsome.so
-usr/lib/libsome.so.0
-usr/lib/libsome.so.1.2.3
-usr/lib/libnoversion.so
-usr/lib/libonlyversion.so
-usr/lib/libonlyversion.so.1
-usr/lib/libonlyversion.so.1.4.5
-usr/lib/libonlysoversion.so
-usr/lib/libonlysoversion.so.5
+?gcc:usr/lib/libsome.so
+?gcc:usr/lib/libsome.so.0
+?gcc:usr/lib/libsome.so.1.2.3
+?gcc:usr/lib/libnoversion.so
+?gcc:usr/lib/libonlyversion.so
+?gcc:usr/lib/libonlyversion.so.1
+?gcc:usr/lib/libonlyversion.so.1.4.5
+?gcc:usr/lib/libonlysoversion.so
+?gcc:usr/lib/libonlysoversion.so.5
+?msvc:usr/bin/noversion.dll
+?msvc:usr/bin/onlysoversion-5.dll
+?msvc:usr/bin/onlyversion-1.dll
+?msvc:usr/bin/some-0.dll
+?msvc:usr/lib/noversion.lib
+?msvc:usr/lib/onlysoversion.lib
+?msvc:usr/lib/onlyversion.lib
+?msvc:usr/lib/some.lib
diff --git a/test cases/d/4 library versions/lib.d b/test cases/d/4 library versions/lib.d
index 94df91e93..f1e177d99 100644
--- a/test cases/d/4 library versions/lib.d
+++ b/test cases/d/4 library versions/lib.d
@@ -3,8 +3,14 @@ import std.stdio;
 import std.string : format;
 
 @safe
-int printLibraryString (string str)
+export int printLibraryString (string str)
 {
     writeln ("Library says: %s".format (str));
     return 4;
 }
+
+version (Windows)
+{
+    import core.sys.windows.dll;
+    mixin SimpleDllMain;
+}
diff --git a/test cases/d/5 mixed/installed_files.txt b/test cases/d/5 mixed/installed_files.txt
index 9e7fccc9a..5f3f4e2cd 100644
--- a/test cases/d/5 mixed/installed_files.txt
+++ b/test cases/d/5 mixed/installed_files.txt
@@ -1,4 +1,6 @@
 usr/bin/appdc_d?exe
-usr/lib/libstuff.so
 usr/bin/appdc_s?exe
 usr/lib/libstuff.a
+?gcc:usr/lib/libstuff.so
+?msvc:usr/bin/stuff.dll
+?msvc:usr/lib/stuff.lib
diff --git a/test cases/d/7 multilib/installed_files.txt b/test cases/d/7 multilib/installed_files.txt
index fc6be1675..473479f51 100644
--- a/test cases/d/7 multilib/installed_files.txt
+++ b/test cases/d/7 multilib/installed_files.txt
@@ -1,7 +1,11 @@
 usr/bin/app_d?exe
-usr/lib/libsay1.so
-usr/lib/libsay1.so.0
-usr/lib/libsay1.so.1.2.3
-usr/lib/libsay2.so
-usr/lib/libsay2.so.1
-usr/lib/libsay2.so.1.2.4
+?gcc:usr/lib/libsay1.so
+?gcc:usr/lib/libsay1.so.0
+?gcc:usr/lib/libsay1.so.1.2.3
+?gcc:usr/lib/libsay2.so
+?gcc:usr/lib/libsay2.so.1
+?gcc:usr/lib/libsay2.so.1.2.4
+?msvc:usr/bin/say1-0.dll
+?msvc:usr/bin/say2-1.dll
+?msvc:usr/lib/say1.lib
+?msvc:usr/lib/say2.lib
diff --git a/test cases/d/7 multilib/say1.d b/test cases/d/7 multilib/say1.d
index 07127d316..605fd2355 100644
--- a/test cases/d/7 multilib/say1.d
+++ b/test cases/d/7 multilib/say1.d
@@ -2,8 +2,14 @@
 import std.stdio;
 import std.string : format;
 
-int sayHello1 (string str)
+export int sayHello1 (string str)
 {
     writeln ("Hello %s from library 1.".format (str));
     return 4;
 }
+
+version (Windows)
+{
+    import core.sys.windows.dll;
+    mixin SimpleDllMain;
+}
diff --git a/test cases/d/7 multilib/say1.di b/test cases/d/7 multilib/say1.di
new file mode 100644
index 000000000..8a9ff02da
--- /dev/null
+++ b/test cases/d/7 multilib/say1.di
@@ -0,0 +1 @@
+int sayHello1 (string str);
diff --git a/test cases/d/7 multilib/say2.d b/test cases/d/7 multilib/say2.d
index f77d0d232..7270ebd22 100644
--- a/test cases/d/7 multilib/say2.d
+++ b/test cases/d/7 multilib/say2.d
@@ -2,8 +2,14 @@
 import std.stdio;
 import std.string : format;
 
-int sayHello2 (string str)
+export int sayHello2 (string str)
 {
     writeln ("Hello %s from library 2.".format (str));
     return 8;
 }
+
+version (Windows)
+{
+    import core.sys.windows.dll;
+    mixin SimpleDllMain;
+}
diff --git a/test cases/d/7 multilib/say2.di b/test cases/d/7 multilib/say2.di
new file mode 100644
index 000000000..da712f0de
--- /dev/null
+++ b/test cases/d/7 multilib/say2.di
@@ -0,0 +1 @@
+int sayHello2 (string str);