Author: buildbot Date: Sun Mar 9 19:53:05 2014 New Revision: 900759 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_other.js Propchange: websites/staging/ooo-site/trunk/cgi-bin/ ------------------------------------------------------------------------------ --- cms:source-revision (original) +++ cms:source-revision Sun Mar 9 19:53:05 2014 @@ -1 +1 @@ -1575741 +1575743 Propchange: websites/staging/ooo-site/trunk/content/ ------------------------------------------------------------------------------ --- cms:source-revision (original) +++ cms:source-revision Sun Mar 9 19:53:05 2014 @@ -1 +1 @@ -1575741 +1575743 Modified: websites/staging/ooo-site/trunk/content/download/test/download_other.js ============================================================================== --- websites/staging/ooo-site/trunk/content/download/test/download_other.js (original) +++ websites/staging/ooo-site/trunk/content/download/test/download_other.js Sun Mar 9 19:53:05 2014 @@ -23,43 +23,45 @@ var LANG_MAX = 133; // The maximal avai * The main entry for writting the table into the webpage */ function write_table( rel_mode ) { - var AOO = "Apache_OpenOffice_"; - var AOO_SDK = "Apache_OpenOffice-SDK_"; if ( rel_mode == 0 ) { // Release mode + var AOO = "Apache_OpenOffice_"; + var AOO_SDK = "Apache_OpenOffice-SDK_"; var AOO_SRC = "/source/apache-openoffice-" + VERSION + "-" + SVN_REV + "-src"; var URL_AOO = SOURCEFORGE_BASE_URL; - var URL_SDK = SOURCEFORGE_BASE_URL + "SDK/Apache_OpenOffice-SDK_" + VERSION; + var URL_SDK = SOURCEFORGE_BASE_URL + "SDK/" + AOO_SDK + VERSION; var URL_SRC = APACHE_DIST_BASE_URL + AOO_SRC; + var URL_HASH = APACHE_DIST_BASE_URL; // Debug: Uncomment to use different base URLs /* var URL_AOO = PEOPLE_BASE_URL + "/binaries/"; - var URL_SDK = PEOPLE_BASE_URL + "/binaries/SDK/Apache_OpenOffice-SDK_" + VERSION; - var URL_SRC = PEOPLE_BASE_URL + "/source/" + AOO_SRC + VERSION + "-" + SVN_REV; + var URL_SDK = PEOPLE_BASE_URL + "/binaries/SDK/" + AOO_SDK + VERSION; + var URL_SRC = PEOPLE_BASE_URL + "/source/" + AOO_SRC + VERSION + "-beta-" + SVN_REV + "-src"; */ - var URL_HASH = APACHE_DIST_BASE_URL; } else { // Beta release mode - var AOO_SRC = "/source/apache-openoffice-" + BETA_VERSION + "-" + SVN_REV + "-src"; + BETA_VERSION = "4.1.0"; + SVN_REV = BETA_SVN_REV; + PLATFORM = BETA_PLATFORM; + FULL_LANG = BETA_FULL_LANG; + LP_LANG = BETA_LP_LANG; + SDK_LANG = BETA_SDK_LANG; + var AOO = "Apache_OpenOffice_Beta_"; + var AOO_SDK = "Apache_OpenOffice_Beta-SDK_"; + var AOO_SRC = "/source/apache-openoffice-" + BETA_VERSION + "-beta-" + SVN_REV + "-src"; var URL_AOO = SOURCEFORGE_BASE_URL_BETA; - var URL_SDK = SOURCEFORGE_BASE_URL_BETA + "SDK/Apache_OpenOffice-SDK_" + BETA_VERSION; + var URL_SDK = SOURCEFORGE_BASE_URL_BETA + "SDK/" + AOO_SDK + BETA_VERSION; var URL_SRC = APACHE_DIST_BASE_URL_BETA + AOO_SRC; + var URL_HASH = APACHE_DIST_BASE_URL_BETA; // Debug: Uncomment to use different base URLs /* var URL_AOO = PEOPLE_BASE_URL + "/binaries/"; - var URL_SDK = PEOPLE_BASE_URL + "/binaries/SDK/Apache_OpenOffice-SDK_" + BETA_VERSION; - var URL_SRC = PEOPLE_BASE_URL + "/source/" + AOO_SRC + BETA_VERSION + "-" + SVN_REV; + var URL_SDK = PEOPLE_BASE_URL + "/binaries/SDK/" + AOO_SDK + BETA_VERSION; + var URL_SRC = PEOPLE_BASE_URL + "/source/" + AOO_SRC + BETA_VERSION + "-beta-" + SVN_REV + "-src"; */ - var URL_HASH = APACHE_DIST_BASE_URL_BETA; - - VERSION = BETA_VERSION; - PLATFORM = BETA_PLATFORM; - FULL_LANG = BETA_FULL_LANG; - LP_LANG = BETA_LP_LANG; - SDK_LANG = BETA_SDK_LANG; } document.write( "<table class='builds' cellpadding='2' cellspacing='2'>" ); @@ -232,11 +234,9 @@ function write_build( rel_mode, URL_AOO, document.write( " <a " + SMALL + "href='" + URL_HASH + "/binaries/" + INSTALL_LANG[ k ] + "/" + AOO + VERSION + "_MacOS_x86-64_" + TYPE + "_" + INSTALL_LANG[ k ] + ".dmg.asc'>ASC</a>" ); document.write( " <a " + SMALL + "href='" + URL_HASH + "/binaries/" + INSTALL_LANG[ k ] + "/" + AOO + VERSION + "_MacOS_x86-64_" + TYPE + "_" + INSTALL_LANG[ k ] + ".dmg.md5'>MD5</a><br />" ); document.write( " <a " + SMALL + "href='" + URL_HASH + "/binaries/" + INSTALL_LANG[ k ] + "/" + AOO + VERSION + "_MacOS_x86-64_" + TYPE + "_" + INSTALL_LANG[ k ] + ".dmg.sha256'>SHA256</a></td>" ); - } } + } } else { - - // Write download links for SDK builds and its checksums if ( PLATFORM.indexOf( "Win_x86" ) > -1 ) { document.write( "<td style='text-align: center'><a href='" + URL_AOO + "_Win_x86_" + TYPE + "_" + INSTALL_LANG[ k ] + ".exe'><b>exe</b></a><br /><br />" ); @@ -379,28 +379,54 @@ function write_sdk( rel_mode, URL_SDK, U else document.write( "<tr class='b'><td>-</td><td>-</td><td><small><a href='#notes'" + "title='What are source tarballs?'>Source<br />tarballs</a></small></td>" ); - document.write( "<td style='text-align: center'><a href='" + URL_SRC + ".tar.bz2'><b>tar.bz2</b></a><br /><br />" ); - document.write( " <a " + SMALL + "href='" + URL_HASH + AOO_SRC + ".tar.bz2.asc'>ASC</a>" ); - document.write( " <a " + SMALL + "href='" + URL_HASH + AOO_SRC + ".tar.bz2.md5'>MD5</a><br />" ); - document.write( " <a " + SMALL + "href='" + URL_HASH + AOO_SRC + ".tar.bz2.sha256'>SHA256</a></td>" ); - document.write( "<td> </td>" ); - document.write( "<td style='text-align: center'><a href='" + URL_SRC + ".tar.gz'><b>tar.gz</b></a><br /><br />" ); - document.write( " <a " + SMALL + "href='" + URL_HASH + AOO_SRC + ".tar.gz.asc'>ASC</a>" ); - document.write( " <a " + SMALL + "href='" + URL_HASH + AOO_SRC + ".tar.gz.md5'>MD5</a><br />" ); - document.write( " <a " + SMALL + "href='" + URL_HASH + AOO_SRC + ".tar.gz.sha256'>SHA256</a></td>" ); - document.write( "<td> </td>" ); - document.write( "<td style='text-align: center'><a href='" + URL_SRC + ".zip'><b>zip</b></a><br /><br />" ); - document.write( " <a " + SMALL + "href='" + URL_HASH + AOO_SRC + ".zip.asc'>ASC</a>" ); - document.write( " <a " + SMALL + "href='" + URL_HASH + AOO_SRC + ".zip.md5'>MD5</a><br />" ); - document.write( " <a " + SMALL + "href='" + URL_HASH + AOO_SRC + ".zip.sha256'>SHA256</a></td>" ); - document.write( "<td> </td>" ); - + if ( rel_mode == 0 ) { + // Release mode + document.write( "<td style='text-align: center'><a href='" + URL_SRC + ".tar.bz2'><b>tar.bz2</b></a><br /><br />" ); + document.write( " <a " + SMALL + "href='" + URL_HASH + AOO_SRC + ".tar.bz2.asc'>ASC</a>" ); + document.write( " <a " + SMALL + "href='" + URL_HASH + AOO_SRC + ".tar.bz2.md5'>MD5</a><br />" ); + document.write( " <a " + SMALL + "href='" + URL_HASH + AOO_SRC + ".tar.bz2.sha256'>SHA256</a></td>" ); + document.write( "<td> </td>" ); + document.write( "<td style='text-align: center'><a href='" + URL_SRC + ".tar.gz'><b>tar.gz</b></a><br /><br />" ); + document.write( " <a " + SMALL + "href='" + URL_HASH + AOO_SRC + ".tar.gz.asc'>ASC</a>" ); + document.write( " <a " + SMALL + "href='" + URL_HASH + AOO_SRC + ".tar.gz.md5'>MD5</a><br />" ); + document.write( " <a " + SMALL + "href='" + URL_HASH + AOO_SRC + ".tar.gz.sha256'>SHA256</a></td>" ); + document.write( "<td> </td>" ); + document.write( "<td style='text-align: center'><a href='" + URL_SRC + ".zip'><b>zip</b></a><br /><br />" ); + document.write( " <a " + SMALL + "href='" + URL_HASH + AOO_SRC + ".zip.asc'>ASC</a>" ); + document.write( " <a " + SMALL + "href='" + URL_HASH + AOO_SRC + ".zip.md5'>MD5</a><br />" ); + document.write( " <a " + SMALL + "href='" + URL_HASH + AOO_SRC + ".zip.sha256'>SHA256</a></td>" ); + document.write( "<td> </td>" ); + } else { + // Beta release mode + document.write( "<td style='text-align: center'><a href='" + URL_SRC + ".tar.bz2'><b>tar.bz2</b></a><br /><br />" ); + document.write( " <a " + SMALL + "href='" + URL_HASH + AOO_SRC + ".tar.bz2.asc'>ASC</a>" ); + document.write( " <a " + SMALL + "href='" + URL_HASH + AOO_SRC + ".tar.bz2.md5'>MD5</a><br />" ); + document.write( " <a " + SMALL + "href='" + URL_HASH + AOO_SRC + ".tar.bz2.sha256'>SHA256</a></td>" ); + document.write( "<td> </td>" ); + document.write( "<td style='text-align: center'><a href='" + URL_SRC + ".tar.gz'><b>tar.gz</b></a><br /><br />" ); + document.write( " <a " + SMALL + "href='" + URL_HASH + AOO_SRC + ".tar.gz.asc'>ASC</a>" ); + document.write( " <a " + SMALL + "href='" + URL_HASH + AOO_SRC + ".tar.gz.md5'>MD5</a><br />" ); + document.write( " <a " + SMALL + "href='" + URL_HASH + AOO_SRC + ".tar.gz.sha256'>SHA256</a></td>" ); + document.write( "<td> </td>" ); + document.write( "<td style='text-align: center'><a href='" + URL_SRC + ".zip'><b>zip</b></a><br /><br />" ); + document.write( " <a " + SMALL + "href='" + URL_HASH + AOO_SRC + ".zip.asc'>ASC</a>" ); + document.write( " <a " + SMALL + "href='" + URL_HASH + AOO_SRC + ".zip.md5'>MD5</a><br />" ); + document.write( " <a " + SMALL + "href='" + URL_HASH + AOO_SRC + ".zip.sha256'>SHA256</a></td>" ); + document.write( "<td> </td>" ); + } document.write( "</tr>" ); ROW_COUNT++; // At last write the row with the other files (release notes) document.write( "<tr class='a'><td>-</td><td>-</td><td><small>Other files</small></td>" ); - document.write( "<td style='text-align: center'><a href='../development/releases/" + VERSION + ".html' title='Apache OpenOffice Release Notes'>AOO<br />Release<br />Notes</a></td>" ); + document.write( "rel_mode: " + rel_mode ); + if ( rel_mode == 0 ) { + // Release mode + document.write( "<td style='text-align: center'><a href='../development/releases/" + VERSION + ".html' title='Apache OpenOffice Release Notes'>AOO<br />Release<br />Notes</a></td>" ); + } else { + // Beta release mode + document.write( "<td style='text-align: center'><a href='../development/releases/" + BETA_VERSION + "_Beta.html' title='Apache OpenOffice Release Notes'>AOO<br />Release<br />Notes</a></td>" ); + } document.write( "<td> </td>" ); document.write( "<td style='text-align: center'><a href='checksums.html' title='How to verify the download with checksums?'>How to<br />verify the<br />download?</a></td>" ); document.write( "<td> </td>" );