buildbot failure in on openoffice-linux64-nightly
The Buildbot has detected a new failure on builder openoffice-linux64-nightly while building . Full details are available at: https://ci.apache.org/builders/openoffice-linux64-nightly/builds/940 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: bb_slave8_ubuntu Build Reason: The Nightly scheduler named 'openoffice-linux64-nightly' triggered this build Build Source Stamp: [branch trunk] HEAD Blamelist: BUILD FAILED: failed build --all Sincerely, -The Buildbot
[openoffice] branch AOO418 updated: Do exactly what we did for AOO417
This is an automated email from the ASF dual-hosted git repository. jim pushed a commit to branch AOO418 in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/AOO418 by this push: new 0fcbebe Do exactly what we did for AOO417 0fcbebe is described below commit 0fcbebe32b625eb8407ad802b613e5da54be96c3 Author: Jim Jagielski AuthorDate: Thu Oct 22 08:44:12 2020 -0400 Do exactly what we did for AOO417 --- main/nss/nss_linux.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main/nss/nss_linux.patch b/main/nss/nss_linux.patch index 50c27a4..fe2194f 100644 --- a/main/nss/nss_linux.patch +++ b/main/nss/nss_linux.patch @@ -22,8 +22,8 @@ diff -ur misc/nss-3.25/nss/lib/freebl/Makefile misc/build/nss-3.25/nss/lib/freeb -INTEL_GCM = 1 +#DEFINES += -DUSE_HW_AES -DINTEL_GCM +#ASFILES += intel-aes.s intel-gcm.s -+#EXTRA_SRCS += intel-gcm-wrap.c -+#INTEL_GCM = 1 ++EXTRA_SRCS += intel-gcm-wrap.c ++INTEL_GCM = 1 MPI_SRCS += mpi_amd64.c mp_comba.c endif ifeq ($(CPU_ARCH),x86)
svn commit: r1882764 - in /openoffice/devtools/aoo-stats: countries.py detail-by-day.py get-aoo-stats.py platform.py
Author: mseidel
Date: Thu Oct 22 16:13:21 2020
New Revision: 1882764
URL: http://svn.apache.org/viewvc?rev=1882764&view=rev
Log:
Fixed typos, removed whitespace
Modified:
openoffice/devtools/aoo-stats/countries.py
openoffice/devtools/aoo-stats/detail-by-day.py
openoffice/devtools/aoo-stats/get-aoo-stats.py
openoffice/devtools/aoo-stats/platform.py
Modified: openoffice/devtools/aoo-stats/countries.py
URL:
http://svn.apache.org/viewvc/openoffice/devtools/aoo-stats/countries.py?rev=1882764&r1=1882763&r2=1882764&view=diff
==
--- openoffice/devtools/aoo-stats/countries.py (original)
+++ openoffice/devtools/aoo-stats/countries.py Thu Oct 22 16:13:21 2020
@@ -1,5 +1,5 @@
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -7,16 +7,16 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
#http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
@@ -33,14 +33,14 @@ from urllib import urlencode
def getSourceForgeStats(download, start_date, end_date):
print download
url = download + "/stats/json?start_date=" + start_date + "&" "end_date="
+ end_date
-
+
attempts = 0
while attempts < 3:
-try:
+try:
conn = urllib.urlopen(url)
data = conn.read()
-
+
return data
except:
@@ -51,7 +51,7 @@ def getSourceForgeStats(download, start_
-#extracts the language code from the URL
+# extracts the language code from the URL
# this logic is very sensitive to the exact naming conventions
def getLanguage(url):
@@ -68,7 +68,7 @@ def getLanguage(url):
-# dictionary of language code to country_dict (dictionary of country name to
count)
+# dictionary of language code to country_dict (dictionary of country name to
count)
master_dict = {}
def mergeCountries(lang, countries):
@@ -89,12 +89,12 @@ def mergeCountries(lang, countries):
else:
country_dict[country_name] = country_count
-
+
if len(sys.argv) == 0:
-print "syntax: python countries.py "
+print "syntax: python countries.py "
print "where is a list of files URL's to gather stats on, and
and are in -MM-DD format."
downloads = [line.strip() for line in open(sys.argv[1])]
@@ -119,4 +119,3 @@ for lang in master_dict:
print
print
-
Modified: openoffice/devtools/aoo-stats/detail-by-day.py
URL:
http://svn.apache.org/viewvc/openoffice/devtools/aoo-stats/detail-by-day.py?rev=1882764&r1=1882763&r2=1882764&view=diff
==
--- openoffice/devtools/aoo-stats/detail-by-day.py (original)
+++ openoffice/devtools/aoo-stats/detail-by-day.py Thu Oct 22 16:13:21 2020
@@ -1,5 +1,5 @@
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -7,22 +7,22 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
#http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
-# This script queries the SourceForce REST API for download statistics for
+# This script queries the SourceForge REST API for download statistics for
# sets of files on SourceForge, for a range of dates, in ISO format
(-MM-DD)
-# passed in as a command line argument. The data, in CSV format is written to
stdout
+# passed in as a command line argument. The data, in CSV format is written to
stdout.
import urllib
@@ -41,10 +41,10 @@ def getSourceForgeStats(download, startD
attempts = 0
[openoffice] branch trunk updated: Fixed typos, removed whitespace
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/trunk by this push:
new a79a404 Fixed typos, removed whitespace
a79a404 is described below
commit a79a404b26934743545c6dafbc11b12ece90a8e1
Author: mseidel
AuthorDate: Thu Oct 22 18:36:39 2020 +0200
Fixed typos, removed whitespace
---
main/bridges/test/testcomp.cxx | 255 ++---
main/framework/source/classes/framecontainer.cxx | 14 +-
.../source/recording/dispatchrecorder.cxx | 19 +-
.../source/recording/dispatchrecordersupplier.cxx | 22 +-
4 files changed, 153 insertions(+), 157 deletions(-)
diff --git a/main/bridges/test/testcomp.cxx b/main/bridges/test/testcomp.cxx
index 4c193e7..fcddab6 100644
--- a/main/bridges/test/testcomp.cxx
+++ b/main/bridges/test/testcomp.cxx
@@ -1,5 +1,5 @@
/**
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*/
@@ -77,7 +77,7 @@ void parseCommandLine( char *argv[] ,
if( -1 == nIndex )
{
*pConnection = sTemp;
- *pProtocol= OUString( RTL_CONSTASCII_USTRINGPARAM( "iiop" )
);
+ *pProtocol = OUString( RTL_CONSTASCII_USTRINGPARAM( "iiop" ) );
}
else
{
@@ -86,13 +86,13 @@ void parseCommandLine( char *argv[] ,
}
}
-Any OInstanceProvider::queryInterface( const Type & aType ) throw (
RuntimeException )
+Any OInstanceProvider::queryInterface( const Type & aType ) throw (
RuntimeException )
{
Any a = ::cppu::queryInterface( aType ,
SAL_STATIC_CAST( XInstanceProvider * , this ) );
if( a.hasValue() )
{
- return a;
+ return a;
}
return OWeakObject::queryInterface( aType );
}
@@ -132,7 +132,7 @@ public:
{}
// XInterface
-virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const
::com::sun::star::uno::Type& aType )
throw(::com::sun::star::uno::RuntimeException)
+ virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const
::com::sun::star::uno::Type& aType )
throw(::com::sun::star::uno::RuntimeException)
{
// execution time remains appr. constant any time
Any aRet;
@@ -153,9 +153,9 @@ public:
}
return aRet;
}
-virtual void SAL_CALL acquire() throw()
+ virtual void SAL_CALL acquire() throw()
{ osl_incrementInterlockedCount( &_nRef ); }
-virtual void SAL_CALL release() throw()
+ virtual void SAL_CALL release() throw()
{ if (! osl_decrementInterlockedCount( &_nRef )) delete this; }
// XServiceInfo
@@ -163,97 +163,97 @@ public:
virtual sal_Bool SAL_CALL supportsService( const OUString &
rServiceName ) throw (RuntimeException);
virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw
(RuntimeException);
-// Attributes
-virtual sal_Int32 SAL_CALL getLong_attr()
throw(::com::sun::star::uno::RuntimeException)
+ // Attributes
+ virtual sal_Int32 SAL_CALL getLong_attr()
throw(::com::sun::star::uno::RuntimeException)
{ return 0; }
-virtual void SAL_CALL setLong_attr( sal_Int32 /* _attributelong */)
throw(::com::sun::star::uno::RuntimeException)
+ virtual void SAL_CALL setLong_attr( sal_Int32 /* _attributelong */)
throw(::com::sun::star::uno::RuntimeException)
{}
-virtual sal_Int64 SAL_CALL getHyper_attr()
throw(::com::sun::star::uno::RuntimeException)
+ virtual sal_Int64 SAL_CALL getHyper_attr()
throw(::com::sun::star::uno::RuntimeException)
{ return 0; }
-virtual void SAL_CALL setHyper_attr( sal_Int64 /* _attributehyper */)
throw(::com::sun::star::uno::RuntimeException)
+ virtual void SAL_CALL setHyper_attr( sal_Int64 /* _attributehyper */)
throw(::com::sun::star::uno::RuntimeException)
{}
-virtual float SAL_CALL getF
[openoffice] 01/02: Fixed typos
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit d92553df93a0783b5e3a873ed0b2339286d57dc7
Author: mseidel
AuthorDate: Tue Aug 20 23:46:29 2019 +0200
Fixed typos
(cherry picked from commit ee65694a6345d8193639ab50d8f2d48a52c3fa0b)
---
main/framework/source/classes/framecontainer.cxx | 62
1 file changed, 32 insertions(+), 30 deletions(-)
diff --git a/main/framework/source/classes/framecontainer.cxx
b/main/framework/source/classes/framecontainer.cxx
index 6cb9b6e..ef733a1 100644
--- a/main/framework/source/classes/framecontainer.cxx
+++ b/main/framework/source/classes/framecontainer.cxx
@@ -1,5 +1,5 @@
/**
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*/
@@ -25,7 +25,7 @@
#include "precompiled_framework.hxx"
//_
-// my own includes
+// my own includes
//_
#ifndef __FRAMEWORK_FRAMECONTAINER_HXX_
@@ -39,7 +39,7 @@
#endif
//_
-// interface includes
+// interface includes
//_
#ifndef _COM_SUN_STAR_FRAME_FRAMESEARCH_FLAG_HPP_
@@ -47,38 +47,38 @@
#endif
//_
-// includes of other projects
+// includes of other projects
//_
#include
//_
-// namespace
+// namespace
//_
namespace framework{
//_
-// non exported const
+// non exported const
//_
//_
-// non exported definitions
+// non exported definitions
//_
//_
-// declarations
+// declarations
//_
/**-***
@short initialize an empty container
@descr The container will be empty then - special features (e.g. the
async quit mechanism) are disabled.
-@threadsafe not necessary - its not a singleton
+@threadsafe not necessary - it's not a singleton
@modified 01.07.2002 14:42,as96863
*/
FrameContainer::FrameContainer()
// initialize base classes first.
-// Order is necessary for right initilization of his and OUR member
... m_aLock
+// Order is necessary for right initilization of his and OUR member...
m_aLock
: ThreadHelpBase ( &Application::GetSolarMutex() )
/*DEPRECATEME
, m_bAsyncQuit ( sal_False ) //
default must be "disabled"!
@@ -89,9 +89,9 @@ Fram
[openoffice] branch AOO42X updated (babbd85 -> 27741b5)
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a change to branch AOO42X in repository https://gitbox.apache.org/repos/asf/openoffice.git. from babbd85 Use real test new d92553d Fixed typos new 27741b5 Fixed typos, removed whitespace The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: main/bridges/test/testcomp.cxx | 255 ++--- main/framework/source/classes/framecontainer.cxx | 64 +++--- .../source/recording/dispatchrecorder.cxx | 19 +- .../source/recording/dispatchrecordersupplier.cxx | 22 +- 4 files changed, 179 insertions(+), 181 deletions(-)
[openoffice] 02/02: Fixed typos, removed whitespace
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 27741b5992f1bed04dc156742b07a37ca0a875c4
Author: mseidel
AuthorDate: Thu Oct 22 18:36:39 2020 +0200
Fixed typos, removed whitespace
(cherry picked from commit a79a404b26934743545c6dafbc11b12ece90a8e1)
---
main/bridges/test/testcomp.cxx | 255 ++---
main/framework/source/classes/framecontainer.cxx | 14 +-
.../source/recording/dispatchrecorder.cxx | 19 +-
.../source/recording/dispatchrecordersupplier.cxx | 22 +-
4 files changed, 153 insertions(+), 157 deletions(-)
diff --git a/main/bridges/test/testcomp.cxx b/main/bridges/test/testcomp.cxx
index 4c193e7..fcddab6 100644
--- a/main/bridges/test/testcomp.cxx
+++ b/main/bridges/test/testcomp.cxx
@@ -1,5 +1,5 @@
/**
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*/
@@ -77,7 +77,7 @@ void parseCommandLine( char *argv[] ,
if( -1 == nIndex )
{
*pConnection = sTemp;
- *pProtocol= OUString( RTL_CONSTASCII_USTRINGPARAM( "iiop" )
);
+ *pProtocol = OUString( RTL_CONSTASCII_USTRINGPARAM( "iiop" ) );
}
else
{
@@ -86,13 +86,13 @@ void parseCommandLine( char *argv[] ,
}
}
-Any OInstanceProvider::queryInterface( const Type & aType ) throw (
RuntimeException )
+Any OInstanceProvider::queryInterface( const Type & aType ) throw (
RuntimeException )
{
Any a = ::cppu::queryInterface( aType ,
SAL_STATIC_CAST( XInstanceProvider * , this ) );
if( a.hasValue() )
{
- return a;
+ return a;
}
return OWeakObject::queryInterface( aType );
}
@@ -132,7 +132,7 @@ public:
{}
// XInterface
-virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const
::com::sun::star::uno::Type& aType )
throw(::com::sun::star::uno::RuntimeException)
+ virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const
::com::sun::star::uno::Type& aType )
throw(::com::sun::star::uno::RuntimeException)
{
// execution time remains appr. constant any time
Any aRet;
@@ -153,9 +153,9 @@ public:
}
return aRet;
}
-virtual void SAL_CALL acquire() throw()
+ virtual void SAL_CALL acquire() throw()
{ osl_incrementInterlockedCount( &_nRef ); }
-virtual void SAL_CALL release() throw()
+ virtual void SAL_CALL release() throw()
{ if (! osl_decrementInterlockedCount( &_nRef )) delete this; }
// XServiceInfo
@@ -163,97 +163,97 @@ public:
virtual sal_Bool SAL_CALL supportsService( const OUString &
rServiceName ) throw (RuntimeException);
virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw
(RuntimeException);
-// Attributes
-virtual sal_Int32 SAL_CALL getLong_attr()
throw(::com::sun::star::uno::RuntimeException)
+ // Attributes
+ virtual sal_Int32 SAL_CALL getLong_attr()
throw(::com::sun::star::uno::RuntimeException)
{ return 0; }
-virtual void SAL_CALL setLong_attr( sal_Int32 /* _attributelong */)
throw(::com::sun::star::uno::RuntimeException)
+ virtual void SAL_CALL setLong_attr( sal_Int32 /* _attributelong */)
throw(::com::sun::star::uno::RuntimeException)
{}
-virtual sal_Int64 SAL_CALL getHyper_attr()
throw(::com::sun::star::uno::RuntimeException)
+ virtual sal_Int64 SAL_CALL getHyper_attr()
throw(::com::sun::star::uno::RuntimeException)
{ return 0; }
-virtual void SAL_CALL setHyper_attr( sal_Int64 /* _attributehyper */)
throw(::com::sun::star::uno::RuntimeException)
+ virtual void SAL_CALL setHyper_attr( sal_Int64 /* _attributehyper */)
throw(::com::sun::star::uno::RuntimeException)
{}
-virtual float SAL_CALL getFloat_attr()
throw(::com::sun::star::uno::RuntimeException)
+ v
[openoffice-org] branch main created (now 8517e0e)
This is an automated email from the ASF dual-hosted git repository. wave pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/openoffice-org.git. at 8517e0e Initial commit This branch includes the following new commits: new 8517e0e Initial commit The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[openoffice-org] 01/01: Initial commit
This is an automated email from the ASF dual-hosted git repository. wave pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/openoffice-org.git commit 8517e0ebd676ac4e010779afc119116b1166341b Author: Dave Fisher AuthorDate: Thu Oct 22 09:50:51 2020 -0700 Initial commit --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md new file mode 100644 index 000..9d0ea75 --- /dev/null +++ b/README.md @@ -0,0 +1 @@ +Initial file
[openoffice-org] branch main updated: Adding asf yaml file
This is an automated email from the ASF dual-hosted git repository. wave pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/openoffice-org.git The following commit(s) were added to refs/heads/main by this push: new 0c057fc Adding asf yaml file 0c057fc is described below commit 0c057fcb0bbc61249525cc7e9e960b60ad96214a Author: Dave Fisher AuthorDate: Thu Oct 22 10:11:24 2020 -0700 Adding asf yaml file --- .asf.yaml | 7 +++ 1 file changed, 7 insertions(+) diff --git a/.asf.yaml b/.asf.yaml new file mode 100644 index 000..34ed543 --- /dev/null +++ b/.asf.yaml @@ -0,0 +1,7 @@ +github: + description: "Apache OpenOffice.org Website" + homepage: "https://openoffice.org/"; + labels: +- openoffice +- website +- jbake \ No newline at end of file
[openoffice-org] branch main updated: Testing
This is an automated email from the ASF dual-hosted git repository. wave pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/openoffice-org.git The following commit(s) were added to refs/heads/main by this push: new ed91cc7 Testing ed91cc7 is described below commit ed91cc77eb473b83b1e0b3b93dfad99cc6bd586d Author: Dave Fisher AuthorDate: Thu Oct 22 10:25:01 2020 -0700 Testing --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 9d0ea75..dd8ba43 100644 --- a/README.md +++ b/README.md @@ -1 +1,3 @@ Initial file + +With one change \ No newline at end of file
[openoffice-org] branch main updated: Templates files to be translated
This is an automated email from the ASF dual-hosted git repository.
wave pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/openoffice-org.git
The following commit(s) were added to refs/heads/main by this push:
new 1924140 Templates files to be translated
1924140 is described below
commit 1924140a4b132d4f64bebd4347324524d0ad0544
Author: Dave Fisher
AuthorDate: Thu Oct 22 10:42:08 2020 -0700
Templates files to be translated
---
templates/FRAMEWORKS.txt| 30
templates/README.txt| 211 ++
templates/brand.html| 76 ++
templates/doctype.html | 1 +
templates/footer.html | 26
templates/html_page.html| 3 +
templates/navigator.html| 1 +
templates/single_narrative.html | 1 +
templates/skeleton.html | 29
templates/ssi.json | 325
10 files changed, 703 insertions(+)
diff --git a/templates/FRAMEWORKS.txt b/templates/FRAMEWORKS.txt
new file mode 100644
index 000..a0d89da
--- /dev/null
+++ b/templates/FRAMEWORKS.txt
@@ -0,0 +1,30 @@
+Observations about the suitability and challenges using various frameworks.
+
+(1) Pelican
+- Suitable for our Markdown, but we will need to rename all files - mdtext ->
md
+- Has it's own methods for HTML which are not really compatible with our
current methods.
+ We would need to write our own plugin and rename all of the htm and html
files to a special prefix like aoo.
+
+Seems like a bad fit. Thumbs down.
+
+(2) JBake
+- Suitable for our Markdown, but will need to rename all files - mdtext -> md
+- Html and Htm will need to have a minimal piece of metadata inserted in order
to call out the particular template.
+ See https://jbake.org/docs/2.6.5/#content_files and
https://jbake.org/docs/2.6.5/#custom_templates
+
+- Assets and Content is separated so that all of our as is files should be in
a sepearate tree.
+- We can obsolete directories without deleting the content via
https://jbake.org/docs/2.6.5/#ignoring_files_and_directories
+
+This could be a good fit. Thumbs up.
+
+(3) Hugo
+- Go based.
+- Looks like a lot of rewrite.
+
+No opinion, but it looks like a steep learning curve
+
+(4) Jekyll
+- Ruby based
+- Suitable for our Markdown, but will need to rename all files - mdtext -> md
+- Unclear how we would handle the html parsing.
+
diff --git a/templates/README.txt b/templates/README.txt
new file mode 100644
index 000..b265d4a
--- /dev/null
+++ b/templates/README.txt
@@ -0,0 +1,211 @@
+Some thoughts and documentation.
+
+(1) SSI within the templates and produced html remains a good idea.
+
+(2) SSI directory structure could be replaced could be replaced by a json file.
+
+- footer is always the same.
+ Path to the footer file to include. Always the same.
+- doctype is always the same.
+ Path to the doctype file to use. Ought to eliminate this hack.
+- home is always the same.
+ The name to use for the first breadcrumb which will take you to "/".
+- brand for the top of the page.
+ Path to the brand file to include. Varies according the language site.
+- topnav for the upper navigation bar.
+ Path to the top nav menu to include. Varies according the language site.
+- leftnav is optional and special.
+ Path to a left nav menu to include. Varies according the language site or
"project" site.
+- rightnav is optional and only used once for l10n where there is also a
leftnav.
+ Path to a right nav menu to include. Varies according the language site or
"project" site.
+
+(3) ssi.json is a directory of directories.
+
+Note this actitivty should also build the breadrcumb list. See (5)
+
+For each template key look up the subpath and then look for the ssi element
name.
+If missing then go up a level on the subpath.
+
+e.g. if you are looking in "/api/some/deep/path/"
+then you look into "/api/some/deep/", "/api/some/", "/api/", and "/"
+
+ssi[path][key]
+
+For api:
+"/api/": {
+ "leftnav":"/api/leftnav.html"
+}
+"/": {
+ "doctype":"/doctype.html",
+ "footer":"/footer.html",
+ "brand":"/brand.html",
+ "topnav":"/topnav.html",
+ "home":"home"
+}
+
+
+For de:
+"/de/product/": {
+ "leftnav":"/de/product/leftnav.html"
+}
+"/de/": {
+ "brand":"/de/brand.html",
+ "topnav":"/de/topnav.html"
+}
+"/": {
+ "doctype":"/doctype.html",
+ "footer":"/footer.html",
+ "brand":"/brand.html",
+ "topnav":"/topnav.html",
+ "home":"home"
+}
+
+For xx:
+"/xx/why/": {
+ "leftnav":"/xx/why/leftnav.html"
+}
+"/xx/product/": {
+ "leftnav":"/xx/product/leftnav.html"
+}
+"/xx/": {
+ "topnav":"/xx/topnav.html",
+ "brand":"/xx/brand.html"
+}
+"/": {
+ "doctype":"/doctype.html",
+ "footer":"/footer.html",
+ "brand":"/brand.html",
+ "topnav":"/topnav.html",
+ "h
[openoffice-org] branch main updated: Copy in the tools scripts used in the original migration.
This is an automated email from the ASF dual-hosted git repository.
wave pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/openoffice-org.git
The following commit(s) were added to refs/heads/main by this push:
new 24b562e Copy in the tools scripts used in the original migration.
24b562e is described below
commit 24b562e29a57e78cc17d6c95949774b8c2d5ca38
Author: Dave Fisher
AuthorDate: Thu Oct 22 10:48:08 2020 -0700
Copy in the tools scripts used in the original migration.
---
tools/dos2unix.pl | 44 ++
tools/fetch-all-web.sh | 55 +++
tools/kenai2website.sh | 83 ++
tools/readme.txt | 60
tools/redirect.table | 137 +
tools/redirect.txt | 409 +
tools/urlrewrite.sed | 167
tools/urlrewrite.sh| 65
tools/urlrewrite2.sed | 33
tools/urlrewrite2.sh | 65
tools/web-list.txt | 39 +
11 files changed, 1157 insertions(+)
diff --git a/tools/dos2unix.pl b/tools/dos2unix.pl
new file mode 100755
index 000..c4851a7
--- /dev/null
+++ b/tools/dos2unix.pl
@@ -0,0 +1,44 @@
+#! /usr/bin/perl
+
+# dos2unix.pl by David Efflandt
+# Modification of script from "Learning perl" p.353
+# O'Reilly & Associates, Inc.
+#
+# Run after transfering text files from DOS to UNIX system.
+# Strips carriage returns from DOS files for use UNIX.
+# Transfers file permissions to new file (except suid bit).
+#
+# Usage:\tdos2unix.pl FILELIST
+# where FILELIST = one or more filenames
+#
+# If you edit this file in DOS you can run it on itself by typing:
+# perl dos2unix.pl dos2unix.pl
+#
+# Modify variables below for other search and replace functions.
+
+$find = "\r"; # find this
+$sub = ""; # substitute with this
+$rm_bak = 1;# remove old file after conversion: 0 = no, 1 = yes
+
+while (<>) {
+if ($ARGV ne $oldargv) {
+ ($dev,$ino,$mode,$nlink,$uid,$gid) = stat($ARGV);
+ $backup = $ARGV . '.bak';
+ rename($ARGV, $backup);
+ open (ARGVOUT, ">$ARGV");
+ chmod $mode, $ARGV;
+ select(ARGVOUT);
+ $oldargv = $ARGV;
+}
+s/$find/$sub/g;
+s/\t/ /g;
+s/
+ /\n/g;
+} continue {
+print;
+if (eof) {
+ print STDOUT "Converted: $oldargv\n";
+ unlink $backup if $rm_bak;
+}
+}
+select(STDOUT);
diff --git a/tools/fetch-all-web.sh b/tools/fetch-all-web.sh
new file mode 100755
index 000..2a35be4
--- /dev/null
+++ b/tools/fetch-all-web.sh
@@ -0,0 +1,55 @@
+#!/bin/sh
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+#
+# Use this script to fetch all a project's webcontent for the projects
+# listed in the specified file (typically, webcontent-list.txt).
+#
+# See https://cwiki.apache.org/confluence/display/OOOUSERS/OOo-Sitemap
+# for a note on the checkout from the Kenai svn repository.
+#
+# USAGE:
+# $ ./fetch-all-web.sh WEB-LIST WORK-DIR
+#
+# WEB-LIST is a file containing the list of Projects to fetch
+# (see the file tools/dev/webcontent-list.txt)
+# WORK-DIR each project's webcontent will be created in a
+# subdirectory of WORK-DIR
+#
+# Future steps will include scripts to transform the content for
+# the Apache CMS or a Confluence Wiki import
+#
+
+if test "$#" != 1; then
+ echo "USAGE: $0 WEB-LIST"
+ exit 1
+fi
+
+webdir=`dirname "$1"`
+webfile=`basename "$1"`
+weblist=`(cd "$webdir" ; pwd)`/$webfile
+
+
+for webproject in `grep '^./' $weblist` ; do
+echo "'$webproject'."
+echo "="
+./kenai2website.sh ${webproject}
+echo " "
+done
diff --git a/tools/kenai2website.sh b/tools/kenai2website.sh
new file mode 100755
index 000..453ef4e
--- /dev/null
+++ b/tools/kenai2website.sh
@@ -0,0 +1,83 @@
+#!/bin/sh
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a c
