From f8d5e6d9a435973c2bdc0a0e7d236be230b96593 Mon Sep 17 00:00:00 2001
From: Matthias Neeracher <microtherion@gmail.com>
Date: Mon, 8 Dec 2014 05:35:33 +0100
Subject: [PATCH] Build cores without variants

---
 AVRsack/ASBuilder.swift | 21 +++++++++++----------
 AVRsack/BuildProject    |  2 +-
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/AVRsack/ASBuilder.swift b/AVRsack/ASBuilder.swift
index 2fad3a8..444a793 100644
--- a/AVRsack/ASBuilder.swift
+++ b/AVRsack/ASBuilder.swift
@@ -37,11 +37,13 @@ class ASBuilder {
         var corePath    = ""
         var variantPath : NSString?
         for hw in ASHardware.instance().directories {
-            corePath = hw+"/cores/"+boardProp["build.core"]
+            corePath = hw+"/cores/"+boardProp["build.core"]!
             if fileManager.fileExistsAtPath(corePath) {
-                if boardProp["build.variant"] != "" {
-                    variantPath = hw+"/variants/"+boardProp["build.variant"]
-                    if !fileManager.fileExistsAtPath(corePath) {
+                if let variantName = boardProp["build.variant"] {
+                    variantPath = hw+"/variants/"+variantName
+                    if fileManager.fileExistsAtPath(variantPath!) {
+                        args.append("variant="+variantName)
+                   } else {
                         variantPath = nil
                     }
                 }
@@ -51,16 +53,15 @@ class ASBuilder {
             }
         }
         if corePath == "" {
-            NSLog("Unable to find core %s\n", boardProp["build.core"])
+            NSLog("Unable to find core %s\n", boardProp["build.core"]!)
             return
         }
         args.append("project="+dir.lastPathComponent)
         args.append("board="+board)
-        args.append("mcu="+boardProp["build.mcu"])
-        args.append("f_cpu="+boardProp["build.f_cpu"])
-        args.append("max_size"+boardProp["upload.maximum_size"])
-        args.append("core="+boardProp["build.core"])
-        args.append("variant="+boardProp["build.variant"])
+        args.append("mcu="+boardProp["build.mcu"]!)
+        args.append("f_cpu="+boardProp["build.f_cpu"]!)
+        args.append("max_size"+boardProp["upload.maximum_size"]!)
+        args.append("core="+boardProp["build.core"]!)
         args.append("libs="+libPath)
         args.append("core_path="+corePath)
         if variantPath != nil {
diff --git a/AVRsack/BuildProject b/AVRsack/BuildProject
index ceb5e18..89ff8f7 100755
--- a/AVRsack/BuildProject
+++ b/AVRsack/BuildProject
@@ -160,7 +160,7 @@ def compile_library(lib)
     compile(lib.pathmap('lib/%f'), extrainc, *Rake::FileList[lib+"/*.{c,cpp,cp,cxx,S}", lib+"/utility/*.{c,cpp,cp,cxx,S}"])
 end
                             
-def compile_core(core,variant)
+def compile_core(core,variant=nil)
     list = Rake::FileList[core+"/*.{c,cpp,cp,cxx,S}"]
     list.add(variant+"/*.{c,cpp,cp,cxx,S}") if variant
     compile('core', nil, list)