Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions main/LICENSE_category_b
Original file line number Diff line number Diff line change
Expand Up @@ -635,7 +635,7 @@ Mozilla Public License Version 2.0
means any form of the work other than Source Code Form.

1.7. "Larger Work"
means a work that combines Covered Software with other material, in
means a work that combines Covered Software with other material, in
a separate file or files, that is not Covered Software.

1.8. "License"
Expand Down Expand Up @@ -1019,7 +1019,7 @@ nished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

Portions of the Software were created using source code and/or APIs
Portions of the Software were created using source code and/or APIs
governed by the Mozilla Public License (MPL). The MPL is available
at http://www.mozilla.org/MPL/MPL-1.1.html. The MPL permits such
portions to be distributed with code not governed by MPL, as long
Expand Down Expand Up @@ -1053,7 +1053,7 @@ Version 1.0
Modifications used by a Contributor, and the Modifications made by that
particular Contributor.

1.3. ``Covered Code'' means the Original Code or Modifications or the
1.3. ``Covered Code'' means the Original Code or Modifications or the
combination of the Original Code and Modifications, in each case including
portions thereof.

Expand All @@ -1077,14 +1077,14 @@ Version 1.0
A. Any addition to or deletion from the contents of a file containing Original
Code or previous Modifications.

B. Any new file that contains any part of the Original Code or previous Modifications.
B. Any new file that contains any part of the Original Code or previous Modifications.

1.10. ``Original Code'' means Source Code of computer software code which is
described in the Source Code notice required by Exhibit A as Original Code,
and which, at the time of its release under this License is not already Covered
Code governed by this License.

1.11. ``Source Code'' means the preferred form of the Covered Code for making
1.11. ``Source Code'' means the preferred form of the Covered Code for making
modifications to it, including all modules it contains, plus any associated
interface definition files, scripts used to control compilation and
installation of an Executable, or a list of source code differential
Expand All @@ -1101,7 +1101,7 @@ Version 1.0
(a) the power, direct or indirect, to cause the direction or management
of such entity, whether by contract or otherwise, or (b) ownership of
fifty percent (50%) or more of the outstanding shares or beneficial
ownership of such entity.
ownership of such entity.

2. Source Code License.

Expand All @@ -1118,7 +1118,7 @@ Version 1.0
(or portions thereof), but solely to the extent that any such patent
is reasonably necessary to enable You to Utilize the Original Code
(or portions thereof) and not to any greater extent that may be necessary
to Utilize further Modifications or combinations.
to Utilize further Modifications or combinations.

2.2. Contributor Grant.
Each Contributor hereby grants You a world-wide, royalty-free, non-exclusive
Expand All @@ -1134,7 +1134,7 @@ Version 1.0
to the extent that any such patent is reasonably necessary to enable
You to Utilize the Contributor Version (or portions thereof), and
not to any greater extent that may be necessary to Utilize further
Modifications or combinations.
Modifications or combinations.

3. Distribution Obligations.

Expand Down Expand Up @@ -1189,7 +1189,7 @@ Version 1.0
(b) Contributor APIs.
If Your Modification is an application programming interface and You
own or control patents which are reasonably necessary to implement that
API, you must also include this information in the LEGAL file.
API, you must also include this information in the LEGAL file.

3.5. Required Notices.
You must duplicate the notice in Exhibit A in each file of the Source Code,
Expand Down Expand Up @@ -1233,7 +1233,7 @@ Version 1.0
You may create a Larger Work by combining Covered Code with other code not
governed by the terms of this License and distribute the Larger Work as a
single product. In such a case, You must make sure the requirements of this
License are fulfilled for the Covered Code.
License are fulfilled for the Covered Code.

4. Inability to Comply Due to Statute or Regulation.

Expand All @@ -1244,12 +1244,12 @@ Version 1.0
description must be included in the LEGAL file described in Section 3.4 and
must be included with all distributions of the Source Code. Except to the
extent prohibited by statute or regulation, such description must be sufficiently
detailed for a recipient of ordinary skill to be able to understand it.
detailed for a recipient of ordinary skill to be able to understand it.

