Pattern match and back to s5abi for now...


git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1827253 13f79535-47bb-0310-9956-ffa450edef68

Use gcc3 for COMID for macOS/OSX


git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1827215 13f79535-47bb-0310-9956-ffa450edef68

The Win64 patch has been merged now, no need to keep
a copy in main/solenv/win64.

Patch by: me



git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1826581 13

The Win64 patch has been merged now, no need to keep
a copy in main/solenv/win64.

Patch by: me



git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1826581 13f79535-47bb-0310-9956-ffa450edef68

show more ...

Implement initial unfinished support for building 64 bit AOO on 64 bit Windows.

For now, require --enable-win64 to be passed to ./configure and without it build 32 bit
binaries like befo

Implement initial unfinished support for building 64 bit AOO on 64 bit Windows.

For now, require --enable-win64 to be passed to ./configure and without it build 32 bit
binaries like before.

Detect the MSVC compiler only through oowintool (ie. registry keys) and the command line option,
not by searching the path, as we need to know the exact path to determine whether the compiler
outputs 32 or 64 bit binaries.

Pass --aoo32-on-win64 to oowintool when doing the AOO32 on Win64 build, so oowintool
known to look at the 32 bit registry for Java, as we need a JDK of matching bitness.
We may need this option for other oowintool tasks.

Introduce the "mscx" COMNAME for 64 bit AOO.

Add the remaining gbuild and dmake changes necessary to use the 64 bit MSVC compiler.

Patch by: me



git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1826580 13f79535-47bb-0310-9956-ffa450edef68

show more ...

#127664# $CCNUMVER from dmake to configure

Move the calculation of $CCNUMVER and some other variables from
main/solenv/inc/tg_compv.mk, where it is only usable by dmake, to
configure

#127664# $CCNUMVER from dmake to configure

Move the calculation of $CCNUMVER and some other variables from
main/solenv/inc/tg_compv.mk, where it is only usable by dmake, to
configure, where it can be used by both dmake and gbuild. This is
a requirement to upstream some compiler bug workaround patches from
the FreeBSD port.

A bit of logic from set_soenv is also moved into configure. A bunch
more should probably be moved so that the configuration logic is
not spread across so many different places, but that can wait.
Something else to consider is that it would be nice to use a different
value of $COM for Apple's clang, maybe "ACLANG" or "APPLECLANG"
since it has a different version numbering scheme that the open-source
version of clang and having a unique identifier would simplify
version checking when applying compiler bug workarounds.

Note: I think the old value of $CCNUMVER on the Mac is wrong. It
should look something like 000800010000 or 000700030000, depending
on the installed version.

Change -DCPPU_ENV on the Mac from $(COMID) to $(COMNAME) for
consistency with the dmake side. It shouldn't make a difference
in practice since both have the same value on the Mac.



git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1826296 13f79535-47bb-0310-9956-ffa450edef68

show more ...

Add a missing .ENDIF

Patch by: me



git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1826059 13f79535-47bb-0310-9956-ffa450edef68

Further updates to the Win64 patch, to use the correct CPPU_ENV
and COMNAME for Win64.

Patch by: me



git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@18260

Further updates to the Win64 patch, to use the correct CPPU_ENV
and COMNAME for Win64.

Patch by: me



git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1826058 13f79535-47bb-0310-9956-ffa450edef68

show more ...

Use the -bigobj flag to MSVC on AMD64, as some of our C++ files
are too big for the traditional COFF file format.

Patch by: me



git-svn-id: https://svn.apache.org/repos

Use the -bigobj flag to MSVC on AMD64, as some of our C++ files
are too big for the traditional COFF file format.

Patch by: me



git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1826057 13f79535-47bb-0310-9956-ffa450edef68

show more ...

Revert 1825956 and put it into the win64.patch file instead,
as it may break building 32 bit AOO on 64 bit Windows.

Patch by: me


