---

yaml
---
r: 69111
b: refs/heads/auto
c: 51649b7
h: refs/heads/master
i:
  69109: 374a96a
  69107: d53fb13
  69103: e782519
v: v3

Author: bytwise

[refs]

@@ -14,6 +14,6 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 79677f05562ecc076feb2ee26958f53fb5fe5603
+refs/heads/auto: 51649b763e9115db8c95eaf1c0a3ba55c147ad9d
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c

branches/auto/mk/snap.mk

@@ -12,8 +12,13 @@ define DEF_SNAP_FOR_STAGE_H
 # $(1) stage
 # $(2) triple
 
+ifdef CFG_INSTALL_SNAP
+snap-stage$(1)-H-$(2): $$(HSREQ$(1)_H_$(2))
+	$(CFG_PYTHON) $(S)src/etc/make-snapshot.py stage$(1) $(2) install
+else
 snap-stage$(1)-H-$(2): $$(HSREQ$(1)_H_$(2))
 	$(CFG_PYTHON) $(S)src/etc/make-snapshot.py stage$(1) $(2)
+endif
 
 endef
 

branches/auto/src/etc/make-snapshot.py

@@ -3,4 +3,7 @@
 
 import snapshot, sys
 
-print(snapshot.make_snapshot(sys.argv[1], sys.argv[2]))
+if len(sys.argv) == 3:
+    print(snapshot.make_snapshot(sys.argv[1], sys.argv[2], ""))
+else:
+    print(snapshot.make_snapshot(sys.argv[1], sys.argv[2], sys.argv[3]))

branches/auto/src/etc/snapshot.py

@@ -156,7 +156,7 @@ def hash_file(x):
     return scrub(h.hexdigest())
 
 
-def make_snapshot(stage, triple):
+def make_snapshot(stage, triple, flag):
     kernel = get_kernel(triple)
     platform = get_platform(triple)
     rev = local_rev_short_sha()
@@ -190,4 +190,33 @@ def in_tar_name(fn):
 
     shutil.move(file0, file1)
 
+    if flag == "install":
+      # FIXME (#2664): this is an ugly quick hack; pls make it better
+      path  = file1
+      comps = path.split("-")
+      parts = { 'year': comps[2], \
+                'month': comps[3], \
+                'date': comps[4], \
+                'check': comps[5], \
+                'plat': comps[6], \
+                'arch': comps[7], \
+                'sha': comps[8].split(".")[0] }
+
+      shutil.move(path, "dl/" + path)
+      shutil.move('src/snapshots.txt', 'src/snapshots-old.txt')
+
+      newf = open('src/snapshots.txt', 'w')
+      newf.write("T %(year)s-%(month)s-%(date)s %(check)s\n" % parts)
+      newf.write("  %(plat)s-%(arch)s %(sha)s\n\n" % parts)
+
+      oldf = open('src/snapshots-old.txt', 'r')
+      for line in oldf:
+        newf.write(line)
+      oldf.close()
+
+      newf.close()
+
+      os.remove('src/snapshots-old.txt')
+
+
     return file1