5. Application of this License.

This License applies to code to which the Initial Developer has attached the
notice in Exhibit A, and to related Covered Code.
notice in Exhibit A, and to related Covered Code.

6. Versions of the License.

Expand All @@ -1274,11 +1274,11 @@ Version 1.0
that your version of the license contains terms which differ from the Mozilla
Public License and Netscape Public License. (Filling in the name of the Initial
Developer, Original Code or Contributor in the notice described in Exhibit A
shall not of themselves be deemed to be modifications of this License.)
shall not of themselves be deemed to be modifications of this License.)

7. DISCLAIMER OF WARRANTY.

COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN ``AS IS'' BASIS, WITHOUT
COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN ``AS IS'' BASIS, WITHOUT
WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION,
WARRANTIES THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A
PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND
Expand Down
14 changes: 7 additions & 7 deletions main/bootstrap.1
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
# *************************************************************
#
#
# 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.
#
#
# *************************************************************

if test -z "${SOLARENV}"; then
Expand All @@ -37,7 +37,7 @@ unalias nmake
unalias gunzip

# executables are *.exe for WNT. This variable is necessary since Cygwin 1.5.x
# Use spawn instead of fork when building dmake on cygwin.
# Use spawn instead of fork when building dmake on cygwin.
if test "$GUI" = "WNT"; then
EXEEXT=".exe"
else
Expand All @@ -47,7 +47,7 @@ export EXEEXT

mkdir -p "$SOLARENV/$INPATH/bin"

#make sure build.pl is executable
#make sure build.pl is executable

chmod +x "$SRC_ROOT/solenv/bin/build.pl"
chmod +x "$SRC_ROOT/solenv/bin/build_client.pl"
Expand Down Expand Up @@ -175,7 +175,7 @@ else
echo ""
echo "dmake present in $SOLARENV/$INPATH/bin/dmake$EXEEXT"
fi

fi

# Download missing extensions.
Expand Down
12 changes: 6 additions & 6 deletions main/nss/readme.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Relation between nss, moz, moz_prebuilt
---------------------------------------
nss contains the security libraries which are also part of moz. However nss is
meant to be more current, that is, it to be updated more often. This
meant to be more current, that is, it to be updated more often. This
should be easier than updating moz.

When nss is build, it depends on an environment variable (ENABLE_NSS_MODULE)
Expand All @@ -26,7 +26,7 @@ Fips 140 mode is not supported. That is, the *.chk files containing the
checksums for the cryptographic module are not delivered into solver and will
not be part of the OOo installation sets.

Signing has been turned off because
Signing has been turned off because
- we change the rpath (install names) after signing which breaks the signatures
(Mac)
- sqlite conflicts with the system sqlite when signing which breaks the build
Expand All @@ -36,7 +36,7 @@ libfreebl3
----------
Porting to other platforms may require to deliver other variants of
libfreebl*. The library name varies according to the platform. Changes need to
be made to
be made to
ooo/moz/extractfiles.mk
ooo/moz/zipped/makefile.mk
sun/moz_prebuilt/zipped/makefile.mk
Expand All @@ -60,8 +60,8 @@ libsqlite3
The problem described here was found on Mac with OS 10.6
NSS cannot use the system sqlite on Mac because the base line is still MacOS
10.4. That system sqlite is incompatible with the softokn3 in nss which requires
a later version of sqlite.
When we used a more current Mac SDK then we could set
a later version of sqlite.
When we used a more current Mac SDK then we could set
NSS_USE_SYSTEM_SQLITE=1
to build using the system sqlite.

Expand All @@ -70,5 +70,5 @@ used by tools of the build environment. Using the sqlite from NSS breaks the
tools if they use system libraries which are linked with the system
sqlite. Therefore we deliver it into lib/sqlite on unix systems.

