Merge pull request #1219 from MartinNowak/nightlies_and_installer

add nightly channel and installer script to download page
dlang · Feb 1, 2016 · 8ed231e · 8ed231e
2 parents 669359f + 04f5ebb
commit 8ed231e
Showing 1 changed file with 30 additions and 6 deletions.
diff --git a/download.dd b/download.dd
@@ -71,7 +71,9 @@ $(DIVC download_channels,
 
     $(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 $(ARCH freebsd-32, tar.xz), i386) $(SBTN $(ARCH freebsd-64, tar.xz), x86_64))
+
+    $(INSTALL_SCRIPT curl -fsS https://dlang.org/install.sh | bash -s dmd)
   )
 
   $(BETA
@@ -91,9 +93,31 @@ $(DIVC download_channels,
 
     $(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))
+    $(DOWNLOAD $(FREEBSD), FreeBSD, $(SBTN $(B_ARCH freebsd-32, tar.xz), i386) $(SBTN $(B_ARCH freebsd-64, tar.xz), x86_64))
+
+    $(INSTALL_SCRIPT curl -fsS https://dlang.org/install.sh | bash -s dmd-beta)
     )
   )
+
+  $(DIVC download_channel,
+    $(H2 $(LNAME2 dmd-nightly,DMD Nightly))
+
+    $(BR)$(BR)
+
+    $(DOWNLOAD $(WINDOWS), Windows, $(SBTN $(N_ARCH windows, 7z), 7z))
+
+    $(DOWNLOAD $(OSX), OS X, $(SBTN $(N_ARCH osx, tar.xz), tar.xz))
+
+    $(DOWNLOAD $(UBUNTU) &nbsp; $(DEBIAN), Ubuntu/Debian, $(SBTN $(N_ARCH linux, tar.xz), tar.xz))
+
+    $(DOWNLOAD $(FEDORA) &nbsp; $(CENTOS), Fedora/CentOS, $(SBTN $(N_ARCH linux, tar.xz), tar.xz))
+
+    $(DOWNLOAD $(OPENSUSE), openSUSE, $(SBTN $(N_ARCH linux, tar.xz), tar.xz))
+
+    $(DOWNLOAD $(FREEBSD), FreeBSD, $(SBTN $(N_ARCH freebsd-32, tar.xz), i386) $(SBTN $(N_ARCH freebsd-64, tar.xz), x86_64))
+
+    $(INSTALL_SCRIPT curl -fsS https://dlang.org/install.sh | bash -s dmd-nightly)
+  )
 )
 
 $(H3
@@ -132,8 +156,6 @@ Macros:
 	RPM64=$(DLSITE dmd-$(DMDV2)-0.fedora.x86_64.rpm)
 	SUSE32=$(DLSITE dmd-$(DMDV2)-0.openSUSE.i386.rpm)
 	SUSE64=$(DLSITE dmd-$(DMDV2)-0.openSUSE.x86_64.rpm)
-    FBSD32=$(DLSITE dmd.$(DMDV2).freebsd-32.tar.xz)
-    FBSD64=$(DLSITE dmd.$(DMDV2).freebsd-64.tar.xz)
     OSXDMG=$(DLSITE dmd.$(DMDV2).dmg)
     WINEXE=$(DLSITE dmd-$(DMDV2).exe)
     ARCH=$(DLSITE dmd.$(DMDV2).$1.$2)
@@ -144,12 +166,12 @@ Macros:
     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)
 
+    N_ARCH=$(N_DLSITE dmd.master.$1.$2)
+
 	LOGO=<img src="images/$1_logo.png" alt="$2">
 	CENTOS=$(LOGO centos, CentOS)
 	DEBIAN=$(LOGO debian, Debian)
@@ -166,11 +188,13 @@ Macros:
     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
+    N_DLSITE=http://nightlies.dlang.org/dmd-nightly/$0
     DOWNLOAD =
     $(DIV,
         $(DIVC download_image, $1)
         $(DIVC download_paragraph, $(H3 $2) $3)
     )
+    INSTALL_SCRIPT=$(DIVC download_paragraph, $(H3 Install Script) $(PRE $(CODE $1)))
     IMG=<img src="images/$1">
 
     _= for sidebard subnavigation