Commit Graph

33 Commits

Author SHA1 Message Date
5051209534 Adapt SDK to usage of msvcrtd for Windows --enable-dbgutil
* 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-19 14:02:18 +02:00
8d87758d65 Java cleanup, remove the rest of the unnecessary casts
Change-Id: Ia61d250f6b3711abc29569c5ece38a6f87e38daa
Reviewed-on: https://gerrit.libreoffice.org/3432
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-04-19 07:52:08 +00:00
14a2413530 Adapt SDK to -B removed from cppumaker/javamaker
Change-Id: Ida4d11e0f8dfea201e0456cc54aa7f5af093d2ad
2013-04-11 14:24:08 +02:00
2b4fd2c89a re-base on ALv2 code. Includes:
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-11-12 11:46:43 +00:00
6bf09ecf1d Java cleanup, remove unnecessary imports
I guess I missed some last time :-)

Change-Id: I164a8baa07850f783b8cdf2e7f3eeaac53a3d29b
2012-09-10 23:43:38 +02:00
1296914c84 changefileheader2: #i109125#: change source file copyright notice from Sun Microsystems to Oracle; remove CVS style keywords (RCSfile, Revision) 2010-02-12 15:01:35 +01:00
86349cc061 INTEGRATION: CWS sdk13 (1.12.40); FILE MERGED
2004/05/05 09:31:43 jsc 1.12.40.1: #116658# merge cinnabar changes
2004-05-18 12:30:05 +00:00
c4d34f0ab9 INTEGRATION: CWS sdki18n (1.5.4); FILE MERGED
2004/02/12 14:37:49 jsc 1.5.4.1: #115338# merged changes from sdk11zhja
2004-02-20 08:44:58 +00:00
5a1fa1c6f6 INTEGRATION: CWS sdki18n (1.3.4); FILE MERGED
2004/02/12 14:37:49 jsc 1.3.4.1: #115338# merged changes from sdk11zhja
2004-02-20 08:44:45 +00:00
6e61506acc INTEGRATION: CWS geordi2q14 (1.4.20); FILE MERGED
2004/01/30 13:11:47 hr 1.4.20.1: #111934#: merge CWS ooo111fix2
2004-02-02 19:09:30 +00:00
afb14063c7 INTEGRATION: CWS geordi2q14 (1.7.20); FILE MERGED
2004/01/30 13:11:47 hr 1.7.20.1: #111934#: merge CWS ooo111fix2
2004-02-02 19:09:11 +00:00
474f8d03ad INTEGRATION: CWS geordi2q14 (1.2.20); FILE MERGED
2004/01/30 13:11:46 hr 1.2.20.1: #111934#: merge CWS ooo111fix2
2004-02-02 19:08:54 +00:00
ba4197951d INTEGRATION: CWS sdk08 (1.1.2); FILE ADDED
2003/09/29 14:56:00 jsc 1.1.2.1: #110913# new, used in WAR file
2003-10-20 12:13:07 +00:00
b8f7e72ef4 INTEGRATION: CWS sdk08 (1.3.58); FILE MERGED
2003/09/29 14:55:24 jsc 1.3.58.1: #110913# create and use WAR file
2003-10-20 12:13:00 +00:00
879b4d8f4b INTEGRATION: CWS sdk08 (1.11.30); FILE MERGED
2003/09/29 14:55:23 jsc 1.11.30.1: #110913# create and use WAR file
2003-10-20 12:12:48 +00:00
e1de8c35b5 INTEGRATION: CWS sdk08 (1.6.30); FILE MERGED
2003/09/29 14:55:23 jsc 1.6.30.1: #110913# create and use WAR file
2003-10-20 12:12:38 +00:00
50976fbe90 INTEGRATION: CWS sdk08 (1.1.102); FILE MERGED
2003/09/29 14:55:23 jsc 1.1.102.1: #110913# create and use WAR file
2003-10-20 12:12:27 +00:00
98a20d69a5 INTEGRATION: CWS sdk04 (1.10.6); FILE MERGED
2003/06/24 11:11:31 jsc 1.10.6.1: #110313# insert source license header
2003-06-30 14:54:03 +00:00
7a5f6b110b INTEGRATION: CWS sdk04 (1.5.50); FILE MERGED
2003/06/24 11:11:31 jsc 1.5.50.1: #110313# insert source license header
2003-06-30 14:53:49 +00:00
b684d8434c INTEGRATION: CWS sdk02 (1.9.6); FILE MERGED
2003/05/14 11:46:08 jsc 1.9.6.1: #109045# insert JAVAC_FLAGS option
2003-06-10 09:46:27 +00:00
c38d3aa0d3 INTEGRATION: CWS sdk01 (1.5.12.1.6); FILE MERGED
2003/03/13 09:05:27 jsc 1.5.12.1.6.1: #108153# improve usability
2003-04-17 08:44:07 +00:00
62c63d3402 MWS_SRX644: migrate branch mws_srx644 -> HEAD 2003-03-26 12:40:54 +00:00
54d89d1efb #107931# synch with OOO_STABLE_1 2003-02-28 16:17:52 +00:00
3b906d275d #99053# new build env 2002-12-19 21:54:08 +00:00
bc10af10dd #101518# Improved working directory. 2002-09-06 14:26:20 +00:00
e293204328 #101518# Replace back slashes with slashes and append a slash. 2002-08-08 15:18:44 +00:00
35d7c85b86 #100870# 2002-07-05 07:04:45 +00:00
2b27c9648f #99053# change classpath settings 2002-07-01 10:17:45 +00:00
cf5ce57545 #99053# update docu 2002-07-01 10:08:57 +00:00
d5ab3c130d #99053# change CLASSPATH 2002-05-08 15:19:55 +00:00
4b3ec1c079 #87796# Replaced XMultiServiceFactory with XMultiComponentFactory. 2001-12-10 17:37:23 +00:00
884b12c076 #87796# change for new settings.mk 2001-09-21 14:40:45 +00:00
ac50b4f05b Added new Java servlet example. 2001-09-18 08:21:16 +00:00