Better logging and restructuring

Author: johnno1962

CoreFoundation/Base.subproj/CFUtilities.c

@@ -768,12 +768,24 @@ void CFLog(CFLogLevel lev, CFStringRef format, ...) {
 // Temporary as Swift cannot import varag C functions
 void CFLog1(CFLogLevel lev, CFStringRef message) {
 #ifdef __ANDROID__
-    UInt8 buffer[4096];
-    CFIndex usedBufLen = sizeof buffer-1;
-    CFStringGetBytes(message, CFRangeMake(0, CFStringGetLength(message)),
-		     kCFStringEncodingUTF8, ' ', FALSE, buffer, usedBufLen, &usedBufLen);
-    buffer[usedBufLen] = '\000';
-    __android_log_print(ANDROID_LOG_INFO, "Swift", "%s", buffer);
+    android_LogPriority priority = ANDROID_LOG_UNKNOWN;
+    switch ( lev ) {
+        case kCFLogLevelEmergency: priority = ANDROID_LOG_FATAL; break;
+        case kCFLogLevelAlert: priority = ANDROID_LOG_ERROR; break;
+        case kCFLogLevelCritical: priority = ANDROID_LOG_ERROR; break;
+        case kCFLogLevelError: priority = ANDROID_LOG_ERROR; break;
+        case kCFLogLevelWarning: priority = ANDROID_LOG_WARN; break;
+        case kCFLogLevelNotice: priority = ANDROID_LOG_WARN; break;
+        case kCFLogLevelInfo: priority = ANDROID_LOG_INFO; break;
+        case kCFLogLevelDebug: priority = ANDROID_LOG_DEBUG; break;
+    }
+    CFIndex blen = message ? CFStringGetMaximumSizeForEncoding(CFStringGetLength(message), kCFStringEncodingUTF8) + 1 : 0;
+    char *buf = message ? (char *)malloc(blen) : 0;
+    if ( buf ) {
+        CFStringGetCString(message, buf, blen, kCFStringEncodingUTF8);
+        __android_log_print(priority, "Swift", "%s", buf);
+        free( buf );
+    }
 #else
     CFLog(lev, CFSTR("%@"), message);
 #endif

lib/script.py

@@ -39,15 +39,14 @@ def generate_products(self):
         if Configuration.current.verbose:
             verbose_flags += "-v"
         verbose_flags += "\n"
-        triple = Configuration.current.target.triple
+        swift_triple = Configuration.current.target.swift_triple
         base_flags = """
-TARGET                = """ + triple + """
+TARGET                = """ + Configuration.current.target.triple + """
 DSTROOT               = """ + Configuration.current.install_directory.absolute() + """
 """
-        swift_triple = triple if triple == "armv7-none-linux-androideabi" else Configuration.current.target.swift_triple
         if swift_triple is not None:
             base_flags += """
-SWIFT_TARGET          = """ + swift_triple + """
+SWIFT_TARGET          = """ + Configuration.current.target.swift_triple + """
 SWIFT_ARCH            = """ + Configuration.current.target.swift_arch + """
 """
         base_flags += """
@@ -131,10 +130,10 @@ def generate_products(self):
 
 
         ld_flags = """
-EXTRA_LD_FLAGS        = """ + Configuration.current.extra_ld_flags
+EXTRA_LD_FLAGS       = """ + Configuration.current.extra_ld_flags
 
         ld_flags += """
-TARGET_LDFLAGS        = --target=${TARGET} ${EXTRA_LD_FLAGS} -L${SDKROOT}/lib/swift/""" + Configuration.current.target.swift_sdk_name + """ """
+TARGET_LDFLAGS       = --target=${TARGET} ${EXTRA_LD_FLAGS} -L${SDKROOT}/lib/swift/""" + Configuration.current.target.swift_sdk_name + """ """
         if Configuration.current.system_root is not None:
             ld_flags += "--sysroot=${SYSROOT}"
 

lib/target.py

@@ -380,7 +380,10 @@ def swift_triple(self):
         elif self.sdk == OSType.Linux:
             # FIXME: It would be nice to detect the host ABI here
             if (self.arch == ArchType.armv6) or (self.arch == ArchType.armv7):
-                triple += "-unknown-linux-gnueabihf"
+                if Configuration.current.target.triple == "armv7-none-linux-androideabi":
+                    triple = Configuration.current.target.triple
+                else:
+                    triple += "-unknown-linux-gnueabihf"
             else:
                 triple += "-unknown-linux"
         elif self.sdk == OSType.FreeBSD: