summaryrefslogtreecommitdiff
path: root/odk/settings
AgeCommit message (Collapse)Author
2017-12-11odk: fix 32-bit Linux build on 64-bit OSMichael Stahl
In this situation gcc/g++ will default to x86_64, so pass the "-m32" flag to produce x86 binaries. Change-Id: Ie31cd4240e353db606621cb03107ce03a74cfbef
2017-11-08fix also odk/settings/settings.mk wrt Java 9 to find jawtRene Engelhard
since we can't use HAVE_JAVA= here since it's in a different environment and we don't know the Java version just do the -L. Doesn't do harm if Java has the "old" path Change-Id: I2f912c417597d3b14e570f362f2cfc2df5954108
2017-06-09odk settings.mk: add various missing JAVA_PROC_TYPE overrides for Linux archesRene Engelhard
... which were missing since ~ ever but now break the odk_build-examples test with /usr/bin/ld: cannot find -ljawt Change-Id: Ie504ce0c8e21c7d58f1b7e591505940a2f80a2ea
2017-02-01Also on macOS use JDK's .../Home/bin/javac etc.Stephan Bergmann
Only on macOS, the SDK used to expect javac etc. in a Commands sub-dir (which Apple's JDK 1.6.0 has but Oracle's JDK 1.8.x don't). However, at least both Apple's latest JDK 1.6.0 (as available via <https://support.apple.com/kb/DL1572> "Download Java for OS X 2015-001") and any recent Oracle JDK 1.8.x (like jdk1.8.0_121.jdk) have a Home sub-dir that contains a "standard" sub-tree with bin sub-dir etc., like on other platforms. So consistently make the SDK use that instead. This removes the JAVABIN Make variable from settings.mk. It is assumed to not be used by client code. Change-Id: Ie0ad647f489528444dfd399c2f00500b772d3288
2017-01-31Allow some OO_SDK_*_HOME to be emptyStephan Bergmann
...in which case the corresponding tool is located on the PATH Change-Id: I4242180fbbc829f11aa1a12cf1e6b9f0a21ab7c6
2016-09-20[API CHANGE] Remove HAVE_GCC_VISIBILITY_FEATURE, always trueStephan Bergmann
* GCC documents -fvisibility at least as far back as the GCC 4.0 online documentation at <https://gcc.gnu.org/onlinedocs/gcc-4.0.4/gcc/Code-Gen-Options.html>. * For external code, odk/settings/settings.mk unconditionally set HAVE_GCC_VISIBILITY_FEATURE for all platforms other than Windows. Make this a fatal configure error for now. The check should be removed completely after LO 5.3 branch-off. Change-Id: I1de415b6ed1591e0a7b6640ece861b6f0ef74112 Reviewed-on: https://gerrit.libreoffice.org/29073 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com>
2016-09-12tdf#91966: In SDK, set CPPU_ENV=mscx for 64-bit WindowsStephan Bergmann
Change-Id: Ib93b2db40f43f98d8369cb91ca35692cc92f023b
2016-08-23java extensions makefile - generifyZenaan Harkness
See http://listarchives.libreoffice.org/global/users/msg49357.html odk/settings/std.mk currently adds each .class file separately, therefore having to be updated manually any time one class or anonymous class is added, removed etc.; all the .class files in com/sun/star/lib/loader/ are needed in the jar anyway, so use a generic makefile rule. Change-Id: I3819ab94e2c056220993971de44408e46a4559ed Reviewed-on: https://gerrit.libreoffice.org/28317 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com> Reviewed-by: jan iversen <jani@documentfoundation.org>
2016-08-17Remove duplicate lineStephan Bergmann
...that was added with both c4c10c17adfb139a208deeb1a47a9fcad924b9c3 "INTEGRATION: CWS sb87: #i88687# let Loader call new unoinfo instead of old juh.jar UnoInfo.getJars" and 9d53b3321881bd54526f08a9219c539c1430f2b5 "INTEGRATION: CWS jsc21" Change-Id: I355cbd933e3cff76416d02af8d6717326e0f3cb7
2016-08-17Add missing Loader$1.classStephan Bergmann
...that was introduced with abbf4777f29374025d576ef8daa3f6dcba02ddf5 "cid#1326844: DP: Use doPrivileged" Change-Id: I8cd4d947b258313d4d171c5888490d1a860ebee7
2016-08-05(initial) sparc64 portJames Clarke
Change-Id: I8ec9bb5415a9e6b9083ba89a7790872d67625de1
2015-10-12Kill dead mac os x 32bit odk build configRiccardo Magliocchetti
Change-Id: I6e35709a399aa520c9ad198c39a5fb03f3500c9c Reviewed-on: https://gerrit.libreoffice.org/19320 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
2014-12-03Fold URE: WindowsStephan Bergmann
...assuming the delayLoadHook in cli_ure/source/native/native_bootstrap.cxx is no longer necessary and loading of cppuhelper from the program dir cannot fail regardless in whatever scenario the cli_cppuhelper library itself is loaded. Change-Id: I13f32b327bca4cce9780864f5e57cdad3860afe5
2014-12-02Consistently use $(...)Stephan Bergmann
Change-Id: I68d3f99ca2a53988fb40ce0d5d364e19a8781cc0
2014-12-02Fold URE: Remove OO_SDK_URE_HOME on non-WindowsStephan Bergmann
Change-Id: Iad0480eb39e2c1312c27cf9b90146c2beba592fd
2014-12-01Fold URE: Linux ure/share/misc/* -> program/Stephan Bergmann
...and remove now unused ure-link symlink Change-Id: Ic958432c1dad4fae213982d0af072187f151620b
2014-09-17Fix OFFICE_PROGRAM_PATH for new Mac OS X layoutStephan Bergmann
Change-Id: Id8c6082b4b90c3020e1187dd311f0afd0320d155
2014-09-17Remove obsolete -malign-natural on Mac OS X from SDK, tooStephan Bergmann
...causes "clang: error: unknown argument: '-malign-natural' [-Wunused-command-line-argument-hard-error-in-future]; clang: note: this will be a hard error (cannot be downgraded to a warning) in the future" at least with "Apple LLVM version 5.1 (clang-503.0.40) (based on LLVM 3.4svn)", and last mention of -malign-natural in solenv/gbuild was removed with 4ea84822b1b638a61495af5006041bea8db8a3eb "OSX: drop -malign-natural flag for non-clang compilers." Change-Id: I0db1de484e45ba3eddf113392da71f20d099e9b5
2014-09-16Fix OO_SDK_URE_HOME for new Mac OS X layoutStephan Bergmann
Change-Id: I438b9ca643819cfd3e636e8157c6ef491beb1903
2014-09-16Use OO_SDK_URE_BIN_DIRStephan Bergmann
Change-Id: Ifd40e523f146ee26f49fe443e2455d053c7b6bfc
2014-05-06Add support for MacOSX x86_64Ariel Constenla-Haile
(cherry picked from commit 1307f0949c9b6e1ef2e8a3128c2113bbd7f17a58)
2014-01-30SDK: Split PLATFORMID at build time rather than runtimeStephan Bergmann
...where $(shell printf ...) in settings.mk likely doesn't work on Windows. Change-Id: I64a51203d1bf131160768f9a9069f428228aa6b1
2014-01-20Fix Mac OS X 64 bit SDK settings.mkStephan Bergmann
...to simply use Xcode clang++ (which implicitly uses libc++). Change-Id: I02578f971e4abddfe74211046674bdcd23d7b279
2014-01-20SDK settings.mk: Don't guess PLATFORM/PROCTYPEStephan Bergmann
...rather, pass them from the build to the SDK installation via dk.mk. (The SDK installation is already platform-specific anyway, see the binary executables in its bin/ directory, so there is no point in not fixing this at build time. In the future, the shipped settings.mk could of course be stripped to just the parts relevant for a given platform, of course.) Along the way, fixes some apparent "ppc" vs. "powerpc" typos in settings.mk. This is a prerequisite to create a working settings.mk for macosx_x86_64, but does not yet do that. Change-Id: Ib8e0c03ad6dfd610aae58a61e32bdc61c785584f
2013-12-18fdo#72598: odk: remove SunStudio supportMichael Stahl
No idea if the GCC stuff that's in there actually works. Change-Id: Idd1b93edd88609f3c09d14134d00a15fa9c0b0b7
2013-12-17Keep using component_getImplementationEnvironment in extensionsStephan Bergmann
...instead of relying on the implicit CPPU_CURRENT_LANGUAGE_BINDING_NAME convention. Keeping that convention an implementation detail makes it easier to do improvements in the future. (Theoretically, the bundled extension in mysqlc could be considered internal code and not adapted, but just be safe.) Change-Id: Iae41a6e072dabc2bf7c1481ba6cfed61680edf37
2013-12-11ure: remove references to SunStudio C52 filenamesMichael Stahl
Change-Id: If11655aa56239b9241db43a058244360a8abe1ec
2013-09-11odk: move files out of the confusing "pack" directory to better homesMichael Stahl
Change-Id: I46f4954ef07f60e1f7824a47f0617f8612ea9505
2013-07-18Resolves: #i122767# disallow pre-standard C++ for-scopeHerbert Dürr
(cherry picked from commit 197b1ac3007b870e6c51ae9c767ad4f2a340e799) Conflicts: odk/settings/settings.mk solenv/gbuild/platform/windows.mk solenv/inc/set_wntx64.mk solenv/inc/wntmsci11.mk Change-Id: I266a0d7672839b4568e76b7223aae15d82cd9a63
2013-06-27Related: #i122356# quote rdb path, windows spaces in pathsJürgen Schmidt
(cherry picked from commit 65ef7b5de4d5fa7b8b440a73329b088917f77957) Conflicts: odk/settings/std.mk Change-Id: I73e62097456ab8dbe601f557a4f5b65f9b7aba6b
2013-06-26Related: #i121442# Add sed and cat as dependencies to odkAriel Constenla-Haile
(cherry picked from commit 0a78e6e85d8e921705b7ea90038f822d47fb58ab) Conflicts: odk/cfgWin.js odk/configure.pl odk/docs/install.html odk/setsdkenv_unix.sh.in odk/setsdkenv_windows.template odk/settings/std.mk Change-Id: Ie124ffbb857e796923981e13dc3116c7af341056
2013-06-14odk - Add support for extension platformAriel Constenla-Haile
(cherry picked from commit d84324ff612c652b0f6e7a91863808db4425c316) Conflicts: odk/pack/copying/makefile.mk Change-Id: I04c004b1ea2c6c05a18f48db553141e2cf32f06d
2013-04-19Adapt SDK to usage of msvcrtd for Windows --enable-dbgutilStephan Bergmann
* Re-use existing settings/dk.mk to tunnel ENABLE_DEBUG into the SDK. Turns out this was explicitly included in ~all examples Makefiles, but only after settings.mk where it is now used, so include it in settings.mk now and dropped it from all the exmaples Makefiles. * The old settings.mk was apparently confused with using /MT ("link with LIBCMT.LIB") on cl command line and /MD ("link with MSVCRT.LIB") on link command line (where it was ignored), and you apparently can't pass both together to cl, so I settled on /MD (resp. /MDd) now and dropped /MT (resp. /MTd). No idea if that is exactly right, however. * Introduced client-facing LIBO_SDK_LDFLAGS_STDLIBS that covers kernel32.lib and msvcrt.lib vs. msvcrtd.lib on Windows. Adapted examples Makefiles and /ure/source/uretest/Makefile accordingly. Some examples Makefiles additionally use msvcprt.lib, no idea whether that still needs to be addressed. Change-Id: Ia8d9d177e415abfbaf6f9fa6239f0ef9998868be
2013-04-19fdo#63693 Do not force java -d32 for a 64-bit SDKStephan Bergmann
The test to determine JAVA_OPTIONS was already cheesy (e.g., it does not catch java-1.7.0-openjdk-1.7.0.9-2.3.8.0.fc18.x86_64, as there "java -version" outputs "OpenJDK 64-Bit Server VM (build 23.7-b01, mixed mode)" with "64-Bit" in the second instead of the third field), so make it a bit more cheesy still (i.e., just cover the case to not set -d32 for x86_64). Change-Id: Ib10a16fb3f8104875bfda7de0e8bce59b9c3b06a
2013-04-18Properly set PS to a single backslash for WindowsStephan Bergmann
I guess all those $(subst \\,\,...) in odk/examples/.../Makefile are only workarounds for a broken PS setting and could go, too. Change-Id: I2e44108f23803e1f49157a91be11af5ad860673c
2013-04-11Adapt SDK to -B removed from cppumaker/javamakerStephan Bergmann
Change-Id: Ida4d11e0f8dfea201e0456cc54aa7f5af093d2ad
2013-04-10API CHANGE: odk: remove "store" and "reg" librariesMichael Stahl
These libraries were never part of the stable URE interface, and thus including their headers and import libs in the SDK was a mistake. Apparently at least on MacOSX and some Linux distros it was not possible to link against the libraries anyway. Change-Id: I3c43c86ff5d7bc316ed7af0be4ef313f7869ac23
2013-04-10odk: settings.mk: add variable PURPENVHELPERLIBMichael Stahl
This library is part of the stable URE interface. Change-Id: Id131bdd333ecff2ae788830ca4b5b57b4a4a9c24
2013-04-04remove -dylib_file mappings that are not needed anymoreChristian Lohmaier
XCode 2.5 (i.e. Mac OSX 10.4 & 10.5) couldn't find the libraries without explicit mapping, but as baseline is now 10.6, this wrapping is no longer necessary Change-Id: I225fc47b9ea4b1fb2b13ba575605cbdebc014fd8 Reviewed-on: https://gerrit.libreoffice.org/3192 Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2013-04-03Remove Mac OS X for PowerPC supportTor Lillqvist
Change-Id: I10b15141e6a5f93365e1cfa6fbc0c7cc3ea49b15
2013-02-28Unused UDK_MAJOR/MINOR/MICRO macros (and udkversion.mk), also removed from SDKStephan Bergmann
Change-Id: I466424c5b71de4d6bb126499895539813283502a
2013-02-20rhbz#742780: Let make OPT_FLAGS=... override SDK optimization/debugging flagsStephan Bergmann
Change-Id: I639fa16f74342b108a395d7d0335d116f96677f1
2012-12-18API CHANGE: Remove obsolete regcomp from UREStephan Bergmann
Change-Id: Iaec5e0fd53d340f028e271f28e99a73dedc636f7
2012-12-17Remove --with-stlport from LO 4.0Stephan Bergmann
The STLport was only built for the benefit of old extensions on platforms that once used it themselves (Linux x86, Solaris x86 and SPARC, Windows). We deliberately break such old extensions for LO 4.0 by no longer shipping that backwards-compatiblity cludge. Keeps STLport listed in readlicense_oo/ because of o3tl/inc/o3tl/compat_functionality.hxx. Also removes GXX_INCLUDE_PATH, as that was only used by STLport (if at all?). Removes a spurious #define MOVEFILE_REPLACE_EXISTING 0x01 from l10ntools/inc/helpmerge.hxx that was once added with 854812584862d0609b695682d2bfea2667d75c00 "INTEGRATION: CWS extensionl10nfix01 (1.11.6); FILE MERGED: 2008/06/26 13:56:03 ihi 1.11.6.1: #i90987# windows rename -> MoveFileEx" but now starts to cause trouble on Windows. Also disables warning C4005 about redefinition of WB_LEFT/RIGHT macros (defined in both tools/wintypes.hxx and the Windows API) in a number of places that include windows.h -- however the old STLport caused those warnings to not show. Change-Id: Ie138a219fbbc86fb5aaa7ea0b88cf349935d9829
2012-11-22Use xcrun when available to run install_name_toolTor Lillqvist
This hopefully should help in situations like Jonathan Aquilina's, where /usr/bin/install_name_tool does not correspond to the tool-chain used (but is from an earlier version of Xcode). Change-Id: I5b4ca9e5e163fb4a84967577d2146cdbe8344f03
2012-11-12re-base on ALv2 code. Includes:Michael Meeks
Patches contributed by Pedro Giffuni: Avoid some uses of non portable #!/bin/bash in shell scripts. http://svn.apache.org/viewvc?view=revision&revision=1235297 Reduce the dependencies on non standard GNU copy. http://svn.apache.org/viewvc?view=revision&revision=1238684 Correct /usr/bin/env path. http://svn.apache.org/viewvc?view=revision&revision=1235619 Complex Toolbar Controls Extension from the SDK Patches contributed by Ariel Constenla-Haile http://svn.apache.org/viewvc?view=revision&revision=1190390 i118615 - make epm more verbose http://svn.apache.org/viewvc?view=revision&revision=1204288 Patches contributed by Mathias Bauer (and others) gnumake4 work variously http://svn.apache.org/viewvc?view=revision&revision=1394707 http://svn.apache.org/viewvc?view=revision&revision=1394326 Patches contributed by Juergen Schmidt: jsc341: i117327: take care if no dependency node in current description exists, create one http://svn.apache.org/viewvc?view=revision&revision=1172101 jsc341: i117327: add extra extension dependency check http://svn.apache.org/viewvc?view=revision&revision=1172098 make initial branding changes http://svn.apache.org/viewvc?view=revision&revision=1231878 Patches contributed by Ingo Schmidt native373: #i117733# no linux jre installation on 64 bit systems http://svn.apache.org/viewvc?view=revision&revision=1167536 native373: ##164464# improve debian support http://svn.apache.org/viewvc?view=revision&revision=1167537 Patch contribtued by Armin Le-Grand: Changed various aspects concerning usages of old vendor names http://svn.apache.org/viewvc?view=revision&revision=1293313 fix for neon webdav, remove coinmp bits, improve odk script, cleanup & remove OS/2 conditionals, system ucpp fixes, remove OS/2 conditionals, restore our license filenames.
2012-08-30Fix -Wl,-z,origin -Wl,-rpath,... quotingStephan Bergmann
Change-Id: I65eac6ab34d2d54eeaa2bc14838711f700d0d535
2012-08-29fdo#54015: At least FreeBSD ld requires -z origin when RPATH contains $ORIGINJung-uk Kim
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>: * bulk replacement of "-Wl,-z,origin,-rpath,..." with "-Wl,-z,origin -Wl,rpath,..." * additional hunk for directory/c-sdk/config/FreeBSD.mk in moz/seamonkey-source-1.1.14.patch did not apply and has been dropped Change-Id: Ie60c696f041108e819ce8f799cff6f58e63a5ad7
2012-07-10solaris: update settings.mk to use gccPierre-Eric Pelloux-Prayer
Change-Id: Ife7a4806776f55babfab11ceac25a3d2d66fe5af
2012-02-14odk: remove some dead makefile codeThomas Arnhold
generated by cgit (git 2.34.1) at 2024-12-26 17:40:07 +0000