add beta channel to download page

dlang · Oct 7, 2015 · e6cb4fa · e6cb4fa
1 parent 40cf759
commit e6cb4fa
Show file tree

Hide file tree

Showing 2 changed files with 64 additions and 13 deletions.
diff --git a/css/style.css b/css/style.css
@@ -211,6 +211,18 @@ h3.download
 	margin: 0;
 }
 
+/* release | beta | nightly */
+.download_channels
+{
+	word-spacing: 2em;
+}
+
+.download_channel
+{
+	display: inline-block;
+	word-spacing: initial;
+}
+
 .footnote
 {
 	font-style: italic;

diff --git a/download.dd b/download.dd
@@ -58,28 +58,49 @@ $(TABLEC download-compilers,
   )
 )
 
-$(H2 $(LNAME2 dmd,DMD $(DMDV2)))
-$(LINK2 changelog/$(DMDV2).html, Changelog)
+$(DIVC download_channels,
+  $(DIVC download_channel,
+    $(H2 $(LNAME2 dmd,DMD $(DMDV2)))
+    $(LINK2 changelog/$(DMDV2).html, Changelog)
 
-$(BR)$(BR)
+    $(BR)$(BR)
 
-$(DOWNLOAD $(WINDOWS), Windows, $(SBTN $(WINEXE), exe) $(SBTN $(ARCH windows, 7z), 7z))
+    $(DOWNLOAD $(WINDOWS), Windows, $(SBTN $(WINEXE), exe) $(SBTN $(ARCH windows, 7z), 7z))
 
-$(DOWNLOAD $(OSX), OS X, $(SBTN $(OSXDMG), dmg) $(SBTN $(ARCH osx, tar.xz), tar.xz))
+    $(DOWNLOAD $(OSX), OS X, $(SBTN $(OSXDMG), dmg) $(SBTN $(ARCH osx, tar.xz), tar.xz))
 
-$(DOWNLOAD $(UBUNTU) &nbsp; $(DEBIAN), Ubuntu/Debian, $(SBTN $(DEB32), i386) $(SBTN $(DEB64), x86_64) $(SBTN $(ARCH linux, tar.xz), tar.xz))
+    $(DOWNLOAD $(UBUNTU) &nbsp; $(DEBIAN), Ubuntu/Debian, $(SBTN $(DEB32), i386) $(SBTN $(DEB64), x86_64) $(SBTN $(ARCH linux, tar.xz), tar.xz))
 
-$(DOWNLOAD $(FEDORA) &nbsp; $(CENTOS), Fedora/CentOS, $(SBTN $(RPM32), i386) $(SBTN $(RPM64), x86_64) $(SBTN $(ARCH linux, tar.xz), tar.xz))
+    $(DOWNLOAD $(FEDORA) &nbsp; $(CENTOS), Fedora/CentOS, $(SBTN $(RPM32), i386) $(SBTN $(RPM64), x86_64) $(SBTN $(ARCH linux, tar.xz), tar.xz))
 
-$(DOWNLOAD $(OPENSUSE), openSUSE, $(SBTN $(SUSE32), i386) $(SBTN $(SUSE64), x86_64) $(SBTN $(ARCH linux, tar.xz), tar.xz))
+    $(DOWNLOAD $(OPENSUSE), openSUSE, $(SBTN $(SUSE32), i386) $(SBTN $(SUSE64), x86_64) $(SBTN $(ARCH linux, tar.xz), tar.xz))
 
-$(DOWNLOAD $(FREEBSD), FreeBSD, $(SBTN $(FBSD32), i386) $(SBTN $(FBSD64), x86_64))
+    $(DOWNLOAD $(FREEBSD), FreeBSD, $(SBTN $(FBSD32), i386) $(SBTN $(FBSD64), x86_64))
+  )
 
-$(H3
-    $(COMMENT
-        $(LINK2 http://downloads.dlang.org/pre-releases/2.x/2.068.1/, Beta 2.068.1-b2)
-        $(BR)
+  $(BETA
+  $(DIVC download_channel,
+    $(H2 $(LNAME2 dmd_beta,DMD Beta $(B_DMDV2)-$(B_SUFFIX)))
+    $(LINK2 changelog/$(B_DMDV2).html, Changelog)
+
+    $(BR)$(BR)
+
+    $(DOWNLOAD $(WINDOWS), Windows, $(SBTN $(B_WINEXE), exe) $(SBTN $(B_ARCH windows, 7z), 7z))
+
+    $(DOWNLOAD $(OSX), OS X, $(SBTN $(B_OSXDMG), dmg) $(SBTN $(B_ARCH osx, tar.xz), tar.xz))
+
+    $(DOWNLOAD $(UBUNTU) &nbsp; $(DEBIAN), Ubuntu/Debian, $(SBTN $(B_DEB32), i386) $(SBTN $(B_DEB64), x86_64) $(SBTN $(B_ARCH linux, tar.xz), tar.xz))
+
+    $(DOWNLOAD $(FEDORA) &nbsp; $(CENTOS), Fedora/CentOS, $(SBTN $(B_RPM32), i386) $(SBTN $(B_RPM64), x86_64) $(SBTN $(B_ARCH linux, tar.xz), tar.xz))
+
+    $(DOWNLOAD $(OPENSUSE), openSUSE, $(SBTN $(B_SUSE32), i386) $(SBTN $(B_SUSE64), x86_64) $(SBTN $(B_ARCH linux, tar.xz), tar.xz))
+
+    $(DOWNLOAD $(FREEBSD), FreeBSD, $(SBTN $(B_FBSD32), i386) $(SBTN $(B_FBSD64), x86_64))
     )
+  )
+)
+
+$(H3
     $(LINK2 http://downloads.dlang.org, Release Archive)
 )
 $(LINK2 gpg_keys.html, GPG keys)
@@ -103,6 +124,11 @@ Macros:
 
     DMDV2=$(LATEST)
 
+    _=BETA=$(COMMENT $0)
+    BETA=$0
+    B_DMDV2=2.069.0
+    B_SUFFIX=b1
+
 	DEB32=$(DLSITE dmd_$(DMDV2)-0_i386.deb)
 	DEB64=$(DLSITE dmd_$(DMDV2)-0_amd64.deb)
 	RPM32=$(DLSITE dmd-$(DMDV2)-0.fedora.i386.rpm)
@@ -115,6 +141,18 @@ Macros:
     WINEXE=$(DLSITE dmd-$(DMDV2).exe)
     ARCH=$(DLSITE dmd.$(DMDV2).$1.$2)
 
+    B_DEB32=$(B_DLSITE dmd_$(B_DMDV2)~$(B_SUFFIX)-0_i386.deb)
+    B_DEB64=$(B_DLSITE dmd_$(B_DMDV2)~$(B_SUFFIX)-0_amd64.deb)
+    B_RPM32=$(B_DLSITE dmd-$(B_DMDV2)~$(B_SUFFIX)-0.fedora.i386.rpm)
+    B_RPM64=$(B_DLSITE dmd-$(B_DMDV2)~$(B_SUFFIX)-0.fedora.x86_64.rpm)
+    B_SUSE32=$(B_DLSITE dmd-$(B_DMDV2)~$(B_SUFFIX)-0.openSUSE.i386.rpm)
+    B_SUSE64=$(B_DLSITE dmd-$(B_DMDV2)~$(B_SUFFIX)-0.openSUSE.x86_64.rpm)
+    B_FBSD32=$(B_DLSITE dmd.$(B_DMDV2)-$(B_SUFFIX).freebsd-32.tar.xz)
+    B_FBSD64=$(B_DLSITE dmd.$(B_DMDV2)-$(B_SUFFIX).freebsd-64.tar.xz)
+    B_OSXDMG=$(B_DLSITE dmd.$(B_DMDV2)-$(B_SUFFIX).dmg)
+    B_WINEXE=$(B_DLSITE dmd-$(B_DMDV2)-$(B_SUFFIX).exe)
+    B_ARCH=$(B_DLSITE dmd.$(B_DMDV2)-$(B_SUFFIX).$1.$2)
+
 	LOGO=<img src="images/$1_logo.png" alt="$2">
 	CENTOS=$(LOGO centos, CentOS)
 	DEBIAN=$(LOGO debian, Debian)
@@ -130,6 +168,7 @@ Macros:
     BTN=<a href="$1" class="btn">$+</a>
     H3I=<h3 class="download">$0</h3>
     DLSITE=http://downloads.dlang.org/releases/2.x/$(DMDV2)/$0
+    B_DLSITE=http://downloads.dlang.org/pre-releases/2.x/$(B_DMDV2)/$0
     DOWNLOAD =
     $(DIV,
         $(DIVC download_image, $1)