Do not use the OS and ARCH name in the snapshot version string (it causes

runtime/vm/snapshot.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/snapshot.h"
 
 #include "platform/assert.h"
 #include "vm/bigint_operations.h"
 #include "vm/bootstrap.h"
 #include "vm/class_finalizer.h"
@@ skipping 406 matching lines @@
 
   {
     NoGCScope no_gc;
     HeapLocker hl(isolate, old_space());
 
     // First read the version string, and check that it matches.
     obj_ = ReadObject();
 
     // If the version string doesn't match, return an error.
     // NB: New things are allocated only if we're going to return an error.
-    if (!obj_.IsString() || !String::Cast(obj_).Equals(Version::String())) {
+    if (!obj_.IsString() ||
+        !String::Cast(obj_).Equals(Version::SnapshotString())) {
       const intptr_t kMessageBufferSize = 128;
       char message_buffer[kMessageBufferSize];
       OS::SNPrint(message_buffer,
                   kMessageBufferSize,
                   "Wrong full snapshot version. Found %s expected %s",
                   obj_.ToCString(),
-                  Version::String());
+                  Version::SnapshotString());
       const String& msg = String::Handle(String::New(message_buffer));
       return ApiError::New(msg);
     }
 
     // The version string matches. Read the rest of the snapshot.
 
     // Read in all the objects stored in the object store.
     intptr_t num_flds = (object_store->to() - object_store->from());
     for (intptr_t i = 0; i <= num_flds; i++) {
       *(object_store->from() + i) = ReadObjectImpl();
@@ skipping 18 matching lines @@
 
 
 RawObject* SnapshotReader::ReadScriptSnapshot() {
   ASSERT(kind_ == Snapshot::kScript);
 
   // First read the version string, and check that it matches.
   obj_ = ReadObject();
 
   // If the version string doesn't match, return an error.
   // NB: New things are allocated only if we're going to return an error.
-  if (!obj_.IsString() || !String::Cast(obj_).Equals(Version::String())) {
+  if (!obj_.IsString() ||
+      !String::Cast(obj_).Equals(Version::SnapshotString())) {
     const intptr_t kMessageBufferSize = 256;
     char message_buffer[kMessageBufferSize];
     OS::SNPrint(message_buffer,
                 kMessageBufferSize,
                 "Wrong script snapshot version. Found %s expected '%s'",
                 obj_.ToCString(),
-                Version::String());
+                Version::SnapshotString());
     const String& msg = String::Handle(String::New(message_buffer));
     return ApiError::New(msg);
   }
 
   // The version string matches. Read the rest of the snapshot.
   obj_ = ReadObject();
   if (!obj_.IsLibrary()) {
     if (!obj_.IsError()) {
       const intptr_t kMessageBufferSize = 128;
       char message_buffer[kMessageBufferSize];
@@ skipping 751 matching lines @@
 #endif
 
   // Setup for long jump in case there is an exception while writing
   // the snapshot.
   LongJumpScope jump;
   if (setjmp(*jump.Set()) == 0) {
     // Reserve space in the output buffer for a snapshot header.
     ReserveHeader();
 
     // Write out the version string.
-    WriteObject(String::New(Version::String()));
+    WriteObject(String::New(Version::SnapshotString()));
 
     // Write out the full snapshot.
     {
       NoGCScope no_gc;
 
       // Write out all the objects in the object store of the isolate which
       // is the root set for all dart allocated objects at this point.
       SnapshotWriterVisitor visitor(this, false);
       object_store->VisitObjectPointers(&visitor);
 
@@ skipping 415 matching lines @@
   ASSERT(ClassFinalizer::AllClassesFinalized());
 
   // Setup for long jump in case there is an exception while writing
   // the snapshot.
   LongJumpScope jump;
   if (setjmp(*jump.Set()) == 0) {
     // Reserve space in the output buffer for a snapshot header.
     ReserveHeader();
 
     // Write out the version string.
-    WriteObject(String::New(Version::String()));
+    WriteObject(String::New(Version::SnapshotString()));
 
     // Write out the library object.
     {
       NoGCScope no_gc;
 
       // Write out the library object.
       WriteObject(lib.raw());
 
       FillHeader(kind());
       UnmarkAll();
@@ skipping 28 matching lines @@
     NoGCScope no_gc;
     WriteObject(obj.raw());
     UnmarkAll();
   } else {
     ThrowException(exception_type(), exception_msg());
   }
 }
 
 
 }  // namespace dart