Author: buildbot
Date: Wed Apr 30 18:09:48 2014
New Revision: 907489
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/all_beta.html
websites/staging/ooo-site/trunk/content/download/test/analyze.html
websites/staging/ooo-site/trunk/content/download/test/download_other.js
websites/staging/ooo-site/trunk/content/download/test/index.html
websites/staging/ooo-site/trunk/content/download/test/other.html
Propchange: websites/staging/ooo-site/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Wed Apr 30 18:09:48 2014
@@ -1 +1 @@
-1591424
+1591429
Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Wed Apr 30 18:09:48 2014
@@ -1 +1 @@
-1591424
+1591429
Modified: websites/staging/ooo-site/trunk/content/download/test/all_beta.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/download/test/all_beta.html
(original)
+++ websites/staging/ooo-site/trunk/content/download/test/all_beta.html Wed Apr
30 18:09:48 2014
@@ -112,7 +112,7 @@
+ "How to verify the download with signatures and hash values?</a></p>"
);
document.write( "<br />" );
- write_table( 1 );
+ write_table( 2 );
document.write( "</div>" );
} else {
Modified: websites/staging/ooo-site/trunk/content/download/test/analyze.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/download/test/analyze.html
(original)
+++ websites/staging/ooo-site/trunk/content/download/test/analyze.html Wed Apr
30 18:09:48 2014
@@ -46,7 +46,7 @@ screen reader. -->
// Set a specific language ISO code to force to assemble a certain localized
build as download URL
var NL_LANGUAGE = "";
// Get the download URL for released install files (0 = release mode)
- var LINK = getLink( 0 );
+ var LINK = getLink( 1 );
if ( hasMirrorLink() ) {
if ( SOURCEFORGE ) {
// If download URL contains "sourceforge" (-> normal and correct
download link),
@@ -179,7 +179,7 @@ screen reader. -->
document.write( "<tr><td>File size (MByte)
</td><td>" + FILESIZE + "</td></tr>" );
document.write( "<tr><td>Download file link
</td><td>" + LINK + "</td></tr>" );
document.write( "<tr><td>Checksum file link (here for MD5)
</td><td>" + CHECKSUM_MD5 + "</td></tr>" );
- document.write( "<tr><td>getLink()
</td><td>" + getLink( 0 ) + "</td></tr>" );
+ document.write( "<tr><td>getLink()
</td><td>" + getLink( 1 ) + "</td></tr>" );
document.write( "<tr><td>hasMirrorLink() ?
</td><td>" + hasMirrorLink() + "</td></tr>" );
document.write( "<tr><td>Old platform ?
</td><td>" + OLD_PLATFORM + "</td></tr>" );
document.write( "<tr><td>Contains link to Sourgeforge ?
</td><td>" + SOURCEFORGE + "</td></tr>" );
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 Wed
Apr 30 18:09:48 2014
@@ -23,7 +23,7 @@ var LANG_MAX = 133; // The maximal avai
* The main entry for writting the table into the webpage
*/
function write_table( rel_mode ) {
- if ( rel_mode == 0 ) {
+ if ( rel_mode == 1 ) {
// Release mode
var AOO = "Apache_OpenOffice_";
var AOO_SDK = "Apache_OpenOffice-SDK_";
@@ -40,7 +40,7 @@ function write_table( rel_mode ) {
var URL_SRC = PEOPLE_BASE_URL + "/source/" + AOO_SRC +
VERSION + "-beta-" + SVN_REV + "-src";
*/
- } else {
+ } else if ( rel_mode == 2 ) {
// Beta release mode
BETA_VERSION = "4.1.0";
VERSION = BETA_VERSION;
@@ -148,11 +148,11 @@ function write_header( rel_mode, FIRST_H
document.write( "<th><span style='text-align: center'
class='builds'>" + SMALL1 + "Linux <br />x86-64<br />RPM" + SMALL2 +
"</span></th>" );
if ( PLATFORM.indexOf( "Linux_x86-64_deb" ) > -1 )
document.write( "<th><span style='text-align: center'
class='builds'>" + SMALL1 + "Linux <br />x86-64<br />DEB" + SMALL2 +
"</span></th>" );
- if ( rel_mode == 0 ) {
+ if ( rel_mode == 1 ) {
// Release mode
if ( PLATFORM.indexOf( "MacOS_x86" ) > -1 )
document.write( "<th><span style='text-align: center'
class='builds'>" + SMALL1 + "OS X <br />Intel <br />DMG" + SMALL2 +
"</span></th>" );
- } else {
+ } else if ( rel_mode == 2 ) {
// Beta release mode
PLATFORM = BETA_PLATFORM;
if ( PLATFORM.indexOf( "MacOS_x86-64" ) > -1 )
@@ -220,7 +220,7 @@ function write_build( rel_mode, URL_AOO,
document.write( " <a " +
SMALL + "href='" + URL_HASH + "/binaries/" + INSTALL_LANG[ k ] + "/" + AOO +
VERSION + "_Linux_x86-64_" + TYPE + "-deb" + "_" + INSTALL_LANG[ k ] +
".tar.gz.md5'>MD5</a><br />" );
document.write( " <a " +
SMALL + "href='" + URL_HASH + "/binaries/" + INSTALL_LANG[ k ] + "/" + AOO +
VERSION + "_Linux_x86-64_" + TYPE + "-deb" + "_" + INSTALL_LANG[ k ] +
".tar.gz.sha256'>SHA256</a></td>" );
}
- if ( rel_mode == 0 ) {
+ if ( rel_mode == 1 ) {
// Release mode
if ( PLATFORM.indexOf( "MacOS_x86" ) > -1 ) {
document.write( "<td style='text-align:
center'><a href='" + URL_AOO + INSTALL_LANG[ k ] +
"/" + AOO + VERSION + "_MacOS_x86_" + TYPE + "_" + INSTALL_LANG[ k ] +
".dmg/download'><b>dmg</b></a><br /><br />" );
@@ -228,7 +228,7 @@ function write_build( rel_mode, URL_AOO,
document.write( "
<a " + SMALL + "href='" + URL_HASH + "/binaries/" + INSTALL_LANG[ k ] + "/" +
AOO + VERSION + "_MacOS_x86_" + TYPE + "_" + INSTALL_LANG[ k ] +
".dmg.md5'>MD5</a><br />" );
document.write( "
<a " + SMALL + "href='" + URL_HASH + "/binaries/" + INSTALL_LANG[ k ] + "/" +
AOO + VERSION + "_MacOS_x86_" + TYPE + "_" + INSTALL_LANG[ k ] +
".dmg.sha256'>SHA256</a></td>" );
}
- } else {
+ } else if ( rel_mode == 2 ) {
// Beta release mode
if ( PLATFORM.indexOf( "MacOS_x86-64" ) > -1 ) {
document.write( "<td style='text-align:
center'><a href='" + URL_AOO + INSTALL_LANG[ k ] +
"/" + AOO + VERSION + "_MacOS_x86-64_" + TYPE + "_" + INSTALL_LANG[ k ] +
".dmg/download'><b>dmg</b></a><br /><br />" );
@@ -269,7 +269,7 @@ function write_build( rel_mode, URL_AOO,
document.write( " <a " +
SMALL + "href='" + URL_HASH + "/binaries/SDK/" + AOO + VERSION +
"_Linux_x86-64_" + TYPE + "-deb" + "_" + INSTALL_LANG[ k ] +
".tar.gz.md5'>MD5</a><br />" );
document.write( " <a " +
SMALL + "href='" + URL_HASH + "/binaries/SDK/" + AOO + VERSION +
"_Linux_x86-64_" + TYPE + "-deb" + "_" + INSTALL_LANG[ k ] +
".tar.gz.sha256'>SHA256</a></td>" );
}
- if ( rel_mode == 0 ) {
+ if ( rel_mode == 1 ) {
// Release mode
if ( PLATFORM.indexOf( "MacOS_x86" ) > -1 ) {
document.write( "<td style='text-align:
center'><a href='" + URL_AOO +
"_MacOS_x86_" + TYPE + "_" + INSTALL_LANG[ k ] +
".dmg/download'><b>dmg</b></a><br /><br />" );
@@ -277,7 +277,7 @@ function write_build( rel_mode, URL_AOO,
document.write( "
<a " + SMALL + "href='" + URL_HASH + "/binaries/SDK/" + AOO + VERSION +
"_MacOS_x86_" + TYPE + "_" + INSTALL_LANG[ k ] + ".dmg.md5'>MD5</a><br />"
);
document.write( "
<a " + SMALL + "href='" + URL_HASH + "/binaries/SDK/" + AOO + VERSION +
"_MacOS_x86_" + TYPE + "_" + INSTALL_LANG[ k ] +
".dmg.sha256'>SHA256</a></td>" );
}
- } else {
+ } else if ( rel_mode == 2 ) {
// Beta release mode
if ( PLATFORM.indexOf( "MacOS_x86-64" ) > -1 ) {
document.write( "<td style='text-align:
center'><a href='" + URL_AOO +
"_MacOS_x86-64_" + TYPE + "_" + INSTALL_LANG[ k ] +
".dmg/download'><b>dmg</b></a><br /><br />" );
@@ -380,7 +380,7 @@ 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>" );
- if ( rel_mode == 0 ) {
+ if ( rel_mode == 1 ) {
// 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>" );
@@ -397,7 +397,7 @@ function write_sdk( rel_mode, URL_SDK, U
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 {
+ } else if ( rel_mode == 2 ) {
// 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>" );
@@ -420,10 +420,10 @@ function write_sdk( rel_mode, URL_SDK, U
// 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>" );
- if ( rel_mode == 0 ) {
+ if ( rel_mode == 1 ) {
// 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 {
+ } else if ( rel_mode == 2 ) {
// 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 style='text-align: center'><a
href='https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.1+Release+Notes'>AOO<br
/>Release<br />Notes</a></td>" );
Modified: websites/staging/ooo-site/trunk/content/download/test/index.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/download/test/index.html (original)
+++ websites/staging/ooo-site/trunk/content/download/test/index.html Wed Apr 30
18:09:48 2014
@@ -70,7 +70,7 @@ screen reader. -->
// Set a specific language ISO code to force to assemble a certain localized
build as download URL
var NL_LANGUAGE = "";
// Get the download URL for released install files (0 = release mode)
- var LINK = getLink( 0 );
+ var LINK = getLink( 1 );
/*
document.write ( "Language ISO: " + LANG_ISO + " - has MirrorLink()?: " +
hasMirrorLink() + "<br />"
+ "SourceForge: " + SOURCEFORGE + " - Other: " + OTHER + " - Archive: " +
ARCHIVE + "<br />"
Modified: websites/staging/ooo-site/trunk/content/download/test/other.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/download/test/other.html (original)
+++ websites/staging/ooo-site/trunk/content/download/test/other.html Wed Apr 30
18:09:48 2014
@@ -109,7 +109,7 @@
+ "How to verify the download with signatures and hash values?</a></p>" );
document.write( "<br />" );
- write_table( 0 );
+ write_table( 1 );
document.write( "</div>"
+ "<br />"