git-svn-id: https://svn.apache.org/repos/as

Revert 1825956 and put it into the win64.patch file instead,
as it may break building 32 bit AOO on 64 bit Windows.

Patch by: me


git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1826001 13f79535-47bb-0310-9956-ffa450edef68

show more ...

Add the preliminary patch for the Win64 build
into main/solenv/win64. Don't apply it to the
tree yet, as it will break building 32 bit
AOO on 64 bit Windows.

Patch by: me

Add the preliminary patch for the Win64 build
into main/solenv/win64. Don't apply it to the
tree yet, as it will break building 32 bit
AOO on 64 bit Windows.

Patch by: me



git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1825936 13f79535-47bb-0310-9956-ffa450edef68

show more ...

Add a preliminary version of the main Win64 dmake file,
but don't use it yet.

Patch by: me



git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1825935 13f795

Add a preliminary version of the main Win64 dmake file,
but don't use it yet.

Patch by: me



git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1825935 13f79535-47bb-0310-9956-ffa450edef68

show more ...

Fix a Windows build-breaking bug introduced in
my last commit, caused by the wrong conversion
direction between POSIX and Windows paths
in 1 dmake function.

Patch by: me

Fix a Windows build-breaking bug introduced in
my last commit, caused by the wrong conversion
direction between POSIX and Windows paths
in 1 dmake function.

Patch by: me



git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1825802 13f79535-47bb-0310-9956-ffa450edef68

show more ...

dmake's config.guess is too old to detect Cygwin64, so
overwrite it with our own one during ./bootstrap.

dmake uses Cygwin API functions that were deprecated
on Cygwin32 and are obso

dmake's config.guess is too old to detect Cygwin64, so
overwrite it with our own one during ./bootstrap.

dmake uses Cygwin API functions that were deprecated
on Cygwin32 and are obsolete on Cygwin64, so patch
it to use the replacement APIs during ./bootstrap
as well.

Patch by: me



git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1825798 13f79535-47bb-0310-9956-ffa450edef68

show more ...

Fixed double wording in comment

git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1825220 13f79535-47bb-0310-9956-ffa450edef68

If LibreOffice is installed, it's incompatible "unopkg" tool will be in $PATH,
causing the build to break in main/instsetoo_native as that tool lacks our
"sync" option. Refer to our own unopk

If LibreOffice is installed, it's incompatible "unopkg" tool will be in $PATH,
causing the build to break in main/instsetoo_native as that tool lacks our
"sync" option. Refer to our own unopkg using its absolute path to avoid this
problem.

Patch by: me



git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1824571 13f79535-47bb-0310-9956-ffa450edef68

show more ...

Revert the part of r1818099 that changed the hardwired awk command
in main/solenv/gbuild/Output.mk with $(gb_AWK). Unfortunately
$(gb_AWK) is not defined at this point, so this change caused

Revert the part of r1818099 that changed the hardwired awk command
in main/solenv/gbuild/Output.mk with $(gb_AWK). Unfortunately
$(gb_AWK) is not defined at this point, so this change caused
errors each time a gbuild makefile was invoked. The definition
of $(gb_AWK) is in the platform gbuild files, which are included
after Output.mk. Changing the order of the includes breaks the
Windows build due to other chicken vs. egg problems. Fortunately
using hardwired awk works everywhere except Solaris, which we no
longer support.



git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1820587 13f79535-47bb-0310-9956-ffa450edef68

show more ...

Nothing uses GXX_INCLUDE_PATH, so remove it. The uretest/README
file mentions is being needed by the STLport included in the URE,
but that does not appear to be true any longer, and it is no

Nothing uses GXX_INCLUDE_PATH, so remove it. The uretest/README
file mentions is being needed by the STLport included in the URE,
but that does not appear to be true any longer, and it is not
used by boost.



git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1820351 13f79535-47bb-0310-9956-ffa450edef68

show more ...

