Browse Source

Bug 1564637 - Extend release template to understand 64-bit windows and linux downloads r=frg

Ian Neal 5 years ago
parent
commit
5d30db9820
2 changed files with 24 additions and 26 deletions
  1. 8 0
      lib/release.tmpl
  2. 16 26
      src/download.jst

+ 8 - 0
lib/release.tmpl

@@ -28,20 +28,28 @@
          longversion = smversion|replace('a','%20Alpha%20')|replace('b','%20Beta%20')|replace('rc','%20RC%20');
          IF platform == "win";
            "$ftpdir/win32/$locale/SeaMonkey%20Setup%20${longversion}.exe";
+         ELSIF platform == "win64";
+           "$ftpdir/win64/$locale/SeaMonkey%20Setup%20${longversion}.exe";
          ELSIF platform == "osx";
            "$ftpdir/mac/$locale/SeaMonkey%20${longversion}.dmg";
          ELSIF platform == "linux";
            "$ftpdir/linux-i686/$locale/seamonkey-${smversion}.tar.bz2";
+         ELSIF platform == "linux64";
+           "$ftpdir/linux-x86_64/$locale/seamonkey-${smversion}.tar.bz2";
          ELSE;
            "$ftpdir/$platform/$locale/";
          END;
        ELSE;
          IF platform == "win";
            "$ftpdir/win32/$locale/SeaMonkey%20Setup%20${smversion}.exe";
+         ELSIF platform == "win64";
+           "$ftpdir/win64/$locale/SeaMonkey%20Setup%20${smversion}.exe";
          ELSIF platform == "osx";
            "$ftpdir/mac/$locale/SeaMonkey%20${smversion}.dmg";
          ELSIF platform == "linux";
            "$ftpdir/linux-i686/$locale/seamonkey-${smversion}.tar.bz2";
+         ELSIF platform == "linux64";
+           "$ftpdir/linux-x86_64/$locale/seamonkey-${smversion}.tar.bz2";
          ELSE;
            "$ftpdir/$platform/$locale/";
          END;

+ 16 - 26
src/download.jst

@@ -1,26 +1,16 @@
 [%- wrap = false -%]
-var gPlatform = PLATFORM_WINDOWS;
-
-var PLATFORM_OTHER    = 0;
-var PLATFORM_WINDOWS  = 1;
-var PLATFORM_LINUX    = 2;
-var PLATFORM_MACOSX   = 3;
-var PLATFORM_MAC      = 4;
-
-if (navigator.platform.indexOf("Win32") != -1)
-  gPlatform = PLATFORM_WINDOWS;
-else if (navigator.platform.indexOf("Win64") != -1)
-  gPlatform = PLATFORM_WINDOWS;
-else if (navigator.platform.indexOf("Linux") != -1)
-  gPlatform = PLATFORM_LINUX;
-else if (navigator.userAgent.indexOf("Mac OS X") != -1)
-  gPlatform = PLATFORM_MACOSX;
-else if (navigator.userAgent.indexOf("MSIE 5.2") != -1)
-  gPlatform = PLATFORM_MACOSX;
-else if (navigator.platform.indexOf("Mac") != -1)
-  gPlatform = PLATFORM_MAC;
-else
-  gPlatform = PLATFORM_OTHER;
+var gPlatform = "";
+
+if (navigator.platform.includes("Win32"))
+  gPlatform = "win";
+else if (navigator.platform.includes("Win64"))
+  gPlatform = "win64";
+else if (navigator.platform.includes("Linux i"))
+  gPlatform = "linux";
+else if (navigator.platform.includes("Linux x"))
+  gPlatform = "linux64";
+else if (navigator.platform.includes("MacIntel"))
+  gPlatform = "osx";
 
 // "" for a version means it should be "Not Yet Available" on all.html,
 // null means it should not be listed
@@ -93,7 +83,7 @@ function LanguageID(aAB, aCD, aBuild)
 function buildValidForPlatform(aLangID, aPlatform)
 {
   if ((aLangID.abCD == "gu-IN" || aLangID.abCD == "pa-IN") &&
-      aPlatform == PLATFORM_MACOSX)
+      aPlatform == "osx")
     return false;
 
   return true;
@@ -176,17 +166,17 @@ function getLanguageID(betaversion)
 
 function highlightDownload(aIdBase, betaversion)
 {
-  if (gPlatform == PLATFORM_WINDOWS) {
+  if (gPlatform == "win" || gPlatform == "win64") {
     document.getElementById(aIdBase + "-win").className = "main";
     document.getElementById(aIdBase + "-linux").style.display = "none";
     document.getElementById(aIdBase + "-mac").style.display = "none";
   }
-  else if (gPlatform == PLATFORM_LINUX) {
+  else if (gPlatform == "linux" || gPlatform == "linux64") {
     document.getElementById(aIdBase + "-win").style.display = "none";
     document.getElementById(aIdBase + "-linux").className = "main";
     document.getElementById(aIdBase + "-mac").style.display = "none";
   }
-  else if (gPlatform == PLATFORM_MACOSX) {
+  else if (gPlatform == "osx") {
     document.getElementById(aIdBase + "-win").style.display = "none";
     document.getElementById(aIdBase + "-linux").style.display = "none";
     document.getElementById(aIdBase + "-mac").className = "main";