Author: buildbot Date: Sun May 25 21:03:54 2014 New Revision: 909937 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_droplist.js Propchange: websites/staging/ooo-site/trunk/cgi-bin/ ------------------------------------------------------------------------------ --- cms:source-revision (original) +++ cms:source-revision Sun May 25 21:03:54 2014 @@ -1 +1 @@ -1597476 +1597477 Propchange: websites/staging/ooo-site/trunk/content/ ------------------------------------------------------------------------------ --- cms:source-revision (original) +++ cms:source-revision Sun May 25 21:03:54 2014 @@ -1 +1 @@ -1597476 +1597477 Modified: websites/staging/ooo-site/trunk/content/download/test/download_droplist.js ============================================================================== --- websites/staging/ooo-site/trunk/content/download/test/download_droplist.js (original) +++ websites/staging/ooo-site/trunk/content/download/test/download_droplist.js Sun May 25 21:03:54 2014 @@ -75,7 +75,13 @@ function initVars() { LINK_CHECKSUM_ASC_LP = ""; // The ASC file as download URL (for language pack) LINK_CHECKSUM_MD5_LP = ""; // The MD5 file as download URL (for language pack) LINK_CHECKSUM_SHA256_LP = ""; // The SHA256 file as download URL (for language pack) - SOURCEFORGE = false; // Does the download URL points to Soureforge? + SOURCEFORGE_BASE_URL = ""; // The base URL for all binary files on Sourceforge + SOURCEFORGE_PREVIOUS_URL = ""; // The base URL for all binary files (prev. version) on Sourceforge + APACHE_BASE_URL = ""; // The base URL for all binary files on Apache + APACHE_DIST_BASE_URL = ""; // The base URL for all checksum files on Apache + APACHE_DIST_PREVIOUS_URL = ""; // The base URL for all checksum files (prev. version) on Apache + + SF = false; // Does the download URL points to Soureforge? OTHER = false; // Does the download URL points to 'other.html'? ARCHIVE = false; // Does the download URL points to the ASF archive? ERROR = false; // Is the download URL in general correct (false) or not (true)? @@ -114,6 +120,7 @@ function alertDbg( location ) { + "EXTENSION: " + "\t\t\t\t\t\t" + EXTENSION + "\n" // + "TYPE: " + "\t\t\t\t\t\t" + TYPE + "\n" + "SOURCEFORGE_BASE_URL: " + "\t\t\t" + SOURCEFORGE_BASE_URL + "\n" + + "APACHE_DIST_BASE_URL: " + "\t\t\t\t" + APACHE_DIST_BASE_URL + "\n" // + "LINK: " + "\t\t\t\t\t\t" + LINK + "\n" + "LINK_FULL: " + "\t\t\t\t\t\t" + LINK_FULL + "\n" + "LINK_LP: " + "\t\t\t\t\t\t\t" + LINK_LP + "\n" @@ -123,9 +130,9 @@ function alertDbg( location ) { + "LINK_CHECKSUM_ASC_LP: " + "\t\t\t\t" + LINK_CHECKSUM_ASC_LP + "\n" + "LINK_CHECKSUM_MD5_LP: " + "\t\t\t\t" + LINK_CHECKSUM_MD5_LP + "\n" + "LINK_CHECKSUM_SHA256_LP: " + "\t\t\t" + LINK_CHECKSUM_SHA256_LP + "\n" - + "SOURCEFORGE: " + "\t\t\t\t\t\t" + SOURCEFORGE + "\n" + + "SF: " + "\t\t\t\t\t\t\t\t" + SF + "\n" + "OTHER: " + "\t\t\t\t\t\t\t" + OTHER + "\n" - + "ARCHIVE: " + "\t\t\t\t\t\t\t" + ARCHIVE + "\n" + + "ARCHIVE: " + "\t\t\t\t\t\t\t" + ARCHIVE + "\n" + "ERROR: " + "\t\t\t\t\t\t\t" + ERROR + "\n" + "" ); @@ -951,7 +958,7 @@ function getLink( rel_mode ) { getLanguage(); getPlatform(); if( isLangSupported() ) { - getFilesize(); + getFilesize( VERSION ); } // If language is supported, provide a download link. @@ -960,6 +967,9 @@ function getLink( rel_mode ) { if( OLD_PLATFORM ) { // If platform is 'Mac OS X <= 10.6', provide a download link with previous AOO version. if( UI_PLATFORM == "Mac OS X (10.6 or older)" ) { + APACHE_DIST_BASE_URL = APACHE_DIST + VERSION; + APACHE_DIST_PREVIOUS_URL = APACHE_DIST + PRE_VERSION; + LINK_FULL = SOURCEFORGE_PREVIOUS_URL + LANG_ISO + "/"; LINK_FULL = LINK_FULL + getFilename( PRE_VERSION ); LINK_FULL = LINK_FULL + "/download" @@ -976,7 +986,7 @@ function getLink( rel_mode ) { LINK_CHECKSUM_SHA256_FULL = LINK_CHECKSUM_SHA256_FULL + getFilename( PRE_VERSION ); LINK_CHECKSUM_SHA256_FULL = LINK_CHECKSUM_SHA256_FULL + ".sha256" - SOURCEFORGE = false; + SF = false; OTHER = false; ARCHIVE = true; ERROR = true; @@ -990,7 +1000,7 @@ function getLink( rel_mode ) { LINK_FULL = "http://www.openoffice.org/porting/index.html"; - SOURCEFORGE = false; + SF = false; OTHER = true; ARCHIVE = false; ERROR = true; @@ -1006,7 +1016,7 @@ function getLink( rel_mode ) { LINK_CHECKSUM_MD5_FULL = "http://archive.apache.org/dist/openoffice/"; LINK_CHECKSUM_SHA256_FULL = "http://archive.apache.org/dist/openoffice/"; - SOURCEFORGE = false; + SF = false; OTHER = true; ARCHIVE = false; ERROR = true; @@ -1022,7 +1032,7 @@ function getLink( rel_mode ) { } LINK_FULL = "http://www.openoffice.org/download/other.html"; - SOURCEFORGE = false; + SF = false; OTHER = true; ARCHIVE = false; ERROR = true; @@ -1031,6 +1041,9 @@ function getLink( rel_mode ) { } // If language is supported and platform was recognized, assemble the filenames for download and checksums. + SOURCEFORGE_BASE_URL = SOURCEFORGE + VERSION + "/binaries/"; + SOURCEFORGE_PREVIOUS_URL = SOURCEFORGE + PRE_VERSION + "/binaries/"; + LINK_FULL = SOURCEFORGE_BASE_URL + LANG_ISO + "/" + getFilename( VERSION ) + "/download"; LINK_CHECKSUM_KEYS = "https://people.apache.org/keys/group/openoffice.asc"; @@ -1044,7 +1057,7 @@ function getLink( rel_mode ) { LINK_CHECKSUM_SHA256_FULL = APACHE_DIST_BASE_URL + "/binaries/" + LANG_ISO + "/" + getFilename( VERSION ); LINK_CHECKSUM_SHA256_FULL = LINK_CHECKSUM_SHA256_FULL + ".sha256"; - SOURCEFORGE = true; + SF = true; OTHER = false; ARCHIVE = false; ERROR = false; @@ -1062,7 +1075,7 @@ function getLink( rel_mode ) { // Provide the "all_beta.html" as download link. LINK_FULL = "http://www.openoffice.org/download/all_beta.html"; } - SOURCEFORGE = false; + SF = false; OTHER = true; ARCHIVE = false; ERROR = true; @@ -1105,7 +1118,7 @@ function getLinkSel( rel_mode ) { return; } - getFilesize(); + getFilesize( VERSION_SEL ); getFilename( VERSION_SEL ); // if( URL_PLATFORM != "" && LANG_ISO != "" ) { @@ -1114,6 +1127,9 @@ function getLinkSel( rel_mode ) { // If language and platform are recognized, assemble the filenames for download and checksums. if( LANG_SEL != "" && RELEASE_MATRIX_PLATFORM_POS_FULL > -1 ) { + SOURCEFORGE_BASE_URL = SOURCEFORGE + VERSION_SEL + "/binaries/"; + APACHE_DIST_BASE_URL = APACHE_DIST + VERSION_SEL; + // Assign the file name (column 3) from the release matrix of language and platform. LINK_FULL = SOURCEFORGE_BASE_URL + LANG_SEL + "/" + FILENAME_FULL + "/download"; LINK_LP = SOURCEFORGE_BASE_URL + LANG_SEL + "/" + FILENAME_LP + "/download"; @@ -1133,7 +1149,7 @@ function getLinkSel( rel_mode ) { LINK_CHECKSUM_SHA256_LP = APACHE_DIST_BASE_URL + "/binaries/" + LANG_SEL + "/" + FILENAME_LP; LINK_CHECKSUM_SHA256_LP = LINK_CHECKSUM_SHA256_LP + ".sha256"; - SOURCEFORGE = true; + SF = true; OTHER = false; ARCHIVE = false; ERROR = false; @@ -1256,7 +1272,7 @@ function getPlatform() { if( os.indexOf( "alphaserver" ) != -1 ) UI_PLATFORM = "AlphaServer"; if( os.indexOf( "amiga" ) != -1 ) UI_PLATFORM = "AmigaOS"; if( ua.indexOf( "android" ) != -1 || - av.indexOf( "android" ) != -1 ) UI_PLATFORM = "Android mobile devices"; + av.indexOf( "android" ) != -1 ) UI_PLATFORM = "Android mobile devices"; if( os.indexOf( "arm" ) != -1 ) UI_PLATFORM = "ARM mobile devices"; if( ua.indexOf( "blackberry" ) != -1 ) UI_PLATFORM = "Blackberry smartphones"; if( ua.indexOf( "brew" ) != -1 ) UI_PLATFORM = "smartphones (BREW)"; @@ -1266,8 +1282,8 @@ function getPlatform() { if( os.indexOf( "freebsd" ) != -1 ) UI_PLATFORM = "FreeBSD (PKG)"; if( ua.indexOf( "hiptop" ) != -1 ) UI_PLATFORM = "smartphones (Hiptop)"; if( ua.indexOf( "ipad" ) != -1 || - ua.indexOf( "iphone" ) != -1 || - ua.indexOf( "ipod" ) != -1 ) UI_PLATFORM = "Apple iPhone/iPad/iPod"; + ua.indexOf( "iphone" ) != -1 || + ua.indexOf( "ipod" ) != -1 ) UI_PLATFORM = "Apple iPhone/iPad/iPod"; if( os.indexOf( "irix" ) != -1 ) UI_PLATFORM = "IRIX"; if( ua.indexOf( "kindle" ) != -1 ) UI_PLATFORM = "Kindle mobile devices"; if( os.indexOf( "netbsd" ) != -1 ) UI_PLATFORM = "NetBSD"; @@ -1280,7 +1296,7 @@ function getPlatform() { if( ua.indexOf( "pike" ) != -1 ) UI_PLATFORM = "mobile phones (Pike)"; if( ua.indexOf( "playstation" ) != -1 ) UI_PLATFORM = "Sony Playstation"; if( ua.indexOf( "power_pc" ) != -1 || - ua.indexOf( "ppc" ) != -1 ) { UI_PLATFORM = "Mac OS PPC (DMG)"; + ua.indexOf( "ppc" ) != -1 ) { UI_PLATFORM = "Mac OS PPC (DMG)"; OLD_PLATFORM = true; } if( ua.indexOf( "psp" ) != -1 ) UI_PLATFORM = "Sony Playstation Portable"; @@ -1307,31 +1323,31 @@ function getPlatform() { // Windows, x86 or mobile? if( os.indexOf( "win" ) != -1 || - os.indexOf( "windows" ) != -1 ) { UI_PLATFORM = "Windows (EXE)"; + os.indexOf( "windows" ) != -1 ) { UI_PLATFORM = "Windows (EXE)"; URL_PLATFORM = "Win_x86_install"; EXTENSION = ".exe"; if( ua.indexOf( "mobile" ) != -1 || - ua.indexOf( "phone" ) != -1 ) UI_PLATFORM = "Windows Mobile device"; + ua.indexOf( "phone" ) != -1 ) UI_PLATFORM = "Windows Mobile device"; } // Linux, x86 or x86-64, DEB or RPM? if( os.indexOf( "linux" ) != -1 ) { // 32-bit, DEB or RPM? if( os.indexOf( "x86" ) != -1 || - os.indexOf( "i686" ) != -1 || - os.indexOf( "i586" ) != -1 || - os.indexOf( "i486" ) != -1 || - os.indexOf( "i386" ) != -1 || - av.indexOf( "x86" ) != -1 || - av.indexOf( "i686" ) != -1 || - av.indexOf( "i586" ) != -1 || - av.indexOf( "i486" ) != -1 || - av.indexOf( "i386" ) != -1 ) { UI_PLATFORM = "Linux 32-bit (RPM)"; + os.indexOf( "i686" ) != -1 || + os.indexOf( "i586" ) != -1 || + os.indexOf( "i486" ) != -1 || + os.indexOf( "i386" ) != -1 || + av.indexOf( "x86" ) != -1 || + av.indexOf( "i686" ) != -1 || + av.indexOf( "i586" ) != -1 || + av.indexOf( "i486" ) != -1 || + av.indexOf( "i386" ) != -1 ) { UI_PLATFORM = "Linux 32-bit (RPM)"; URL_PLATFORM = "Linux_x86_install-rpm"; EXTENSION = ".tar.gz"; - if( ua.indexOf( "debian" ) != -1 || - ua.indexOf( "iceweasel" ) != -1 || - ua.indexOf( "ubuntu" ) != -1 ) { UI_PLATFORM = "Linux Debian 32-bit (DEB)"; + if( ua.indexOf( "debian" ) != -1 || + ua.indexOf( "iceweasel" ) != -1 || + ua.indexOf( "ubuntu" ) != -1 ) { UI_PLATFORM = "Linux Debian 32-bit (DEB)"; URL_PLATFORM = "Linux_x86_install-deb"; EXTENSION = ".tar.gz"; } @@ -1339,18 +1355,18 @@ function getPlatform() { // 64-bit, DEB or RPM? if( os.indexOf( "_64" ) != -1 || - os.indexOf( "-64" ) != -1 || - os.indexOf( "x64" ) != -1 || - os.indexOf( "amd64" ) != -1 || - av.indexOf( "_64" ) != -1 || - av.indexOf( "-64" ) != -1 || - av.indexOf( "x64" ) != -1 || - av.indexOf( "amd64" ) != -1 ) { UI_PLATFORM = "Linux 64-bit (RPM)"; + os.indexOf( "-64" ) != -1 || + os.indexOf( "x64" ) != -1 || + os.indexOf( "amd64" ) != -1 || + av.indexOf( "_64" ) != -1 || + av.indexOf( "-64" ) != -1 || + av.indexOf( "x64" ) != -1 || + av.indexOf( "amd64" ) != -1 ) { UI_PLATFORM = "Linux 64-bit (RPM)"; URL_PLATFORM = "Linux_x86-64_install-rpm"; EXTENSION = ".tar.gz"; - if( ua.indexOf( "debian" ) != -1 || - ua.indexOf( "iceweasel" ) != -1 || - ua.indexOf( "ubuntu" ) != -1 ) { UI_PLATFORM = "Linux Debian 64-bit (DEB)"; + if( ua.indexOf( "debian" ) != -1 || + ua.indexOf( "iceweasel" ) != -1 || + ua.indexOf( "ubuntu" ) != -1 ) { UI_PLATFORM = "Linux Debian 64-bit (DEB)"; URL_PLATFORM = "Linux_x86-64_install-deb"; EXTENSION = ".tar.gz"; } @@ -1363,13 +1379,13 @@ function getPlatform() { EXTENSION = ".dmg"; // OS X is 10.6 or older? if( ua.indexOf( "10.6" ) != -1 || - ua.indexOf( "10_6" ) != -1 || - ua.indexOf( "10.5" ) != -1 || - ua.indexOf( "10_5" ) != -1 || - ua.indexOf( "10.4" ) != -1 || - ua.indexOf( "10_4" ) != -1 || - ua.indexOf( "10.3" ) != -1 || - ua.indexOf( "10_3" ) != -1 ) { UI_PLATFORM = "Mac OS X (10.6 or older)"; + ua.indexOf( "10_6" ) != -1 || + ua.indexOf( "10.5" ) != -1 || + ua.indexOf( "10_5" ) != -1 || + ua.indexOf( "10.4" ) != -1 || + ua.indexOf( "10_4" ) != -1 || + ua.indexOf( "10.3" ) != -1 || + ua.indexOf( "10_3" ) != -1 ) { UI_PLATFORM = "Mac OS X (10.6 or older)"; URL_PLATFORM = "MacOS_x86_install"; OLD_PLATFORM = true; } @@ -1390,14 +1406,59 @@ function getPlatform() { * Depends on version, platform, language and extension */ function getFilename( ver ) { + + switch( ver ) { + case "4.1.0": + // Assemble the filename for download from the release matrix of language and platform (column 0). + // Product name + version + platform as URL part + language ISO + file extension. + FILENAME_FULL = "Apache_OpenOffice_" + ver + "_"; + FILENAME_FULL = FILENAME_FULL + release_matrix_410[ LANG_ISO ][ RELEASE_MATRIX_PLATFORM_POS_FULL ][ 0 ]; + FILENAME_FULL = FILENAME_FULL + "_" + LANG_ISO + EXTENSION; + FILENAME_LP = "Apache_OpenOffice_" + ver + "_"; + FILENAME_LP = FILENAME_LP + release_matrix_410[ LANG_ISO ][ RELEASE_MATRIX_PLATFORM_POS_LP ][ 0 ]; + FILENAME_LP = FILENAME_LP + "_" + LANG_ISO + EXTENSION; + break; + case "4.0.1": + // Assemble the filename for download from the release matrix of language and platform (column 0). + // Product name + version + platform as URL part + language ISO + file extension. + FILENAME_FULL = "Apache_OpenOffice_" + ver + "_"; + FILENAME_FULL = FILENAME_FULL + release_matrix_401[ LANG_ISO ][ RELEASE_MATRIX_PLATFORM_POS_FULL ][ 0 ]; + FILENAME_FULL = FILENAME_FULL + "_" + LANG_ISO + EXTENSION; + FILENAME_LP = "Apache_OpenOffice_" + ver + "_"; + FILENAME_LP = FILENAME_LP + release_matrix_401[ LANG_ISO ][ RELEASE_MATRIX_PLATFORM_POS_LP ][ 0 ]; + FILENAME_LP = FILENAME_LP + "_" + LANG_ISO + EXTENSION; + break; + case "4.0.0": + // Todo: Implement a "release_matrix_400" array in the "release_matrix.js" file. + FILENAME_FULL = "4.0.0 file names are not yet available"; + FILENAME_LP = "4.0.0 file names are not yet available"; + break; + case "3.4.1": + // Todo: Implement a "release_matrix_340" array in the "release_matrix.js" file. + FILENAME_FULL = "3.4.1 file names are not yet available"; + FILENAME_LP = "3.4.1 file names are not yet available"; + break; + case "3.4.0": + // Todo: Implement a "release_matrix_340" array in the "release_matrix.js" file. + FILENAME_FULL = "3.4.0 file names are not yet available"; + FILENAME_LP = "3.4.0 file names are not yet available"; + break; + default: + FILENAME_FULL = ""; + FILENAME_LP = ""; + ERROR = true; + } +/* // Assemble the filename for download from the release matrix of language and platform (column 0). // Product name + version + platform as URL part + language ISO + file extension. FILENAME_FULL = "Apache_OpenOffice_" + ver + "_"; FILENAME_FULL = FILENAME_FULL + release_matrix_410[ LANG_ISO ][ RELEASE_MATRIX_PLATFORM_POS_FULL ][ 0 ]; FILENAME_FULL = FILENAME_FULL + "_" + LANG_ISO + EXTENSION; - FILENAME_LP = "Apache_OpenOffice_" + ver + "_" + FILENAME_LP = "Apache_OpenOffice_" + ver + "_"; FILENAME_LP = FILENAME_LP + release_matrix_410[ LANG_ISO ][ RELEASE_MATRIX_PLATFORM_POS_LP ][ 0 ]; FILENAME_LP = FILENAME_LP + "_" + LANG_ISO + EXTENSION; +*/ +// alert( ver + "\n\n" + FILENAME_FULL + "\n\n" + FILENAME_LP ); return FILENAME_FULL; } @@ -1406,7 +1467,7 @@ function getFilename( ver ) { * Get file size for download file * Depends on array-list and "release_matrix.js" */ -function getFilesize() { +function getFilesize( ver ) { // Depending on $URL_PLATFORM assign the platform position of the release matrix. switch( URL_PLATFORM ) { case "Linux_x86-64_install-deb": @@ -1447,10 +1508,52 @@ function getFilesize() { default: RELEASE_MATRIX_PLATFORM_POS_FULL = -1; RELEASE_MATRIX_PLATFORM_POS_LP = -1; + ERROR = true; } // If a platform was found and no error occurred, assign the array data and filesize from the release matrix. if( RELEASE_MATRIX_PLATFORM_POS_FULL > -1 && !ERROR ) { + switch( ver ) { + case "4.1.0": + // Assign all values from the release matrix of language and platform. + RELEASE_MATRIX_PLATFORM = release_matrix_410[ LANG_ISO ][ RELEASE_MATRIX_PLATFORM_POS_FULL ]; + + // Assign the file size (column 2) from the release matrix of language and platform. + FILESIZE_FULL = release_matrix_410[ LANG_ISO ][ RELEASE_MATRIX_PLATFORM_POS_FULL ][ 2 ]; + FILESIZE_LP = release_matrix_410[ LANG_ISO ][ RELEASE_MATRIX_PLATFORM_POS_LP ][ 2 ]; + break; + case "4.0.1": + // Assign all values from the release matrix of language and platform. + RELEASE_MATRIX_PLATFORM = release_matrix_401[ LANG_ISO ][ RELEASE_MATRIX_PLATFORM_POS_FULL ]; + + // Assign the file size (column 2) from the release matrix of language and platform. + FILESIZE_FULL = release_matrix_401[ LANG_ISO ][ RELEASE_MATRIX_PLATFORM_POS_FULL ][ 2 ]; + FILESIZE_LP = release_matrix_401[ LANG_ISO ][ RELEASE_MATRIX_PLATFORM_POS_LP ][ 2 ]; + break; + case "4.0.0": + // Todo: Implement a "release_matrix_400" array in the "release_matrix.js" file. + FILESIZE_FULL = 0; + FILESIZE_LP = 0; + ERROR = true; + break; + case "3.4.1": + // Todo: Implement a "release_matrix_340" array in the "release_matrix.js" file. + FILESIZE_FULL = 0; + FILESIZE_LP = 0; + ERROR = true; + break; + case "3.4.0": + // Todo: Implement a "release_matrix_340" array in the "release_matrix.js" file. + FILESIZE_FULL = 0; + FILESIZE_LP = 0; + ERROR = true; + break; + default: + FILESIZE_FULL = 0; + FILESIZE_LP = 0; + ERROR = true; + } +/* // Assign all values from the release matrix of language and platform. RELEASE_MATRIX_PLATFORM = release_matrix_410[ LANG_ISO ][ RELEASE_MATRIX_PLATFORM_POS_FULL ]; @@ -1458,9 +1561,10 @@ function getFilesize() { FILESIZE_FULL = release_matrix_410[ LANG_ISO ][ RELEASE_MATRIX_PLATFORM_POS_FULL ][ 2 ]; FILESIZE_LP = release_matrix_410[ LANG_ISO ][ RELEASE_MATRIX_PLATFORM_POS_LP ][ 2 ]; } else { - ERROR = true; FILESIZE_FULL = 0; FILESIZE_LP = 0; + ERROR = true; +*/ } return FILESIZE_FULL;