#i126518# OS/2 link with system libcx0 to use new exception and memory mapping handling.

git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1819430 13f79535-47bb-0310-9956-ffa450e

#i126518# OS/2 link with system libcx0 to use new exception and memory mapping handling.

git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1819430 13f79535-47bb-0310-9956-ffa450edef68

show more ...

Enhance gb_LinkTarget_set_*_optimization functions to allow multiple
targets to be specified.

Convert optimization overrides in the gbuild library makefiles to
use gb_LinkTarget_set_

Enhance gb_LinkTarget_set_*_optimization functions to allow multiple
targets to be specified.

Convert optimization overrides in the gbuild library makefiles to
use gb_LinkTarget_set_*_optimization.

There should be no functional change.


git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1818290 13f79535-47bb-0310-9956-ffa450edef68

show more ...

#i126518# OS/2 build system updates: use full names for slideshow and sysdtrans, remove unneeded libraries, use standard toolkit path, fix DLL short names, disable libs for coin-or.

git-svn-

#i126518# OS/2 build system updates: use full names for slideshow and sysdtrans, remove unneeded libraries, use standard toolkit path, fix DLL short names, disable libs for coin-or.

git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1818128 13f79535-47bb-0310-9956-ffa450edef68

show more ...

#i126518# OS/2 environment vars are uppercase, breaks gnu make rules. Ignore escape sequence.

git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1818099 13f79535-47bb-0310-9956-ff

#i126518# OS/2 environment vars are uppercase, breaks gnu make rules. Ignore escape sequence.

git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1818099 13f79535-47bb-0310-9956-ffa450edef68

show more ...

Improvements to per-object optimization overrides in gbuild:

* Less Library.mk editing required to add an optimization exception
than what has been normally done to date.

*

Improvements to per-object optimization overrides in gbuild:

* Less Library.mk editing required to add an optimization exception
than what has been normally done to date.

* Add a variable to specify an override to -O1 instead of only
allowing -O0.

* Don't lose debug flags when overriding optimization.


Convert the recent Mac optimization override in framework/Library_fwk.mk
to the new style.


Improvements to Windows debug builds in gbuild:

* There are multiple dependency paths that trigger compiling a source
file. Add a target specific $(PDBFILE) to the root of each so
that $(PDBFILE) is set properly when compiling.

Note: $(PDBFILE) is not getting set when compiling the sources
for the per-module (Google Test) tests.

* Don't inadvertantly disable the use of pre-compiled headers when
enabling debug (not specific to Windows).

Note: If both debug and pre-compiled headers are enabled, building
of modules that contain more than one library will fail due to
limitations of Visual Studio. The problem is that when we
build the precompiled header, the output file(s) are based on the
module name. Even though each Library_*.mk specifies the rule
to build the precompiled header, it is only built once for the
module. Visual Studio requires that the $(PDBFILE) used when
compiling the sources match the $(PDBFILE) used when compiling
the precompiled header, but the value of $(PDBFILE) is specific
to each library. The best fix would be to compile the headers
once for each library and stash the output in a per-library
specific place, but this requires some fairly extensive changes.
Another potential fix would be to use -Z7 optimization so that the
debug information is stored in the object files.



git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1817946 13f79535-47bb-0310-9956-ffa450edef68

show more ...

OK, let's try to maintain 10.7 as the min OSX version supported.


git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1816626 13f79535-47bb-0310-9956-ffa450edef68

Add the ability to set a linker script in gbuild that is used to
version symbols.

This has been a bottleneck in continued gbuild porting and should
help further development considera

Add the ability to set a linker script in gbuild that is used to
version symbols.

This has been a bottleneck in continued gbuild porting and should
help further development considerably.

Patch by: me



git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1816518 13f79535-47bb-0310-9956-ffa450edef68

show more ...

Use Hamcrest in dmake subsequent tests too.

Patch by: me



git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1814809 13f79535-47bb-0310-9956-ffa450edef68