buildbot success in on openoffice-linux64-41x
The Buildbot has detected a restored build on builder openoffice-linux64-41x while building . Full details are available at: https://ci.apache.org/builders/openoffice-linux64-41x/builds/335 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: bb_slave8_ubuntu Build Reason: forced: by IRC user (privmsg): None Build Source Stamp: HEAD Blamelist: Build succeeded! Sincerely, -The Buildbot
svn commit: r1892532 - in /openoffice/devtools/build-scripts/4.1.11/unxmacos: build_aoo64bit_on_macos.sh config.log
Author: jim
Date: Sun Aug 22 22:27:02 2021
New Revision: 1892532
URL: http://svn.apache.org/viewvc?rev=1892532=rev
Log:
4.1.11-dev
Added:
openoffice/devtools/build-scripts/4.1.11/unxmacos/build_aoo64bit_on_macos.sh
(with props)
openoffice/devtools/build-scripts/4.1.11/unxmacos/config.log
Added:
openoffice/devtools/build-scripts/4.1.11/unxmacos/build_aoo64bit_on_macos.sh
URL:
http://svn.apache.org/viewvc/openoffice/devtools/build-scripts/4.1.11/unxmacos/build_aoo64bit_on_macos.sh?rev=1892532=auto
==
---
openoffice/devtools/build-scripts/4.1.11/unxmacos/build_aoo64bit_on_macos.sh
(added)
+++
openoffice/devtools/build-scripts/4.1.11/unxmacos/build_aoo64bit_on_macos.sh
Sun Aug 22 22:27:02 2021
@@ -0,0 +1,216 @@
+#!/usr/bin/env bash
+#
+# Build-script for AOO 4.1.x on OSX 10.13
+#
+# OS:
+# o OSX 10.13.6 (High Sierra)
+# o jdk1.7.0_80.jdk
+# o jdk1.8.0_181.jdk
+# o XCode 7 w/ 10.11 SDK
+#
+# Local Changes:
+# MacPorts:
+# o gnutar (1.29) (symlinked gnutar to gtar) (symlinked to ~/bin)
+# o perl5 (perl5.22) (symlinked to ~/bin)
+# o p5-archive-*
+# o p5-lwp-*
+# o p5-xml-parser
+# o autoconf (symlinked to ~/bin)
+# o getopt (symlinked to ~/bin)
+# o subversion
+# o git
+##
+# /usr/local:
+# o Apache ant 1.9.13 / 1.10.4
+# o dmake 4.12.3
(https://github.com/jimjag/dmake/archive/dmake-4.12.3.tar.gz)
+# o epm 4.4.2 (https://github.com/jimjag/epm/archive/epm-4.4.2.tar.gz)
+# o openssl (1.0.2t)
+# https://www.openssl.org/source/openssl-1.0.2t.tar.gz
+# $ export MACOSX_DEPLOYMENT_TARGET=10.7
+# $ ./Configure darwin64-x86_64-cc no-shared --prefix=/usr/local
--openssldir=/usr/local ; make install
+# o libxml2-2.9.9 (--prefix=/usr/local --enable-shared=no --without-iconv)
+# o libxslt-1.1.33 (--prefix=/usr/local --enable-shared=no)
+# o pkg-config 0.29.2 (--prefix=/usr/local)
+# o GNU patch 2.7.6 (--prefix=/usr/local)
+#
+# Env:
+# LC_CTYPE=en_US.UTF-8
+# LANG=en_US.UTF-8
+# LIBRARY_PATH=/usr/local/lib
+# C_INCLUDE_PATH=/usr/local/include
+#
CPLUS_INCLUDE_PATH=/usr/local/include:/Applications/Xcode7.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk/usr/include/c++/4.2.1
+# MACOSX_DEPLOYMENT_TARGET=10.7
+#
PATH=/opt/local/bin:/opt/local/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:.
+#
+# Notes:
+# o openssl required for serf; we build non-shared so all
+# linkings are to the static libs
+#
+# o JDK 1.7 seems to work better; and it's always best to
+# have just *one* version of the JDK installed.
+#
+
+#
+# Build options
+#
+AOO_MACOS_TARGET=10.7
+AOO_JAVA_VERSION=1.7
+AOO_ANT_VERSION=1.9
+
+#
+# Parse options
+#
+AOO_SKIP_CONFIG=
+AOO_JUST_CONFIG=
+AOO_VERBOSE_BUILD=
+AOO_BUILD_TYPE=
+AOO_BUILD_VERSION=
+AOO_BUILD_BETA=
+AOO_BUILD_DEV=
+AOO_BUILD_SRC=
+AOO_BUILD_ALL="yes"
+
+$(xcode-select -p | grep "Xcode7" -q)
+if [ $? != 0 ]; then
+echo "xcode-select must point to Xcode7."
+exit 1
+fi
+
+AOPTS=`getopt -o vsjdtbqa:j:m: --long
verbose,skip-config,just-config,build-src,dev,beta,quick,ant-version:,java-version:,macos-target:
-n 'parse-options' -- "$@"`
+if [ $? != 0 ] ; then echo "Failed parsing options." >&2 ; exit 1 ; fi
+#echo "$AOPTS"
+eval set -- "$AOPTS"
+
+while true; do
+ case "$1" in
+-v | --verbose ) AOO_VERBOSE_BUILD="--enable-verbose"; shift ;;
+-s | --skip-config ) AOO_SKIP_CONFIG="yes"; shift ;;
+-j | --just-config ) AOO_JUST_CONFIG="yes"; shift ;;
+-q | --quick ) AOO_BUILD_ALL="no"; shift ;;
+-t | --build-src ) AOO_BUILD_SRC="yes"; shift ;;
+-a | --ant-version ) AOO_ANT_VERSION=$2; shift 2 ;;
+-j | --java-version ) AOO_JAVA_VERSION=$2; shift 2 ;;
+-m | --macos-target ) AOO_MACOS_TARGET=$2; shift 2 ;;
+-d | --dev ) AOO_BUILD_TYPE="Apache OpenOffice Test Development Build";
AOO_BUILD_VERSION=" [${AOO_BUILD_TYPE}]"; AOO_BUILD_DEV="yes";
AOO_BUILD_BETA=""; shift ;;
+-b | --beta ) AOO_BUILD_TYPE="Apache OpenOffice Beta Build";
AOO_BUILD_VERSION=" [${AOO_BUILD_TYPE}]"; AOO_BUILD_BETA="yes";
AOO_BUILD_DEV=""; shift ;;
+-- ) shift; break ;;
+* ) echo "unknown option: $1"; shift ;;
+ esac
+done
+
+if [ ! -d ../main -o ! -d sal ] ; then
+ echo "CHDIR into AOO's main/ directory first!"
+ exit 1
+fi
+
+
+JAVA_HOME=$(/usr/libexec/java_home -v ${AOO_JAVA_VERSION})
+if [ ! -d "$JAVA_HOME" ] ; then
+echo "JAVA_HOME not found: $JAVA_HOME"
+exit 1
+fi
+export JAVA_HOME
+echo "JAVA_HOME is: $JAVA_HOME..."
+
+ANT_HOME=/usr/local/share/java/apache-ant-${AOO_ANT_VERSION}
+if [ ! -d "$ANT_HOME" ] ; then
+echo "ANT_HOME not found: $ANT_HOME"
+exit 1
+fi
+export ANT_HOME
+ANT_CLASSPATH=${ANT_HOME}/lib
+export ANT_CLASSPATH
+echo "ANT_HOME is: $ANT_HOME..."
+echo "ANT_CLASSPATH is: $ANT_CLASSPATH..."
+
+if [ -z "$JUNIT_PATH" ] ; then
+
[openoffice] branch AOO42X updated: 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
The following commit(s) were added to refs/heads/AOO42X by this push:
new 8ae656e Fixed typos, removed whitespace
8ae656e is described below
commit 8ae656ed70368f2808524c7a29a03519909ea2b1
Author: mseidel
AuthorDate: Sun Aug 22 19:50:23 2021 +0200
Fixed typos, removed whitespace
(cherry picked from commit 8927ee86bef23fd08661b88a59493a46e7017564)
---
main/solenv/bin/make_ext_update_info.pl | 142
1 file changed, 71 insertions(+), 71 deletions(-)
diff --git a/main/solenv/bin/make_ext_update_info.pl
b/main/solenv/bin/make_ext_update_info.pl
index 26132d6..c1ff25b 100755
--- a/main/solenv/bin/make_ext_update_info.pl
+++ b/main/solenv/bin/make_ext_update_info.pl
@@ -2,7 +2,7 @@
eval 'exec perl -wS $0 ${1+"$@"}'
if 0;
#**
-#
+#
# 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
@@ -10,22 +10,22 @@ eval 'exec perl -wS $0 ${1+"$@"}'
# 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.
-#
+#
#**
#here the definition for d would be written into dependencies. The reason is
that when the event handler
-#for the element is called, we can only find out the namespace but not the
prefix. So we cannot
+#for the element is called, we can only find out the namespace but not the
prefix. So we cannot
#distinguish if the namespace is used because the element was prefixed or
because it uses the default
#namespace.
use warnings;
@@ -48,7 +48,7 @@ my $inDependencies = 0;
my $inIdentifier = 0;
my $inVersion = 0;
my $descNS = "http://openoffice.org/extensions/description/2006;;
- my $indent;
+my $indent;
my $identifier;
my $version;
@@ -56,8 +56,8 @@ my $version;
#element and all children of the description.xml
my @usedNsInDependencies;
-#Maps prefix to namespaces which are valid in . That is, they
are
-#either defined in or in the hirarchy above
+#Maps prefix to namespaces which are valid in . That is, they are
+#either defined in or in the hierarchy above
my %validPrefsInDep;
#Contains the prefixes which are defined in
my @newPrefsInDep;
@@ -73,21 +73,21 @@ my $defNsInDep;
#The prefix which we use for the default namespace used in
my $generatedPrefix;
-my $helptext =
+my $helptext =
"make_ext_update_info.pl produces an update information file for an extension.
".
-"It will use a dummy URL as URL for the extension update unless a URL has been
".
+"It will use a dummy URL as URL for the extension update unless a URL has been
".
"provided with the --update_url option. The name of the update ".
"information file, which must be provided with the --out switch, should be
formed ".
-"according to this scheme: \n\n".
+"according to this scheme:\n\n".
"extension_identifier.update.xml\n\n".
"extension_identifier should correspond to the extension identifier. In some
cases ".
"this may not be possible because the identifier may contain characters which
are not ".
"allowd in file names.\n\n".
"usage:\n".
-"perl make_ext_update_info.pl [--help][--update_url url] --out
update_information_file description.xml \n\n".
-"Options: \n".
-"--help - prints the help message and exits \n".
-"--out file - the update information file to be written including the path \n".
+"perl make_ext_update_info.pl [--help][--update_url url] --out
update_information_file description.xml\n\n".
+"Options:\n".
+"--help - prints the help message and exits\n".
+"--out file - the update information file to be written including the path\n".
"--update-url url - inserts the url under the element. It
may be necessary to enclose the urls in quotes in case they contain characters
such as \"?\". ".
"It can be used multiple times\n\n";
@@ -106,7 +106,7 @@ my $cArgs = scalar @ARGV;
die "You need to provide a description.xml\n\n$helptext" if $cArgs ==0;
die "You need to provide the name of the update information file ".
"with the --out switch.\n" unless ($out);
-die "Too many arguments. \n\n$helptext" if $cArgs > 1;
+die "Too many arguments.\n\n$helptext" if $cArgs > 1;
print $helptext if
[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 8927ee8 Fixed typos, removed whitespace
8927ee8 is described below
commit 8927ee86bef23fd08661b88a59493a46e7017564
Author: mseidel
AuthorDate: Sun Aug 22 19:50:23 2021 +0200
Fixed typos, removed whitespace
---
main/solenv/bin/make_ext_update_info.pl | 142
1 file changed, 71 insertions(+), 71 deletions(-)
diff --git a/main/solenv/bin/make_ext_update_info.pl
b/main/solenv/bin/make_ext_update_info.pl
index 26132d6..c1ff25b 100755
--- a/main/solenv/bin/make_ext_update_info.pl
+++ b/main/solenv/bin/make_ext_update_info.pl
@@ -2,7 +2,7 @@
eval 'exec perl -wS $0 ${1+"$@"}'
if 0;
#**
-#
+#
# 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
@@ -10,22 +10,22 @@ eval 'exec perl -wS $0 ${1+"$@"}'
# 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.
-#
+#
#**
#here the definition for d would be written into dependencies. The reason is
that when the event handler
-#for the element is called, we can only find out the namespace but not the
prefix. So we cannot
+#for the element is called, we can only find out the namespace but not the
prefix. So we cannot
#distinguish if the namespace is used because the element was prefixed or
because it uses the default
#namespace.
use warnings;
@@ -48,7 +48,7 @@ my $inDependencies = 0;
my $inIdentifier = 0;
my $inVersion = 0;
my $descNS = "http://openoffice.org/extensions/description/2006;;
- my $indent;
+my $indent;
my $identifier;
my $version;
@@ -56,8 +56,8 @@ my $version;
#element and all children of the description.xml
my @usedNsInDependencies;
-#Maps prefix to namespaces which are valid in . That is, they
are
-#either defined in or in the hirarchy above
+#Maps prefix to namespaces which are valid in . That is, they are
+#either defined in or in the hierarchy above
my %validPrefsInDep;
#Contains the prefixes which are defined in
my @newPrefsInDep;
@@ -73,21 +73,21 @@ my $defNsInDep;
#The prefix which we use for the default namespace used in
my $generatedPrefix;
-my $helptext =
+my $helptext =
"make_ext_update_info.pl produces an update information file for an extension.
".
-"It will use a dummy URL as URL for the extension update unless a URL has been
".
+"It will use a dummy URL as URL for the extension update unless a URL has been
".
"provided with the --update_url option. The name of the update ".
"information file, which must be provided with the --out switch, should be
formed ".
-"according to this scheme: \n\n".
+"according to this scheme:\n\n".
"extension_identifier.update.xml\n\n".
"extension_identifier should correspond to the extension identifier. In some
cases ".
"this may not be possible because the identifier may contain characters which
are not ".
"allowd in file names.\n\n".
"usage:\n".
-"perl make_ext_update_info.pl [--help][--update_url url] --out
update_information_file description.xml \n\n".
-"Options: \n".
-"--help - prints the help message and exits \n".
-"--out file - the update information file to be written including the path \n".
+"perl make_ext_update_info.pl [--help][--update_url url] --out
update_information_file description.xml\n\n".
+"Options:\n".
+"--help - prints the help message and exits\n".
+"--out file - the update information file to be written including the path\n".
"--update-url url - inserts the url under the element. It
may be necessary to enclose the urls in quotes in case they contain characters
such as \"?\". ".
"It can be used multiple times\n\n";
@@ -106,7 +106,7 @@ my $cArgs = scalar @ARGV;
die "You need to provide a description.xml\n\n$helptext" if $cArgs ==0;
die "You need to provide the name of the update information file ".
"with the --out switch.\n" unless ($out);
-die "Too many arguments. \n\n$helptext" if $cArgs > 1;
+die "Too many arguments.\n\n$helptext" if $cArgs > 1;
print $helptext if $help;
@@ -123,10 +123,10 @@ print $FH '
[openoffice] branch AOO42X updated: Fixed mixed style (space/tabs) in indentation
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
The following commit(s) were added to refs/heads/AOO42X by this push:
new 88e0618 Fixed mixed style (space/tabs) in indentation
88e0618 is described below
commit 88e0618300aabaa63c4b67c3e89b8eb571dcf04e
Author: mseidel
AuthorDate: Sun Aug 22 18:03:22 2021 +0200
Fixed mixed style (space/tabs) in indentation
(cherry picked from commit 64b67dd523d1f72a1ecd7e8ec805b34bce158f33)
---
main/sal/inc/osl/thread.hxx | 286 ++--
1 file changed, 143 insertions(+), 143 deletions(-)
diff --git a/main/sal/inc/osl/thread.hxx b/main/sal/inc/osl/thread.hxx
index 9a4c4ba..30911df 100644
--- a/main/sal/inc/osl/thread.hxx
+++ b/main/sal/inc/osl/thread.hxx
@@ -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.
- *
+ *
*/
@@ -36,16 +36,16 @@
namespace osl
{
/** threadFunc is the function which is executed by the threads
-created by the osl::Thread class. The function's signature
-matches the one of oslWorkerFunction which is declared in
-osl/thread.h .
+ created by the osl::Thread class. The function's signature
+ matches the one of oslWorkerFunction which is declared in
+ osl/thread.h .
*/
extern "C" inline void SAL_CALL threadFunc( void* param);
class Thread
{
-Thread( const Thread& );
-Thread& operator= ( const Thread& );
+ Thread( const Thread& );
+ Thread& operator= ( const Thread& );
public:
// these are here to force memory de/allocation to sal lib.
inline static void * SAL_CALL operator new( size_t nSize ) SAL_THROW
(())
@@ -57,171 +57,171 @@ public:
inline static void SAL_CALL operator delete( void *, void * ) SAL_THROW
(())
{}
-Thread(): m_hThread(0){}
+ Thread(): m_hThread(0){}
-virtual ~Thread()
-{
-osl_destroyThread( m_hThread);
-}
+ virtual ~Thread()
+ {
+ osl_destroyThread( m_hThread);
+ }
-sal_Bool SAL_CALL create()
-{
- OSL_ASSERT(m_hThread == 0); // only one running thread per instance
- if (m_hThread)
+ sal_Bool SAL_CALL create()
+ {
+ OSL_ASSERT(m_hThread == 0); // only one running thread per
instance
+ if (m_hThread)
return sal_False;
- m_hThread = osl_createSuspendedThread( threadFunc, (void*)this);
- if ( m_hThread )
- osl_resumeThread(m_hThread);
-
- return m_hThread != 0;
-}
-
-sal_Bool SAL_CALL createSuspended()
-{
- OSL_ASSERT(m_hThread == 0); // only one running thread per instance
-if( m_hThread)
-return sal_False;
- m_hThread= osl_createSuspendedThread( threadFunc,
-
(void*)this);
- return m_hThread != 0;
-}
-
-virtual void SAL_CALL suspend()
-{
-if( m_hThread )
-osl_suspendThread(m_hThread);
-}
-
-virtual void SAL_CALL resume()
-{
-if( m_hThread )
-osl_resumeThread(m_hThread);
-}
-
-virtual void SAL_CALL terminate()
-{
-if( m_hThread )
-osl_terminateThread(m_hThread);
-}
-
-virtual void SAL_CALL join()
-{
-osl_joinWithThread(m_hThread);
-}
-
-sal_Bool SAL_CALL isRunning() const
-{
- return osl_isThreadRunning(m_hThread);
-}
-
-void SAL_CALL setPriority( oslThreadPriority Priority)
-{
-if( m_hThread )
-osl_setThreadPriority(m_hThread, Priority);
-}
-
-oslThreadPriority SAL_CALL getPriority() const
-{
- return m_hThread ? osl_getThreadPriority(m_hThread) :
osl_Thread_PriorityUnknown;
-}
-
-oslThreadIdentifier SAL_CALL getIdentifier() const
-{
- return
[openoffice] branch trunk updated: Fixed mixed style (space/tabs) in indentation
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 64b67dd Fixed mixed style (space/tabs) in indentation
64b67dd is described below
commit 64b67dd523d1f72a1ecd7e8ec805b34bce158f33
Author: mseidel
AuthorDate: Sun Aug 22 18:03:22 2021 +0200
Fixed mixed style (space/tabs) in indentation
---
main/sal/inc/osl/thread.hxx | 286 ++--
1 file changed, 143 insertions(+), 143 deletions(-)
diff --git a/main/sal/inc/osl/thread.hxx b/main/sal/inc/osl/thread.hxx
index 9a4c4ba..30911df 100644
--- a/main/sal/inc/osl/thread.hxx
+++ b/main/sal/inc/osl/thread.hxx
@@ -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.
- *
+ *
*/
@@ -36,16 +36,16 @@
namespace osl
{
/** threadFunc is the function which is executed by the threads
-created by the osl::Thread class. The function's signature
-matches the one of oslWorkerFunction which is declared in
-osl/thread.h .
+ created by the osl::Thread class. The function's signature
+ matches the one of oslWorkerFunction which is declared in
+ osl/thread.h .
*/
extern "C" inline void SAL_CALL threadFunc( void* param);
class Thread
{
-Thread( const Thread& );
-Thread& operator= ( const Thread& );
+ Thread( const Thread& );
+ Thread& operator= ( const Thread& );
public:
// these are here to force memory de/allocation to sal lib.
inline static void * SAL_CALL operator new( size_t nSize ) SAL_THROW
(())
@@ -57,171 +57,171 @@ public:
inline static void SAL_CALL operator delete( void *, void * ) SAL_THROW
(())
{}
-Thread(): m_hThread(0){}
+ Thread(): m_hThread(0){}
-virtual ~Thread()
-{
-osl_destroyThread( m_hThread);
-}
+ virtual ~Thread()
+ {
+ osl_destroyThread( m_hThread);
+ }
-sal_Bool SAL_CALL create()
-{
- OSL_ASSERT(m_hThread == 0); // only one running thread per instance
- if (m_hThread)
+ sal_Bool SAL_CALL create()
+ {
+ OSL_ASSERT(m_hThread == 0); // only one running thread per
instance
+ if (m_hThread)
return sal_False;
- m_hThread = osl_createSuspendedThread( threadFunc, (void*)this);
- if ( m_hThread )
- osl_resumeThread(m_hThread);
-
- return m_hThread != 0;
-}
-
-sal_Bool SAL_CALL createSuspended()
-{
- OSL_ASSERT(m_hThread == 0); // only one running thread per instance
-if( m_hThread)
-return sal_False;
- m_hThread= osl_createSuspendedThread( threadFunc,
-
(void*)this);
- return m_hThread != 0;
-}
-
-virtual void SAL_CALL suspend()
-{
-if( m_hThread )
-osl_suspendThread(m_hThread);
-}
-
-virtual void SAL_CALL resume()
-{
-if( m_hThread )
-osl_resumeThread(m_hThread);
-}
-
-virtual void SAL_CALL terminate()
-{
-if( m_hThread )
-osl_terminateThread(m_hThread);
-}
-
-virtual void SAL_CALL join()
-{
-osl_joinWithThread(m_hThread);
-}
-
-sal_Bool SAL_CALL isRunning() const
-{
- return osl_isThreadRunning(m_hThread);
-}
-
-void SAL_CALL setPriority( oslThreadPriority Priority)
-{
-if( m_hThread )
-osl_setThreadPriority(m_hThread, Priority);
-}
-
-oslThreadPriority SAL_CALL getPriority() const
-{
- return m_hThread ? osl_getThreadPriority(m_hThread) :
osl_Thread_PriorityUnknown;
-}
-
-oslThreadIdentifier SAL_CALL getIdentifier() const
-{
- return osl_getThreadIdentifier(m_hThread);
-}
-
-static oslThreadIdentifier
buildbot failure in on openoffice-linux64-41x
The Buildbot has detected a new failure on builder openoffice-linux64-41x while building . Full details are available at: https://ci.apache.org/builders/openoffice-linux64-41x/builds/334 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: bb_slave8_ubuntu Build Reason: The Nightly scheduler named 'openoffice-linux64-41x' triggered this build Build Source Stamp: [branch AOO42X] HEAD Blamelist: BUILD FAILED: failed bootstrap Sincerely, -The Buildbot
[openoffice] branch AOO42X updated: Remove unused token
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
The following commit(s) were added to refs/heads/AOO42X by this push:
new 17ad1ce Remove unused token
17ad1ce is described below
commit 17ad1cecf1bc87ab3e3e5ce28d96a98a25e7ba5d
Author: mseidel
AuthorDate: Sun Aug 22 14:11:55 2021 +0200
Remove unused token
(cherry picked from commit 98f76e59f55bea0683f36dc8f901fe6ade742684)
---
main/l10ntools/inc/tokens.h | 1 -
main/l10ntools/source/export.cxx | 10 --
2 files changed, 11 deletions(-)
diff --git a/main/l10ntools/inc/tokens.h b/main/l10ntools/inc/tokens.h
index 7f72fb5..89dcc3d 100644
--- a/main/l10ntools/inc/tokens.h
+++ b/main/l10ntools/inc/tokens.h
@@ -57,7 +57,6 @@
#define LISTTEXT 514 /* < "Text" ...
> */
#define RSCDEFINE 515 /* #define
MY_TEXT */
#define RSCDEFINELEND 516 /*
*/
-#define NEWTEXTINRES 517 /* ### Achtung : Ne...
*/
#define UIENTRIES 518 /* UIEntries =
{*/
#define PRAGMA 519 /* #pragma ...
*/
#define _LISTTEXT 521 /* { "Text" ...
} */
diff --git a/main/l10ntools/source/export.cxx b/main/l10ntools/source/export.cxx
index 53bd654..4fa31bb 100644
--- a/main/l10ntools/source/export.cxx
+++ b/main/l10ntools/source/export.cxx
@@ -1080,16 +1080,6 @@ int Export::Execute( int nToken, const char * pToken )
}
}
break;
- case NEWTEXTINRES: {
- bDontWriteOutput = sal_True;
- // this means something like // ### Achtung : Neuer
Text ...
- /*ByteString sLang( "GERMAN" );
- ByteString sText = sToken.GetToken( 2, ':' ).GetToken(
0, '*' );
- CleanValue( sText );
- if ( sText.Len())
- pResData->sText[ sLang ] = sText;*/
- }
- break;
case APPFONTMAPPING: {
bDontWriteOutput = sal_False;
// this is a AppfontMapping, so look if it's a
definition
[openoffice] branch trunk updated: Remove unused token
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 98f76e5 Remove unused token
98f76e5 is described below
commit 98f76e59f55bea0683f36dc8f901fe6ade742684
Author: mseidel
AuthorDate: Sun Aug 22 14:11:55 2021 +0200
Remove unused token
---
main/l10ntools/inc/tokens.h | 1 -
main/l10ntools/source/export.cxx | 10 --
2 files changed, 11 deletions(-)
diff --git a/main/l10ntools/inc/tokens.h b/main/l10ntools/inc/tokens.h
index 7f72fb5..89dcc3d 100644
--- a/main/l10ntools/inc/tokens.h
+++ b/main/l10ntools/inc/tokens.h
@@ -57,7 +57,6 @@
#define LISTTEXT 514 /* < "Text" ...
> */
#define RSCDEFINE 515 /* #define
MY_TEXT */
#define RSCDEFINELEND 516 /*
*/
-#define NEWTEXTINRES 517 /* ### Achtung : Ne...
*/
#define UIENTRIES 518 /* UIEntries =
{*/
#define PRAGMA 519 /* #pragma ...
*/
#define _LISTTEXT 521 /* { "Text" ...
} */
diff --git a/main/l10ntools/source/export.cxx b/main/l10ntools/source/export.cxx
index 53bd654..4fa31bb 100644
--- a/main/l10ntools/source/export.cxx
+++ b/main/l10ntools/source/export.cxx
@@ -1080,16 +1080,6 @@ int Export::Execute( int nToken, const char * pToken )
}
}
break;
- case NEWTEXTINRES: {
- bDontWriteOutput = sal_True;
- // this means something like // ### Achtung : Neuer
Text ...
- /*ByteString sLang( "GERMAN" );
- ByteString sText = sToken.GetToken( 2, ':' ).GetToken(
0, '*' );
- CleanValue( sText );
- if ( sText.Len())
- pResData->sText[ sLang ] = sText;*/
- }
- break;
case APPFONTMAPPING: {
bDontWriteOutput = sal_False;
// this is a AppfontMapping, so look if it's a
definition
[openoffice] branch AOO42X updated: Fixed typo (extren -> extern), 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
The following commit(s) were added to refs/heads/AOO42X by this push:
new 254802d Fixed typo (extren -> extern), removed whitespace
254802d is described below
commit 254802d4d9726271fe01a03b4cae6c89d228cc18
Author: mseidel
AuthorDate: Sun Aug 22 02:55:32 2021 +0200
Fixed typo (extren -> extern), removed whitespace
(cherry picked from commit 3fdeb968ff7c7073bba1719398e969123170831d)
---
main/l10ntools/source/cfglex.l | 6 +++---
main/l10ntools/source/srclex.l | 22 +++---
main/l10ntools/source/xrmlex.l | 6 +++---
3 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/main/l10ntools/source/cfglex.l b/main/l10ntools/source/cfglex.l
index b9002cc..4ee3994 100644
--- a/main/l10ntools/source/cfglex.l
+++ b/main/l10ntools/source/cfglex.l
@@ -50,7 +50,7 @@
#pragma warning(push, 1)
#endif
-/* external functions (C++ code, declared as extren "C" */
+/* external functions (C++ code, declared as extern "C" */
extern int WorkOnTokenSet( int, char* );
extern int InitCfgExport( char * , char *);
extern int EndCfgExport();
@@ -158,7 +158,7 @@ void YYWarning( char *s )
{
/* write warning to stderr */
fprintf( stderr,
- "Warning: \"%s\" in line %d: \"%s\"\n", s, yylineno, yytext );
+ "Warning: \"%s\" in line %d: \"%s\"\n", s, yylineno, yytext );
}
/*/
@@ -171,7 +171,7 @@ void yyerror ( char *s )
{
/* write error to stderr */
fprintf( stderr,
- "Error: \"%s\" in line %d: \"%s\"\n", s, yylineno, yytext );
+ "Error: \"%s\" in line %d: \"%s\"\n", s, yylineno, yytext );
SetError();
}
diff --git a/main/l10ntools/source/srclex.l b/main/l10ntools/source/srclex.l
index 8f388ce..b1d0a45 100644
--- a/main/l10ntools/source/srclex.l
+++ b/main/l10ntools/source/srclex.l
@@ -51,7 +51,7 @@
#pragma warning(push, 1)
#endif
-/* external functions (C++ code, declared as extren "C" */
+/* external functions (C++ code, declared as extern "C" */
extern int WorkOnTokenSet( int, char* );
extern int InitExport( char * , char * );
extern int Parse( int nTyp, char *pTokenText );
@@ -138,12 +138,12 @@ void YYWarning();
}
[\t ]*[a-zA-Z0-9_]+[ \t]*("["[ \t]*[a-zA-Z0-9_\-]+[ \t]*"]"[ \t]*)?=[
\t]*L?\".*\".*\n?{
-/* TEXTLINE // TextTyp = "A Text" */
+/* TEXTLINE // TextType = "A Text" */
WorkOnTokenSet( TEXTLINE, yytext );
}
[\t ]*[a-zA-Z0-9_]+[ \t]*("["[ \t]*[a-zA-Z0-9_\-]+[ \t]*"]"[ \t]*)?(\n[
\t]*)?=([ \t]*\n)?(([a-zA-Z0-9_]+)|(\".*\")|([
\t\n]*))*\".*\"(([a-zA-Z0-9_]+)|(\".*\")|([ \t\n]*))*; {
-/* LONGTEXTLINE // TextTyp = "A Text" HHH_XXX "A Text" ZZZ_TTT ... */
+/* LONGTEXTLINE // TextType = "A Text" HHH_XXX "A Text" ZZZ_TTT ... */
WorkOnTokenSet( LONGTEXTLINE, yytext );
}
@@ -163,30 +163,30 @@ void YYWarning();
}
[a-zA-Z0-9_]+[ \t]*"="[ \t]*"MAP_APPFONT"[ \t]*"(".+")".* {
-/* APPFONTMAPPING Typ = MAP_APPFONT( ... ) */
+/* APPFONTMAPPING Type = MAP_APPFONT( ... ) */
WorkOnTokenSet( APPFONTMAPPING, yytext );
}
[ \t]*[a-zA-Z0-9_]+[ \t]*=[ \t]*[0123456789]{1,5}[ \t]*";"?\\? {
-/* TEXTREFID // TextTyp = 12345 */
+/* TEXTREFID // TextType = 12345 */
WorkOnTokenSet( TEXTREFID, yytext );
}
[a-zA-Z0-9_]+[ \t]*"="[\t ]*([ \t]*"//".*\n)*.*|
[a-zA-Z0-9_]+[ \t]*"=".* {
-/* ASSIGNMENT Typ = ... */
+/* ASSIGNMENT Type = ... */
WorkOnTokenSet( ASSIGNMENT, yytext );
}
[a-zA-Z0-9_]+[ \t]*("["[ \t]*[a-zA-Z0-9_\-]+[ \t]*"]"[ \t]*)?"="[ \t]*(\\[
\t]*)?\n?[ \t]*"{"[ \t]*(\\[ \t]*)?\n?[ \t]*"<" {
-/* LISTASSIGNMENT Typ [ ... ] = ... */
+/* LISTASSIGNMENT Type [ ... ] = ... */
WorkOnTokenSet( LISTASSIGNMENT, yytext );
}
"StringList"+[ \t]*("["[ \t]*[a-zA-Z0-9_\-]+[ \t]*"]"[ \t]*)?"="[ \t]*(\\[
\t]*)?\n?[ \t]*"{"[ \t]*(\\[ \t]*)?\n?[ \t]*{
-/* LISTASSIGNMENT Typ [ ... ] = ... */
+/* LISTASSIGNMENT Type [ ... ] = ... */
WorkOnTokenSet( LISTASSIGNMENT, yytext );
}
@@ -201,7 +201,7 @@ void YYWarning();
}
[ \t]*"#define"[ \t]+[a-zA-Z0-9_]+.*"\\" {
-/* RSCDEFINE #define ... */
+/* RSCDEFINE #define ... */
WorkOnTokenSet( RSCDEFINE, yytext );
}
@@ -253,7 +253,7 @@ void YYWarning( char *s )
/*/
{
/* write warning to stderr */
- fprintf( stderr, "Warning: \"%s\" in line %d: \"%s\"\n", s, yylineno,
yytext );
+ fprintf( stderr, "Warning: \"%s\" in line %d: \"%s\"\n", s, yylineno,
yytext );
}
/*/
@@ -261,7 +261,7 @@ void yyerror( char *s )
/*/
{
