Commit Graph

19 Commits

Author SHA1 Message Date
af572d9fbb Related: #i121577# Allow setting toolbar name in Addons.xcu
(cherry picked from commit 96cd87ec89e5ebe9d174c90b0f2cab96b3772732)

Conflicts:
	odk/examples/cpp/complextoolbarcontrols/CalcWindowState.xcu
	odk/examples/cpp/complextoolbarcontrols/WriterWindowState.xcu
	odk/examples/java/Inspector/Inspector.java

Change-Id: I6a0c1a657c6084df4efd8e150dc252155b32ba0b
2013-06-24 11:54:45 +01:00
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
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
4c44f82eb5 fix invalid XML 2010-11-24 14:20:54 +01: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
bb1350309b INTEGRATION: CWS ab43_SRC680 (1.1.2); FILE ADDED
2008/01/16 17:19:50 ab 1.1.2.1: #i85302# Extensible help SDK sample
2008-01-28 12:57:16 +00:00
e7574b049f INTEGRATION: CWS ab43_SRC680 (1.1.2); FILE ADDED
2008/01/16 17:20:27 ab 1.1.2.1: #i85302# Extensible help SDK sample
2008-01-28 12:57:04 +00:00
d666846449 INTEGRATION: CWS ab43_SRC680 (1.1.2); FILE ADDED
2008/01/16 17:20:12 ab 1.1.2.1: #i85302# Extensible help SDK sample
2008-01-28 12:56:53 +00:00
65aad1b297 INTEGRATION: CWS ab43_SRC680 (1.1.2); FILE ADDED
2008/01/16 17:17:44 ab 1.1.2.1: #i85302# Extensible help SDK sample
2008-01-28 12:56:42 +00:00
a22aefbc65 INTEGRATION: CWS ab43_SRC680 (1.1.2); FILE ADDED
2008/01/16 17:18:21 ab 1.1.2.1: #i85302# Extensible help SDK sample
2008-01-28 12:56:31 +00:00
d383ea9419 INTEGRATION: CWS ab43_SRC680 (1.1.2); FILE ADDED
2008/01/16 17:18:03 ab 1.1.2.1: #i85302# Extensible help SDK sample
2008-01-28 12:56:19 +00:00
2d3757dda4 INTEGRATION: CWS ab43_SRC680 (1.1.2); FILE ADDED
2008/01/16 17:11:45 ab 1.1.2.1: #i85302# Extensible help SDK sample
2008-01-28 12:56:06 +00:00
c2aa2fb413 INTEGRATION: CWS ab43_SRC680 (1.1.2); FILE ADDED
2008/01/16 17:13:32 ab 1.1.2.1: #i85302# Extensible help SDK sample
2008-01-28 12:55:55 +00:00
9f44a2b806 INTEGRATION: CWS ab43_SRC680 (1.1.2); FILE ADDED
2008/01/16 17:12:42 ab 1.1.2.1: #i85302# Extensible help SDK sample
2008-01-28 12:55:44 +00:00
2081f4d1aa INTEGRATION: CWS ab43_SRC680 (1.1.2); FILE ADDED
2008/01/16 17:13:16 ab 1.1.2.1: #i85302# Extensible help SDK sample
2008-01-28 12:55:33 +00:00
e908320dc2 INTEGRATION: CWS ab43_SRC680 (1.1.2); FILE ADDED
2008/01/16 17:12:59 ab 1.1.2.1: #i85302# Extensible help SDK sample
2008-01-28 12:55:23 +00:00
3ee9f01559 INTEGRATION: CWS ab43_SRC680 (1.1.2); FILE ADDED
2008/01/16 17:14:47 ab 1.1.2.1: #i85302# Extensible help SDK sample
2008-01-28 12:55:11 +00:00
59cb30cf74 INTEGRATION: CWS ab43_SRC680 (1.1.2); FILE ADDED
2008/01/17 09:21:24 ab 1.1.2.2: #i85302# Removed apostrophe in comment text causing problems with make
2008/01/16 17:15:04 ab 1.1.2.1: #i85302# Extensible help SDK sample
2008-01-28 12:55:01 +00:00
bcc64754f2 INTEGRATION: CWS ab43_SRC680 (1.1.2); FILE ADDED
2008/01/16 17:14:28 ab 1.1.2.1: #i85302# Extensible help SDK sample
2008-01-28 12:54:50 +00:00