summaryrefslogtreecommitdiff
path: root/odk/settings
AgeCommit message (Collapse)AuthorFilesLines
2013-04-19Adapt SDK to usage of msvcrtd for Windows --enable-dbgutilStephan Bergmann1-5/+25
* 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 Bergmann1-0/+2
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 Bergmann1-1/+1
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 Bergmann1-1/+1
Change-Id: Ida4d11e0f8dfea201e0456cc54aa7f5af093d2ad
2013-04-10API CHANGE: odk: remove "store" and "reg" librariesMichael Stahl1-14/+2
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 Stahl1-0/+5
This library is part of the stable URE interface. Change-Id: Id131bdd333ecff2ae788830ca4b5b57b4a4a9c24
2013-04-04remove -dylib_file mappings that are not needed anymoreChristian Lohmaier1-7/+0
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 Lillqvist1-3/+0
Change-Id: I10b15141e6a5f93365e1cfa6fbc0c7cc3ea49b15
2013-02-28Unused UDK_MAJOR/MINOR/MICRO macros (and udkversion.mk), also removed from SDKStephan Bergmann1-12/+0
Change-Id: I466424c5b71de4d6bb126499895539813283502a
2013-02-20rhbz#742780: Let make OPT_FLAGS=... override SDK optimization/debugging flagsStephan Bergmann1-30/+22
Change-Id: I639fa16f74342b108a395d7d0335d116f96677f1
2012-12-18API CHANGE: Remove obsolete regcomp from UREStephan Bergmann1-1/+0
Change-Id: Iaec5e0fd53d340f028e271f28e99a73dedc636f7
2012-12-17Remove --with-stlport from LO 4.0Stephan Bergmann1-8/+8
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 Lillqvist1-2/+2
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 Meeks3-0/+54
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 Bergmann1-2/+2
Change-Id: I65eac6ab34d2d54eeaa2bc14838711f700d0d535
2012-08-29fdo#54015: At least FreeBSD ld requires -z origin when RPATH contains $ORIGINJung-uk Kim1-2/+2
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-Prayer1-7/+21
Change-Id: Ife7a4806776f55babfab11ceac25a3d2d66fe5af
2012-02-14odk: remove some dead makefile codeThomas Arnhold1-10/+0
2012-02-14Resolves rhbz#789622: Adapt SDK to changed paths in LO installationStephan Bergmann1-2/+2
2011-11-30Remove unused variable PACKAGE_LIB_DIRFrançois Tigeot1-15/+0
2011-10-24Undo basis/brand split: Move SDK and ure-link, remove OOO_BASE_DIR and ↵Stephan Bergmann1-3/+3
BaseInstallation.
2011-07-12Remove component_getImplementationEnvironmentMatúš Kukan1-1/+0
2011-06-24bad merge, fix to enable extensions to build againCaolán McNamara1-6/+0
2011-06-10This makefile is for a standard Make, so use TABsTor Lillqvist1-4/+5
2011-04-05Merge remote-tracking branch 'origin/libreoffice-3-3' into libreoffice-3-4Petr Mladek1-0/+6
Conflicts: odk/settings/settings.mk
2011-03-23Merge branch 'master' of git://anongit.freedesktop.org/libreoffice/sdkJan Holesovsky1-3/+3
2011-03-23Merge commit 'ooo/DEV300_m103'Jan Holesovsky2-18/+48
Conflicts: odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx odk/examples/DevelopersGuide/Database/DriverSkeleton/SServices.cxx odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/fdcomp.cxx odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx odk/examples/cpp/complextoolbarcontrols/exports.cxx odk/examples/cpp/counter/countermain.cxx odk/examples/cpp/remoteclient/remoteclient.cxx odk/settings/settings.mk
2011-03-22Trying to remove NODEFAULTLIB on WindowsFridrich Štrba1-3/+3
2011-03-03jsc340: i114609: no visibility compiler flag for jni libJuergen Schmidt1-0/+18
2011-03-01jsc340: i114609: adapt examples to work with the URE and use the passive ↵Juergen Schmidt1-1/+0
registration
2011-02-11fix ODK settings.mk to only set STLPORTLIB if neededRene Engelhard1-2/+6
Signed-off-by: Petr Mladek <pmladek@suse.cz>
2011-02-09Trying to remove the stlport mention from the codeFridrich Štrba1-29/+0
2011-02-02Clean up makefilesThomas Arnhold1-4/+0
2011-02-01jsc340: i114609: support passive component registrationJuergen Schmidt1-15/+22
2011-01-27jsc340: extend proctype check for MacOSJuergen Schmidt1-2/+2
2010-10-28jsc340: i115252: check arch for older Mac versionJuergen Schmidt1-0/+6
2010-10-01jsc340: i114789: remove spaceJuergen Schmidt1-1/+1
2010-06-21CWS-TOOLING: integrate CWS gridcontrol04obo1-1/+9
Notes: split repo tag: sdk_ooo/DEV300_m84 split repo tag: sdk_ooo/DEV300_m85 split repo tag: sdk_ooo/DEV300_m86 split repo tag: sdk_ooo/DEV300_m87 split repo tag: sdk_ooo/DEV300_m88 split repo tag: sdk_ooo/OOO330_m0 split repo tag: sdk_ooo/OOO330_m1 split repo tag: sdk_ooo/OOO330_m2 split repo tag: sdk_ooo/OOO330_m3 split repo tag: sdk_ooo/OOO330_m4 split repo tag: sdk_ooo/OOO330_m5 split repo tag: sdk_ooo/OOO330_m6 split repo tag: sdk_ooo/OOO330_m7
2010-06-09CWS-TOOLING: integrate CWS kfreebsdport01v2obo1-6/+25
Notes: split repo tag: sdk_ooo/DEV300_m82 split repo tag: sdk_ooo/DEV300_m83
2010-06-04gridcontrol04: i111555: take care of 64 bit javaJuergen Schmidt1-1/+9
2010-05-06sdk321: adapt configuration and build env to work proper with spacesJuergen Schmidt1-6/+6
Notes: split repo tag: sdk_ooo/DEV300_m80
2010-05-05kfreebsdport01v2: fix odks settings.mk to add kfreebsd support and add ↵Rene Engelhard1-6/+25
amd64. Remove obsolete gcc version check
2009-11-11#i106801# check compiler version and options, Mac OSJuergen Schmidt1-9/+12
2009-11-05#i106627# extend and adapt env for VC9, building manifest, change macroJuergen Schmidt1-3/+3
2009-11-04#i160985# insert new macro ICL to reference innner classesJuergen Schmidt1-0/+5
2009-11-04#i160584# add -D_DLL compiler define for WindowsJuergen Schmidt1-1/+1
2009-07-06CWS-TOOLING: integrate CWS sdk311_DEV300Vladimir Glazounov1-3/+3
2009-06-09 10:22:56 +0200 jsc r272754 : #i101883# adapt number 2009-06-03 13:25:57 +0200 jsc r272559 : #i101883# ensure correct archive name for sdk, adapt resolve_variables_in_downloadname to exchange packageversion 2009-06-03 13:20:14 +0200 jsc r272558 : #i101883# ensure correct archive or package name 2009-06-02 14:56:40 +0200 jsc r272506 : #i101883# ensure correct archive or package name 2009-05-27 11:26:35 +0200 jsc r272337 : CWS-TOOLING: rebase CWS sdk311 to branches/OOO310@272261 (milestone: OOO310:m12) 2009-05-26 15:15:13 +0200 jsc r272305 : #i101883# ifdef links to URE libs for MacOSX and adapt compiler settings
2008-08-27INTEGRATION: CWS oobeanfix_DEV300 (1.12.10); FILE MERGEDRüdiger Timm1-0/+1
2008/08/26 13:32:26 jsc 1.12.10.1: #i93126# insert new variable for URE jar files, used in OOBean example makefile
2008-08-27INTEGRATION: CWS sb91 (1.30.2); FILE MERGEDRüdiger Timm1-1/+18
2008/07/18 12:32:02 sb 1.30.2.1: #i91567# adapted to unxsolu4
2008-07-11INTEGRATION: CWS jsc21 (1.3.242); FILE MERGEDRüdiger Timm1-0/+6
2008/05/22 07:07:58 jsc 1.3.242.1: #i88797# adapted to new structure
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-20 02:41:49 +0000