Just use version number 4.3.3.0 here, no extra suffix
Use $(LIBO_SHARE_FOLDER) instead of hardcoded "share"

Change-Id: Ic97e51efaa280c64764b1c5f38c3b87af82a422b
(cherry picked from commit 3369185bddc4ece889381511055917e58a42a837)
Use @LIBO_URE_SHARE_JAVA_FOLDER@ instead of hardcoding ../share/java

Makes CppunitTest_dbaccess_hsqldb_test work also in the
--enable-canonical-installation-tree-structure (on OS X), otherwise
the use of $URE_INTERNAL_JAVA_CLASSPATH (looked up from the URE unorc)
in stoc/source/javavm/javavm.cxx fails.

Change-Id: I5ea045594c32e6a1398b73cff1e4aa8bbe1aa265
(cherry picked from commit d83f28a2505923a4f01237f7587bf8ede57d0bed)
Use @LIBO_URE_LIB_FOLDER@ for URE_INTERNAL_LIB_DIR

In the --enable-canonical-installation-tree-structure case (on OS X),
the URE unorc is definitely not in the same place as any libs. Noticed
in JunitTest_comphelper_complex.

Change-Id: Ic6097021f9abc081e2a7c7aac25286ad2c4b75e5
(cherry picked from commit e24d3ff2cd9e2da4c81105d2e9dbee6187fac55f)
Make this work better in the ENABLE_MACOSX_MACLIKE_APP_STRUCTURE case

In that case the dylibs won't be in the parent directory of where the
jars are (Resources), but in Frameworks.

Change-Id: I628d828ca820d07724947050f54f9f5f9148e159
(cherry picked from commit 6ac523554213f11838443de0cd9b62415f5d2ffd)
Fixes for the --enable-canonical-installation-tree-structure case

Do install the uno and startup.sh commands, smoketest needs them

Change-Id: Ia530564e4b664881d730355a80e2af4476987e10
(cherry picked from commit b6869717a389d65bd50e8096d033a689d9298e84)
Use LIBO_URE_BIN_FOLDER and LIBO_SHARE_JAVA_FOLDER

Needed in case of --enable-canonical-installation-tree-structure.

Change-Id: I965ebd9b89e1b9f7bb6534e3c25d29d3b470acf4
(cherry picked from commit 5e5aa9b08a39530b0b117141f0f65d1dc2dad84e)
javaldx is not built for WNT or MACOSX so no point in the uno wrapper script

Change-Id: I127205ebf6fb3fe01de6803a989e970f46df22bb
(cherry picked from commit 59622dabdec080c2a720a17987dceba2c03afe90)
Ugly hack to fix build when srcdir!=builddir

The problem is that the ure/source/unorc file is now expanded by the configure
script, and thus exists only in builddir. But a further complication is that
the uno.ini file is in srcdir. This is one way to handle it. Seems to work for
me, let's see what the srcdir!=builddir tinderbox slaves say.

Change-Id: I6fb456cf849ce5077e2c5bd25dc9149096aab241
(cherry picked from commit 8e9487cf97d944b202d4406561b88068aaf8e386)
"fixes" needed because ure/source/unorc is now expanded at configure time

Argh, this is getting even uglier.

We cheerfully ignore for now the theoretical possibility that the URE
unorc used by build-time tools (i.e. the configure-expanded
ure/source/unorc) could be different for HOST and BUILD (in case they
use different --enable-canonical-installation-tree-structure), and use
the HOST one for the BUILD tools.

The right thing would probably be to construct the URE unorc in the
relevant Makefile, like we do for fundamentalrc? Or then to just
re-design the whole mess of rc files into some simpler (good luck).

Change-Id: I654309503d0e696778910acadcbf2f6b90ffa02a
(cherry picked from commit ad85ce18d3939170e5ef7b1a1f8e5dda2c8aeb9c)
Add ure/source/unorc

Change-Id: I9439a00d2186696a4891e5eefad066d50917f9c7
(cherry picked from commit 835d3e818f4d27ecf34aca268e5300ac58cc92c5)
Don't do the annoying restart thing when sandboxed on OS X, ignore risks...

So far we have just displayed a hugely annoying dialog "sorry, but we
suck, you need to start LibreOffice again". But that sucks. So just
try to do without restart then, and let's see what happens. At least
in trivial testing, no crash.

Change-Id: I475fe49a0fdb8086bb33a165a08b32ac46548857
(cherry picked from commit 59ddf7216d52dd5492ffe1362174518dc2f5e0ce)
Don't do the security scope bookmark dance if not in a sandboxed process

No point in doing it in build-time tools like cppumaker which don't
run as sandboxed processes. Just slows them down a lot, while cfprefsd
consumes lots of CPU doing user preference lookups in vain for every
file accessed through the uunxapi functions.

Change-Id: I83e55a8e8d0c4f2c60c60ecad2c831e42c9e5bfd
(cherry picked from commit 8e279c79f88608a4ab4dfc74c0a66a7947ea1482)
Fixes for the ENABLE_MACOSX_MACLIKE_APP_STRUCTURE case

Change-Id: Ic3d27298264df9aa4e3e976fbca477106dbe180a
(cherry picked from commit 88be7b54c5be57c7ecabe200731262e24c0ca0a4)
The --resource-rules option in being deprecated

The documentation is a bit unclear yet, but I think it is safe to
assume that Apple strongly wants sandboxed apps to have what we call
ENABLE_MACOSX_MACLIKE_APP_STRUCTURE and to be signed without any
special resource rules.

Change-Id: I1409ccb6a3f9086d01af6ff318fe28536c1cebef
(cherry picked from commit 41f2ebfbaa9fb06f56530b4a330fc029df87ecfd)
When ENABLE_MACOSX_MACLIKE_APP_STRUCTURE put only binaries in the MacOS dir

The new code signing is more strict and enforces bundle structure
harder, it seems.

When ENABLE_MACOSX_MACLIKE_APP_STRUCTURE bypass the unoinfo and python
shell scripts. If they actually are needed, will have to put them
somewhere under Resources.

Change-Id: I14a34936b78195746d2b88d25603952ce5309380
(cherry picked from commit 26cfc797fa0b1809cd0c01d5546ba97856bc8143)
Typo

Change-Id: I9ba1a5679eb636103ccf7b34f120ed0d03903e76
(cherry picked from commit 5794fcad10df4d6ac8388627662ea830dde7e629)
What is a ridiculous size in 32-bit code is also ridiculous in 64-bit code

Avoids the CppunitTest_vcl_filters_test allocating an insane amount of
memory when run as 64-bit on OS X.

Change-Id: I978347849c2cf5fd1663e5a85a788b736e239e94
(cherry picked from commit 633e5e16cd233cbb28b24527bb27bf5463ea7276)
Handle LIBO_SHARE_HELP_FOLDER

Change-Id: I4f004321c58da1d81a2cc3c80504347db583d86a
(cherry picked from commit fa2801f2c349811e00c3f2f19f9ce62a68daa4dc)
Use $(LIBO_SHARE_FOLDER) instead of hardcoded 'share'

Change-Id: I073d44c0e3e8c6eff0e885f827fa661e3c8e5206
(cherry picked from commit af90ec3e7751f2f4f27428f580bbc487fd7ce7db)