Author: buildbot
Date: Mon Feb 10 23:17:29 2014
New Revision: 897260
Log:
Staging update by buildbot for ooo-site
Modified:
websites/staging/ooo-site/trunk/cgi-bin/ (props changed)
websites/staging/ooo-site/trunk/content/ (props changed)
websites/staging/ooo-site/trunk/content/download/test/download.js
Propchange: websites/staging/ooo-site/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Mon Feb 10 23:17:29 2014
@@ -1 +1 @@
-1566826
+1566831
Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Mon Feb 10 23:17:29 2014
@@ -1 +1 @@
-1566826
+1566831
Modified: websites/staging/ooo-site/trunk/content/download/test/download.js
==============================================================================
--- websites/staging/ooo-site/trunk/content/download/test/download.js (original)
+++ websites/staging/ooo-site/trunk/content/download/test/download.js Mon Feb
10 23:17:29 2014
@@ -27,7 +27,7 @@ var CHECKSUM_ASC = ""; // The
ASC fil
var CHECKSUM_MD5 = ""; // The MD5 file as
download URL
var CHECKSUM_SHA256 = ""; // The SHA256 file as
download URL
var SOURCEFORGE = false; // The download
URL points to Soureforge
-var DL_OTHER = false; // The download URL
points to 'other.html'
+var OTHER = false; // The download URL
points to 'other.html'
var ARCHIVE = false; // The download URL
points to the ASF archive
var ERROR = false; // The download URL is
correct (false) or not (true)?
@@ -139,17 +139,37 @@ function getLink() {
*/
if ( hasMirrorLink() ) {
- // If platform is too old (e.g., Mac OS X 10.6 or older), then
do not provide a download link.
- // But instead link to an AOO file in the archive.
+ // If platform is too old, then provide a general download link
to the archive.
if ( OLD_PLATFORM ) {
LINK = "http://archive.apache.org/dist/openoffice/";;
+
+ CHECKSUM_KEYS =
"https://people.apache.org/keys/group/openoffice.asc";;
+ CHECKSUM_ASC =
"http://archive.apache.org/dist/openoffice/";;
+ CHECKSUM_MD5 =
"http://archive.apache.org/dist/openoffice/";;
+ CHECKSUM_SHA256 =
"http://archive.apache.org/dist/openoffice/";;
+
+ if ( UI_PLATFORM == "Mac OS X (10.6 or older)" ) {
+ // If platform is Mac OS X <=10.6, then provide
a download link with previous AOO version.
+
+ FILENAME = "Apache_OpenOffice_" +
PRE_VERSION + "_" + URL_PLATFORM + "_";
+ FILENAME = FILENAME + NL_LANGUAGE +
EXTENSION;
+ LINK = SOURCEFORGE_PREVIOUS_URL +
NL_LANGUAGE + "/" + FILENAME + "/download";
+
+ chk_link = APACHE_DIST_PREVIOUS_URL +
"/binaries/" + NL_LANGUAGE + "/" + FILENAME;
+
+ CHECKSUM_KEYS =
"https://people.apache.org/keys/group/openoffice.asc";;
+ CHECKSUM_ASC = chk_link + ".asc";
+ CHECKSUM_MD5 = chk_link + ".md5";
+ CHECKSUM_SHA256 = chk_link + ".sha256";
+ }
+
ARCHIVE = true;
ERROR = true;
return LINK;
}
if ( URL_PLATFORM == "" ) {
- // If no platform was recognized, set the "other.html"
webpage as alternative download URL
+ // If no platform was recognized, then provide a
general download link to the "other.html" webpage.
if ( UI_PLATFORM == "" )
UI_PLATFORM = "unknown platform/OS";
@@ -158,7 +178,7 @@ function getLink() {
ERROR = true;
return LINK;
} else {
- // If platform was recognized, get the download
filename and checksum filename
+ // If platform was recognized, assemble the filenames
for download and checksums
// FILENAME = "Apache_OpenOffice_" + VERSION + "_"
+ URL_PLATFORM + "_" + NL_LANGUAGE;
// FILENAME = FILENAME + EXTENSION;
@@ -183,12 +203,14 @@ function getLink() {
return LINK;
/*
- Used for debugging
- LINK = PEOPLE_BASE_URL + "/binaries/" + NL_LANGUAGE
+ "/Apache_OpenOffice_";
- LINK = LINK + "/Apache_OpenOffice_" + "_" +
NL_LANGUAGE + EXTENSION;
- chk_link = PEOPLE_BASE_URL + "/binaries/" + NL_LANGUAGE
+ "/Apache_OpenOffice_" + VERSION;
- chk_link = chk_link + "_" + URL_PLATFORM + "_" +
NL_LANGUAGE + EXTENSION;
- SOURCEFORGE = true;
+ } else {
+ // Used for debugging
+ LINK = PEOPLE_BASE_URL + "/binaries/" +
NL_LANGUAGE + "/Apache_OpenOffice_";
+ LINK = LINK + "/Apache_OpenOffice_" + "_" +
NL_LANGUAGE + EXTENSION;
+ chk_link = PEOPLE_BASE_URL + "/binaries/" +
NL_LANGUAGE + "/Apache_OpenOffice_" + VERSION;
+ chk_link = chk_link + "_" + URL_PLATFORM + "_" +
NL_LANGUAGE + EXTENSION;
+ SOURCEFORGE = true;
+ }
return LINK;
*/
} else {
@@ -244,7 +266,9 @@ function getPlatform() {
if ( os.indexOf( "qnx" ) != -1 ) UI_PLATFORM
= "QNX";
if ( os.indexOf( "x11" ) != -1 ) UI_PLATFORM
= "unknown OS (X11 support)";
if ( os.indexOf( "arm" ) != -1 ) UI_PLATFORM
= "ARM mobile devices";
- if ( os.indexOf( "sunos" ) != -1 ) UI_PLATFORM
= "Solaris x86 (PKG)";
+ if ( os.indexOf( "sunos" ) != -1 ) { UI_PLATFORM
= "Solaris x86 (PKG)";
+ OLD_PLATFORM
= true;
+ }
if ( ua.indexOf( "sun4u" ) != -1 ) { UI_PLATFORM
= "Solaris SPARC (PKG)";
OLD_PLATFORM
= true;
}
@@ -312,6 +336,12 @@ function getPlatform() {
os.indexOf( "amd64" ) != -1 ) { UI_PLATFORM
= "Linux 64-bit (RPM)";
URL_PLATFORM
= "Linux_x86-64_install-rpm";
EXTENSION
= ".tar.gz";
+
+ UI_PLATFORM
= "Mac OS X (10.6 or older)";
+ URL_PLATFORM
= "MacOS_x86_install";
+ EXTENSION
= ".dmg";
+ OLD_PLATFORM
= true;
+
if ( ua.indexOf( "debian" ) != -1 ||
ua.indexOf( "ubuntu" ) != -1 ||
ua.indexOf( "iceweasel" ) != -1 ) { UI_PLATFORM
= "Linux Debian 64-bit (DEB)";
@@ -323,7 +353,7 @@ function getPlatform() {
// OS X x86?
if ( os.indexOf( "mac" ) != -1 ) { UI_PLATFORM
= "OS X 64-bit Intel (DMG)";
- URL_PLATFORM
= "Mac_x86_install";
+ URL_PLATFORM
= "MacOS_x86_install";
EXTENSION
= ".dmg";
// OS X is 10.6 or older?
if ( ua.indexOf( "10.6" ) != -1 ||
@@ -333,7 +363,7 @@ function getPlatform() {
ua.indexOf( "10.4" ) != -1 ||
ua.indexOf( "10_4" ) != -1 ||
ua.indexOf( "10.3" ) != -1 ||
- ua.indexOf( "10_3" ) != -1 ) { UI_PLATFORM
= "MacOS X (10.6 or older)";
+ ua.indexOf( "10_3" ) != -1 ) { UI_PLATFORM
= "Mac OS X (10.6 or older)";
OLD_PLATFORM
= true;
}
}
@@ -366,7 +396,7 @@ function getFilesize() {
case "Linux_x86_install-rpm":
RELEASE_MATRIX_PLATFORM_POS = 5;
break;
- case "Mac_x86_install":
+ case "MacOS_x86_install":
RELEASE_MATRIX_PLATFORM_POS = 8;
break;
case "Win_x86_install":