See also issue
See also issue
http://qa.openoffice.org/issues/show_bug.cgi?id=106132
24 changes: 12 additions & 12 deletions main/oowintool
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
#!/usr/bin/perl -w
# *************************************************************
#
#
# 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 File::Copy;
Expand Down Expand Up @@ -62,7 +62,7 @@ sub reg_find_key($)
sub print_syntax()
{
print "oowintool [option] ...\n";
print " encoding options\n";
print " encoding options\n";
print " -w - windows form\n";
print " -u - unix form (default)\n";
print " commands:\n";
Expand Down Expand Up @@ -90,7 +90,7 @@ sub cygpath($$$)
$path =~ s|\\*\s*$||;
}

# 'Unterminated quoted string errors' from 'ash' when
# 'Unterminated quoted string errors' from 'ash' when
# forking cygpath so - reimplement cygpath in perl [ gack ]
if ($format eq 'u' && $input_format eq 'w') {
$path =~ s|\\|/|g;
Expand All @@ -109,7 +109,7 @@ sub print_path($$)
my ($path, $unix) = @_;

$path = cygpath ($path, $unix, $output_format);

print $path;
}

Expand Down Expand Up @@ -275,7 +275,7 @@ sub print_csc_compiler_dir()

sub print_dotnetsdk_dir()
{
my $dir =
my $dir =
reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/.NETFramework/sdkInstallRootv1.1") ||
reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/.NETFramework/sdkInstallRootv2.0");
defined $dir || exit 1;
Expand Down Expand Up @@ -332,11 +332,11 @@ sub msvc_find_version($)
{
my $checkpath = shift;
my $ver = find_msvc();
my $srcdir = (cygpath ($ver->{'product_dir'}, 'w', 'u') . '/' .
my $srcdir = (cygpath ($ver->{'product_dir'}, 'w', 'u') . '/' .
$ver->{$checkpath});
-d $srcdir && return $ver;
$ver = find_msvs();
$srcdir = (cygpath ($ver->{'product_dir'}, 'w', 'u') . '/' .
$srcdir = (cygpath ($ver->{'product_dir'}, 'w', 'u') . '/' .
$ver->{$checkpath});
-d $srcdir && return $ver;
return undef;
Expand All @@ -347,7 +347,7 @@ sub msvc_copy_dlls($)
my $dest = shift;
my $ver = msvc_find_version('dll_path');
defined $ver || return;
my $srcdir = (cygpath ($ver->{'product_dir'}, 'w', 'u') . '/' .
my $srcdir = (cygpath ($ver->{'product_dir'}, 'w', 'u') . '/' .
$ver->{'dll_path'});

copy_dll ($srcdir, "msvcp" . $ver->{'dll_suffix'} . ".dll",
Expand All @@ -370,7 +370,7 @@ my @commands = ();
my $opt;
while (@ARGV) {
$opt = shift @ARGV;

if ($opt eq '-w' || $opt eq '-u') {
$output_format = substr($opt, 1, 1);
} else {
Expand Down
2 changes: 1 addition & 1 deletion test/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

Apache OpenOffice contains automated test suites that can be ran against the office. The test framework is written in **Java** and based on **JUnit 4**.

This **trunk** branch is now the primary test suite for the **AOO41X** and **AOO42X** branches as well and those branches may not contain the latest tests or modifications.
This **trunk** branch is now the primary test suite for the **AOO41X** and **AOO42X** branches as well and those branches may not contain the latest tests or modifications.

The test suite in main branches **AOO41X** and **AOO42X** can be ran against a normal installation of the office or a just built "installed" office.

Expand Down
8 changes: 4 additions & 4 deletions test/run
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
#! /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.
#
#
#**************************************************************

. /etc/profile
Expand Down
8 changes: 4 additions & 4 deletions test/testcommon/readme.txt
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
#**************************************************************
#
#
# 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.
#
#
#**************************************************************

1. Java utilities to facilitate testing OpenOffice. e.g. file operation, graphics analysis and so on.
Expand Down
Loading