summaryrefslogtreecommitdiff
path: root/odk
AgeCommit message (Collapse)AuthorFilesLines
2014-01-31SDK settings.mk: Don't guess PLATFORM/PROCTYPE, and fix Mac OS X 64 bitStephan Bergmann3-34/+22
...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. Cherry picked from commit dea0398ee24eb278cdb14999efbf34d634454eaa "SDK settings.mk: Don't guess PLATFORM/PROCTYPE" plus e5ad31e2f784856506c28092166dc8704c84e868 "Fix Mac OS X 64 bit SDK settings.mk" and b3db695a338f1acddbe46102138a0167fc346f58 "SDK: Split PLATFORMID at build time rather than runtime" fix. Conflicts: odk/settings/settings.mk Change-Id: Ib8e0c03ad6dfd610aae58a61e32bdc61c785584f Reviewed-on: https://gerrit.libreoffice.org/7748 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2013-12-17Keep using component_getImplementationEnvironment in extensionsStephan Bergmann11-2/+70
...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.) (cherry picked from commit fa2a7c1c95f78d20ed572091e12700fd4d852835) Conflicts: desktop/test/deployment/active/active_native.cxx Change-Id: Iae41a6e072dabc2bf7c1481ba6cfed61680edf37
2013-12-17Do not use Boost in SDK examplesStephan Bergmann1-6/+3
Change-Id: I8b2af447fe3ee29261e538a53b4624ff8b6c4d1e (cherry picked from commit ca4065680a402e3d0ff43e41744b24a9c980b2ef)
2013-12-13Targetted text updates, with seasonable changes before l10n freeze.Michael Meeks6-7/+7
Change-Id: If37ef9f68711da3a0aa9a3ba59b111a8a23421df
2013-11-21Typo in capitalization of include file nameStephan Bergmann1-1/+1
Change-Id: I41a46c5b62c06f6298fc6e0ac70ff508bf27ec29 (cherry picked from commit 2732615c63d310232ac1900ca7549df653f792ff) Reviewed-on: https://gerrit.libreoffice.org/6756 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com>
2013-11-20Windows: Require at least Windows XP SP2Thomas Arnhold1-1/+1
* Windows XP SP2 is 0x0502, see http://msdn.microsoft.com/en-us/library/aa383745.aspx * If a module changes the Windows SDK version setting, this is done module wide now. So the overall behavior is as before. This seems to be the best compromise for now. * We need at least SP2 because of the bluetooth stuff used in sd/source/ui/remotecontrol. * Now, we require at least Internet Explorer 7.0. IE6 has been outdated for a long time. * Leave StdAfx.h file definitions, as those are Microsoft project specific precompiled header files. * All local definitions of WINVER are removed, because the global WINVER setting makes them obsolete now. To the relation of the three macros: Setting _WIN32_WINNT sets WINVER and NTDDI_VERSION automatically to the same value as _WIN32_WINNT. WINVER and NTDDI_VERSION can be set idenpendently each for itself. Change-Id: Ibcc12493aae4fcaf7bcfda88be99c1b61bc326cb Reviewed-on: https://gerrit.libreoffice.org/6496 Reviewed-by: Thorsten Behrens <thb@documentfoundation.org> Tested-by: Thorsten Behrens <thb@documentfoundation.org>
2013-11-20remove RTL_CONSTASCII_STRINGPARAM in OUString::matchAsciiL callsNoel Grandin1-1/+1
Convert code like: defaultValue.matchAsciiL( RTL_CONSTASCII_STRINGPARAM( "nextval(" ) ); to: defaultValue.startsWith( "nextval(" ); Change-Id: I77bdcbf46bec6ded3c16a8248634b1424a1eb4f0
2013-11-19remove unnecessary use of OUString constructor when assigningNoel Grandin3-3/+3
change code like aStr = OUString("xxxx"); to aStr = "xxxx"; Change-Id: Ib981a5cc735677ec5dba76ef9279a107d22e99d4
2013-11-11convert OUString compareToAscii == 0 to equalsAsciiNoel Grandin1-8/+8
Convert code like aStr.compareToAscii("XXX") == 0 to aStr.equalsAscii("XXX") which is both easier to read and faster. Change-Id: I448abf58f2fa0e7715dba53f8e8825ca0587c83f
2013-11-11convert OUString !compareToAscii to equalsAsciiNoel Grandin1-9/+9
Convert code like if( ! aStr.compareToAscii("XXX") ) to if( aStr.equalsAscii("XXX") ) which is both clearer and faster. Change-Id: I267511bccab52f5225b291acbfa4e388b5a5302b
2013-11-11remove unnecessary use of OUString constructorNoel Grandin4-10/+10
Change-Id: Ifb220af71857ddacd64e8204fb6d3e4aad8eef71
2013-11-08instsetoo_native: shouldn't need instdir in include pathMichael Stahl1-3/+3
get_Source_Directory_For_Files_From_Includepathlist already has a special hack to find all the files in instdir so ideally it should not be necessary to put these directories on the include path. Clean up readlicense_oo to make that possible; also copying license.txt as-is to LICENSE on Unix but first converting it on WNT is rather silly... Change-Id: I95f30bc5e0b7ca73c50156a7ce0131640185778c Reviewed-on: https://gerrit.libreoffice.org/6613 Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2013-11-07configure: add vars for Solaris/SPARC64 (already checked in vcl)Michael Stahl1-8/+8
Change-Id: Ic27986d8d45f61facedf2400b77334aaf1da7c1e
2013-10-31readlicense_oo: stop delivering files to OUTDIRMichael Stahl3-4/+27
- remove Package_readme, use generated files from WORKDIR via include path - Package_license and Package_files deliver to INSTDIR - split up Package_odk_shared_readme to have extra Package for generated files - gb_Extension_LICENSEFILE_DEFAULT points to INSTDIR Change-Id: I019d3431e30d982e887ae0000c755e0d61f98893
2013-10-31odk: merge Package_config_notwin into Packge_configMichael Stahl3-30/+9
Change-Id: I021ae1bc6d816d359be364c221d70a0e178a8b80
2013-10-28odk: adapt to cli_ure/unoil changesMichael Stahl1-6/+6
Change-Id: I9fec64c247de793ae30434c615752f48d1bc2205
2013-10-25stop looking for Jar files in solverMichael Stahl1-2/+3
Change-Id: I4d2a93fa7395354fbf2893df9e254ab39fa365af
2013-10-25fdo#54938: More uses of cppu::supportsServiceMarcos Paulo de Souza4-59/+13
Change-Id: Id6bed78d92eba52283a17ab3ca66e751c225e48d Reviewed-on: https://gerrit.libreoffice.org/6423 Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com>
2013-10-23Install SDK cli/cli_cppuhelper.dll after allStephan Bergmann1-0/+1
Instead of removing it from odk/Package_cli.mk, c0c7df91469d3306baa6708b0a8ab4eadc0e9097 "odk: remove cli_cppuhelper from Package_cli" should have referenced it from solver's bin/assembly/, where it got moved by 8865b7f013bcd9b4ce41dd98be28ba28aeb22e66 "fdo#55290: use the right native library name." (And "It is actually installed by scp2/source/ooo/ure.scp" too, indeed, but that is a red herring and is true for all the SDK cli/cli_*.dll files. My take is that they are required twice, once in the GAC, which the scp2 settings are for, and once for SDK code to link against. Note e.g. the reference to cli_cppuhelper.dll in odk/examples/CLI/CSharp/Spreadsheet/Makefile, building which from within the SDK failed now without this fix.) Change-Id: Ia906a4dc23e1e232ddb3dfac49dd190d1de45917
2013-10-22Bin comments that claim to say why some header is includedTor Lillqvist5-7/+7
They are practically always useless, often misleading or obsolete. Change-Id: I2d32182a31349c9fb3b982498fd22d93e84c0c0c
2013-10-11Add a picture and a graphicTor Lillqvist1-0/+0
Change-Id: Ic58a0c6302b4bdac892ba1d9d019ae5b6f98e27d
2013-09-30API CHANGE: Remove osl_getEthernetAddress and osl/util.h .Arnaud Versini1-1/+0
Also move osl/util.c on Unix systems to osl/system.c. Change-Id: Ifff79d9f4f89ecbb4e0e1652b40ab46b7d569adf Reviewed-on: https://gerrit.libreoffice.org/6065 Tested-by: Arnaud Versini <arnaud.versini@libreoffice.org> Reviewed-by: Arnaud Versini <arnaud.versini@libreoffice.org>
2013-09-26typo fixes in commentsAndras Timar9-28/+28
Change-Id: Iaadec33715f8e0e0c6595c5e684606905274fdab
2013-09-25drop worthless _VECTOR_/_MAP_ header guardsCaolán McNamara1-2/+0
Change-Id: I54be19847b8fb609f0b08a528cc06dbae9f579d5
2013-09-23Fixes for cross-compilation on OS X (to iOS)Tor Lillqvist20-22/+22
Introduce SDKDIRNAME as a configury variable and use it instead of the gbuild gb_Package_SDKDIRNAME. Then we can easily construct the SDKDIRNAME_FOR_BUILD variant that is needed to find the specially named SDK in instdir on OS X when cross-compiling. Move the version number section in configure.ac earlier. Change-Id: Iee3db1a50ad4c7a9f91bbc5e0d0b01d76a76f701
2013-09-22add mode lines to new files (and idls) since last runCaolán McNamara21-0/+56
Change-Id: Id1e74f18c90e69d1a781c8f02e30dc3c005ed4fd
2013-09-22gbuild: remove static libraries from OUTDIRMichael Stahl1-1/+1
Refactor to find and link static libraries directly in WORKDIR. - gb_StaticLibrary_get_target is now same as the gb_LinkTarget_get_target - fix the StaticLibrary clean target Change-Id: Icf29d32d6487747a2e39d4599ceebccfead04667
2013-09-22odk: remove Package_bin, instead auto-install executablesMichael Stahl3-29/+2
This is somewhat annoying since it requires re-introducing stupid directories in scp2, but if the executables should be put in INSTDIR directly then the Package_bin needs to go. Change-Id: I893694c7f9d4cb5b9ef8ec4a3d30e08536223740
2013-09-22gbuild: remove libraries from OUTDIR and WORKDIRMichael Stahl1-20/+0
Refactor everything to find and link libraries directly in INSTDIR. - add gb_LinkTarget_get_linksearchpath_for_layer, and use it to set up -L paths for T_LDFLAGS in such a way that only allowed libraries can be linked against; i.e. it's not possible to link URE linktargets against OOO or not-installed libraries - gb_Library_get_target is now same as the gb_LinkTarget_get_target (TODO: this needs cleanup) - since a pattern rule won't work for linking libraries in INSTDIR, add a separate per-file rule for every INSTDIR lib - pattern rule can't find link target in the clean target any more so add a LINKTARGET variable - disable gb_Library_add_auxtarget, no auxtargets need to be copied - tweak the call to gb_Library_Library_platform to pass in a path in sdk/lib for the versioned URE libs - fix the Library clean target - add LAYER parameter to gb_LinkTarget_LinkTarget - adjust platform link commands - MSVC link command now uses explicit -manifestfile and -pdb parameters to keep misc. files out of INSTDIR - remove gb_Helper_OUTDIR_FOR_BUILDLIBDIR - adjust Extension, CppunitTest, JunitTest, PythonTest, Gallery, various CustomTargets to search INSTDIR - remove SDK library symlinks and import libs from odk/Package_lib - on Mac OS X, put .dylib symlinks into sdk/lib even though those are not packaged and would be created by the SDK configury; we need these to be somewhere for linking anyway - add a (unfortunately cyclic) dependency on Package ure_install to sal Change-Id: I70d88742f8c8232ad7b9521416275c67b64fe6cf
2013-09-22odk: remove cli_cppuhelper from Package_cliMichael Stahl1-1/+0
It is actually installed by scp2/source/ooo/ure.scp already. Change-Id: I0ca538e3d6c52b1e228f1b1191778d8fb5d84954
2013-09-22unowinreg.dll is not in OOO layerMichael Stahl1-1/+1
Change-Id: Ib22fcbe5e9427750196f11c512fd4d3134108731
2013-09-22gbuild: make the versioned library the linktarget on UnixesMichael Stahl1-1/+1
If there is a SOVERSION then the versioned library is a real file and the unversioned one just a symlink; better to have the real file be the target. - add gb_Library_UDK_MAJORVER variable for SOVERSION - remove version parameter of gb_Library_set_soversion_script; instead hardcode the SOVERSION since it must be included in the file name in gb_Library_FILENAMES anyway - store the unversioned symlink in the ILIBTARGET variable - via new gb_Library_get_workdir_target_versionlink function - removed gb_Helper_install call that resulted in both versioned and unversioned libs in instdir Change-Id: I2c6f1698f0e39fdb2c07964d43ed9485cbca0b30
2013-09-22gbuild: make the DLL the LinkTarget of Library and CppunitTestMichael Stahl1-1/+1
... instead of the import lib. If the DLL is an auxtarget, it cannot be deleted without annoying errors, and we want to be able to rm -r $(INSTIDR) and build incrementally from there. - replace DLLTARGET -> ILIBTARGET - replace gb_Library_DLLFILENAMES -> gb_Library_FILENAMES - replace gb_Library_FILENAMES -> gb_Library_ILIBFILENAMES - replace gb_Library_get_dllname -> gb_Library_get_filename - replace gb_Library_get_filename -> gb_Library_get_ilibfilename - replace gb_CppunitTest_get_libfilename -> gb_CppunitTest_get_ilibfilename - replace gb_LinkTarget_set_dlltarget -> gb_LinkTarget_set_ilibtarget Change-Id: I92a2f061a653b9b5941f3232d729987b1317b6f8
2013-09-19Spurious reference to cppu InternalUnoApiStephan Bergmann1-1/+0
Change-Id: I8d4adbbfd8b62e77b6e2bb0cdd3905785039287a
2013-09-11odk: move files out of the confusing "pack" directory to better homesMichael Stahl13-10/+11
Change-Id: I46f4954ef07f60e1f7824a47f0617f8612ea9505
2013-09-11odk: remove addsym-macosx.shMichael Stahl5-59/+0
This was added in commit 66eedcee026459b2827a46d8ebc73749e3c71453 but has apparently never actually been used in the bundled SDK makefiles. Change-Id: Ifa6cab95be6575ac26840250ad717d94e15bea66
2013-09-11Towards a working instdir for Mac OS XStephan Bergmann2-3/+3
Introduced gb_INSTROOT, which is the same as $(INSTDIR) except for Mac OS X, where it is $(INSTDIR)/LibreOffice.app/Contents. Most stuff ends up there (so most occurrences of $(INSTDIR) have been replaced with $(gb_INSTROOT)), but SDK- related stuff goes to $(INSTDIR)/$(gb_Package_SDKDIRNAME). (And GeneratedPackage needed to be made more flexible, to allow for packages that go into either of those two places.) For Android and iOS, gb_INSTROOT probably still needs to be set. The most obvious missing thing yet to make instdir work for Mac OS X is the instdir/*/LibreOffice.app/Contents/ure/ vs. instdir/*/LibreOffice.app/Contents/ure-link/ split. Change-Id: I4478edd27b14c92c96d92d5169bdca3ec50d78f5
2013-09-09restore gid_Dir_Sdkoo_Root which is apparently still needed on WNTMichael Stahl1-1/+1
also odk: better use gb_Library_get_runtime_filename than manually Change-Id: Ibbded4e8279b5dcb452f0d90be755edee1d2b63f
2013-09-09install whole sdk using filelistsMatúš Kukan3-0/+31
Change-Id: I9d8d0a20d776740c4701ec9a1facded9f4bde77a
2013-09-09odk: make error reporting less mysteriousMichael Stahl1-4/+11
Change-Id: I9e3c58fe65b902bb8b6b30449008bd1d71ed2180
2013-09-07s/wiki.services.openoffice.org/wiki.openoffice.org/gAndras Timar26-619/+619
Change-Id: I059fbee385a109069c70f3869021c8e2ee48fee1
2013-08-29[API CHANGE] Remove obsolete com.sun.star.comp.helper.UnoInfoStephan Bergmann2-51/+1
It had originally been used in the SDK's "Simple Bootstrap" for Java, com.sun.star.lib.loader.Loader class, but only left in there for backwards compatibility with pre--three-layer OOo versions (i.e., < OOo 3) when that Loader was switched to use the unoinfo executable with the fix for #i88687# "C++/Java Simple Bootstrap broken" in e2b7ea631a5e7297346ec826527a019e2baca020 "INTEGRATION: CWS sb87 (1.5.10); FILE MERGED: 2008/05/07 11:34:25 sb 1.5.10.1: #i88687# let Loader call new unoinfo instead of old juh.jar UnoInfo.getJars." Recent work in AOO to undo three-layer caused AOO to now accidentally use the backwards-compatibility code, so AOO ran into a problem that they solved with a change to com.sun.star.comp.helper.UnoInfo that LO erroneously merged in as 95ada2d65f6d999920f2a04599ac132fa632d66d "Related: #i122483# set correct classpath, include unoil.jar." The better approach is to get rid of that backwards-compatibility code and remove the obsolete UnoInfo class. While this is nominally incompatible, in practice no other client code but the SDK's com.sun.star.lib.loader.Loader should ever have used it (it should have been designed as a private interface for just that one client from the start, anyway). Java applications using "Simple Bootstrap" and built against old versions of the SDK (post the fix for #i88687# and its introduction of the unoinfo exectuable in OOo 3) will continue to work against new LO versions (as the backwards-compatibility code that would call the removed UnoInfo class will not be triggered anyway; and even if it were, all resulting exceptions would be caught and the new code path using the unoinfo executable be chosen then). Likewise, Java applications using "Simple Bootstrap" and built against the new SDK will continue to work against old OOo/LO/AOO vesions as far back as the fix for #i88687# and its introduction of the unoinfo exectuable in OOo 3. Change-Id: I64824ed002c3ccdf6912eab67499beb0c423081e
2013-08-26unodevtools: drop support for skeletonmaker --java4 parameterMichael Stahl1-2/+1
Minimum requirement has been Java 1.5 for years now. Change-Id: Id512507db1fc12c92d8f7662505eda6866da2fc6
2013-08-26uno-skeletonmaker has -l, does not need -env:UNO_TYPESStephan Bergmann1-8/+4
Change-Id: I08ba8a9e84582a50a7893625139e43408be77278
2013-08-20[TOOD|TOODO]->TODOCaolán McNamara1-3/+3
Change-Id: I3444b1788e3246503e2460051e8ddbf38aa3de86
2013-08-19Rename SOLAR_JAVA to ENABLE_JAVA and HAVE_FEATURE_JAVATor Lillqvist4-6/+6
Change-Id: Ib451bdb3c1c2ca42347abfde44651d5cf5eef4f3
2013-08-12Mark as constTakeshi Abe1-1/+1
Change-Id: I9277052ee9c6197cef7a46bd8f3ab9c5515c2502
2013-08-09odk doc cleanup.Michael Meeks1-10/+11
Change-Id: Ibc5998e665b0f81cdf805e128065e253c46594ab
2013-08-04fdo#67235 adapt form control code to time nanosecond API change, step 3Lionel Elie Mamane1-8/+10
Change-Id: I4899c89ee5b2a54c9c05b531ab284365f1558e3d Reviewed-on: https://gerrit.libreoffice.org/5270 Tested-by: Lionel Elie Mamane <lionel@mamane.lu> Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu>
2013-08-03fdo#67235 adapt form control code to time nanosecond API change, step 2Lionel Elie Mamane1-4/+4
Change-Id: I6ed48b506bdd7b3908ce8c7dba1b74093a3ac202