[build][platform libs] order build of libraries in topological order

build.gradle

@@ -16,6 +16,7 @@
 import groovy.io.FileType
 import org.jetbrains.kotlin.konan.target.*
 import org.jetbrains.kotlin.konan.properties.*
+import org.jetbrains.kotlin.konan.util.*
 
 defaultTasks 'clean', 'dist'
 
@@ -267,19 +268,20 @@ targetList.each { target ->
 
     targetDefFiles(target).forEach{
         defFile ->
-            def taskName = defFileToTaskName(target, defFile)
+            def taskName = defFileToTaskName(target, defFile.name)
             def suffix = null
             if (new PlatformInfo().isWindows())
                 suffix = 'bat'
             task(taskName, type:GradleBuild) {
                 dependsOn ':tools:kotlin-native-gradle-plugin:jar'
+                dependsOn defFile.config.depends.collect{defFileToTaskName(target, it)}
                 tasks = ['clean', 'klibInstall']
                 buildFile project('klib').file('platform.gradle')
                 dir project(':klib').projectDir
                 startParameter.projectProperties = [
                         'kotlin_version' : kotlin_version,
-                        'name'           : defToLibName(defFile),
-                        'defFile'        : defFile.absolutePath,
+                        'name'           : defFile.name,
+                        'defFile'        : defFile.file.absolutePath,
                         'konan.home'     : project.file('dist'),
                         'target'         : target,
                         'suffix'         : suffix
@@ -288,27 +290,31 @@ targetList.each { target ->
     }
 }
 
-private ArrayList<File> targetDefFiles(String target) {
+private ArrayList<DefFile> targetDefFiles(String target) {
     def platform = targetToPlatform(target)
-    project(':klib').file("src/platform/$platform").listFiles().findAll { it.name.endsWith(".def") }
+    def substitution = ['arch': target,
+                        'os'  : targetToOs(target)]
+    project(':klib').file("src/platform/$platform")
+            .listFiles()
+            .findAll { it.name.endsWith(".def") }
+            .collect { new DefFile(it, substitution) }
 }
 
 private String targetToPlatform(String target) {
-    new TargetManager(target).target.platform.name().toLowerCase()
+    new TargetManager(target).target.family.name().toLowerCase()
 }
 
-private String defFileToTaskName(String target, File defFile) {
-    def libname = defToLibName(defFile)
-    return "$target-$libname".toString()
+private String targetToOs(String target) {
+    new TargetManager(target).target.detailedName.toLowerCase()
 }
 
-private String defToLibName(File defFile) {
-    defFile.name.split('\\.').dropRight(1).join('.')
+private String defFileToTaskName(String target, String name) {
+    return "$target-$name".toString()
 }
 
 task distPlatformLibs {
     def target = TargetManager.host.name().toLowerCase()
-    dependsOn  targetDefFiles(target).collect {defFileToTaskName(target, it)}
+    dependsOn  targetDefFiles(target).collect {defFileToTaskName(target, it.name)}
 }
 
 task dist {