Author: buildbot
Date: Sat Jun 14 07:02:38 2014
New Revision: 912509
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 Sat Jun 14 07:02:38 2014
@@ -1 +1 @@
-1602558
+1602559
Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sat Jun 14 07:02:38 2014
@@ -1 +1 @@
-1602558
+1602559
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 Sat
Jun 14 07:02:38 2014
@@ -16,7 +16,6 @@ var COLSPAN = 9; // Defines the default
var ROW_COUNT = 1; // Counts the number of rows (start = 1)
var FULL_LANG_COUNT = 1; // Counts the max number of languages for full
install sets (start = 1)
var LP_LANG_COUNT = 1; // Counts the max number of languages for
language packs (start = 1)
-var LANG_MAX = 133; // The maximal available number of languages
(see the bottom)
/*
* Define base variables
@@ -28,10 +27,10 @@ function write_table( rel_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/" + AOO_SDK +
VERSION;
- var URL_SRC = APACHE_DIST_BASE_URL + AOO_SRC;
- var URL_HASH = APACHE_DIST_BASE_URL;
+ var URL_AOO = SOURCEFORGE;
+ var URL_SDK = SOURCEFORGE + "SDK/" + AOO_SDK + VERSION;
+ var URL_SRC = ASF_DIST + AOO_SRC;
+ var URL_HASH = ASF_DIST;
// Debug: Uncomment to use different base URLs
/*
@@ -53,8 +52,8 @@ function write_table( rel_mode ) {
var AOO_SRC = "/source/apache-openoffice-" + BETA_VERSION +
"-beta-" + SVN_REV + "-src";
var URL_AOO = BETA_SOURCEFORGE_BASE_URL;
var URL_SDK = BETA_SOURCEFORGE_BASE_URL + "SDK/" + AOO_SDK
+ BETA_VERSION;
- var URL_SRC = BETA_APACHE_DIST_BASE_URL + AOO_SRC;
- var URL_HASH = BETA_APACHE_DIST_BASE_URL;
+ var URL_SRC = BETA_ASF_DIST_BASE_URL + AOO_SRC;
+ var URL_HASH = BETA_ASF_DIST_BASE_URL;
// Debug: Uncomment to use different base URLs
/*
@@ -68,8 +67,8 @@ function write_table( rel_mode ) {
write_header( rel_mode, 1 );
document.write( "<tbody>" );
- write_lang( rel_mode, URL_AOO, URL_HASH,
PLATFORM, FULL_LANG, LP_LANG, VERSION, AOO );
- write_sdk( rel_mode, URL_SDK, URL_SRC, URL_HASH, AOO_SRC,
PLATFORM, SDK_LANG, VERSION, AOO_SDK );
+ write_lang( rel_mode, URL_AOO, URL_HASH,
REL_PLATFORM, REL_FULL_LANG, REL_LP_LANG, VERSION, AOO );
+ write_sdk( rel_mode, URL_SDK, URL_SRC, URL_HASH, AOO_SRC,
REL_PLATFORM, REL_SDK_LANG, VERSION, AOO_SDK );
write_top();
document.write( "</tbody>" );
@@ -137,24 +136,24 @@ function write_header( rel_mode, FIRST_H
document.write( "<thead><tr>" );
document.write( "<th colspan='2' style='text-align: center'>"
+ SMALL1 + "Language<br />The names do not refer to countries.<br
/> " + SMALL2 + "</th>" );
document.write( "<th><span style='text-align: center' class='builds'>"
+ SMALL1 + "Type<br /> <br /> " + SMALL2 + "</span></th>"
);
- if ( PLATFORM.indexOf( "Win_x86" ) > -1 )
+ if ( REL_PLATFORM.indexOf( "Win_x86" ) > -1 )
document.write( "<th><span style='text-align: center'
class='builds'>" + SMALL1 + "Windows <br />Intel <br />EXE" + SMALL2 +
"</span></th>" );
- if ( PLATFORM.indexOf( "Linux_x86_rpm" ) > -1 )
+ if ( REL_PLATFORM.indexOf( "Linux_x86_rpm" ) > -1 )
document.write( "<th><span style='text-align: center'
class='builds'>" + SMALL1 + "Linux <br />Intel <br />RPM" + SMALL2 +
"</span></th>" );
- if ( PLATFORM.indexOf( "Linux_x86_deb" ) > -1 )
+ if ( REL_PLATFORM.indexOf( "Linux_x86_deb" ) > -1 )
document.write( "<th><span style='text-align: center'
class='builds'>" + SMALL1 + "Linux <br />Intel <br />DEB" + SMALL2 +
"</span></th>" );
- if ( PLATFORM.indexOf( "Linux_x86-64_rpm" ) > -1 )
+ if ( REL_PLATFORM.indexOf( "Linux_x86-64_rpm" ) > -1 )
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 )
+ if ( REL_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 == 1 ) {
// Release mode
- if ( PLATFORM.indexOf( "MacOS_x86-64" ) > -1 )
+ if ( REL_PLATFORM.indexOf( "MacOS_x86-64" ) > -1 )
document.write( "<th><span style='text-align: center'
class='builds'>" + SMALL1 + "OS X <br />x86-64<br />DMG" + SMALL2 +
"</span></th>" );
} else if ( rel_mode == 2 ) {
// Beta release mode
- PLATFORM = BETA_PLATFORM;
- if ( PLATFORM.indexOf( "MacOS_x86-64" ) > -1 )
+ REL_PLATFORM = BETA_REL_PLATFORM;
+ if ( REL_PLATFORM.indexOf( "MacOS_x86-64" ) > -1 )
document.write( "<th><span style='text-align: center'
class='builds'>" + SMALL1 + "OS X <br />x86-64<br />DMG" + SMALL2 +
"</span></th>" );
}
document.write( "</tr></thead>" );