Commit Graph

43 Commits

Author SHA1 Message Date
2250429dda Related: #i121442# Add sed and cat as dependencies to odk
(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-26 09:11:40 +01:00
06c7349758 Some HTML clean up
Change-Id: I5f1b5d5e5fc59bc1496a292a5f002d87584732a4
2013-06-05 11:06:14 +02:00
6f749e9595 odk: remove duplicative setsdenv_unix.csh
Having to maintain only one of these seems easier, and likely nobody
uses csh any more.

Change-Id: Ia4ddb54d27999fbf17ceea0b8bd76e59a29b023d
2013-04-10 16:21:42 +02:00
87d46d5b42 bump copyright year + small fixes in SDK docs
Change-Id: Iff9f11c043be5234dae43e8c3c93155019f6cf08
2013-02-06 16:46:06 +01: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
6c412d2e69 change Privacy and Legal URLs in API doc 2012-03-13 11:53:05 +01:00
e1d42d4040 css tweaks and LibreOffice branding 2011-09-07 00:20:01 +02:00
f465c23f91 add LibreOffice branding: logos and colors 2011-09-03 18:27:35 +02:00
a613c9ad5b Some OOo -> LO changes (hopeful nothing broke with them) 2011-03-24 09:40:09 +01:00
f5e707cdeb gridcontrol04: i112401: correct version number 2010-06-15 06:41:02 +02:00
9f01eba054 nativea: SDK rebranding 2010-03-30 18:16:13 +02:00
e19bda917c sdk330: #i109273#: change copyright 2010-02-15 09:59:02 +01:00
c5b6d47deb #i106585# update docu for Java 5 2009-11-09 16:25:34 +00:00
72b0b03c84 CWS-TOOLING: integrate CWS jsc320
2009-07-31 11:40:04 +0200 jsc  r274518 : #103926# apply patch
2009-07-16 17:17:01 +0200 jsc  r274063 : #i103311# check new Solaris compiler version ox5100
2009-07-07 17:20:41 +0200 jsc  r273811 : cleanup
2009-07-07 15:21:26 +0200 jsc  r273799 : #98322# correct LD_LIBRARY_PATH, sdk/lib dir instead of sdkout/platfrom/lib, all unix excepting mac
2009-07-07 15:07:05 +0200 jsc  r273798 : #i98322# correct link
2009-07-07 09:43:57 +0200 jsc  r273773 : #i98322# correct link path
2009-07-06 15:49:07 +0200 jsc  r273749 : #i98322# correct typo
2009-07-06 14:17:27 +0200 jsc  r273743 : #i103311# support sunstudio compiler 12u1, version 5.10 (which results in 0x5100)
2009-07-03 13:54:58 +0200 jsc  r273693 : #i96576# support opensolaris and enhance docu to relfect usage of gmake
2009-07-02 13:12:02 +0200 jsc  r273643 : #i103260# improve fix by using EXECPOST variable
2009-07-02 13:11:30 +0200 jsc  r273642 : #i103260# improve fix by using EXECPOST variable
2009-07-02 13:05:35 +0200 jsc  r273640 : #i103260# correct typo for windows
2009-07-02 13:01:34 +0200 jsc  r273639 : #i103260# provide regview with path as argument
2009-07-01 07:18:01 +0200 jsc  r273541 : CWS-TOOLING: rebase CWS jsc320 to trunk@273468 (milestone: DEV300:m51)
2009-06-30 08:01:13 +0200 jsc  r273485 : #98322# include import purpenvhelper lib under windows
2009-06-10 15:07:29 +0200 jsc  r272815 : CWS-TOOLING: rebase CWS jsc320 to trunk@272291 (milestone: DEV300:m49)
2009-05-27 09:36:23 +0200 jsc  r272329 : #i98322# create link for purpenvhelper library in SDK
2009-05-27 09:35:41 +0200 jsc  r272328 : #i98322# create link for purpenvhelpr library in SDK
2009-05-14 16:19:41 +0200 jsc  r271900 : increase version number in SDK header image
2009-05-14 16:11:05 +0200 jsc  r271899 : #i101408# new version 3.2
2009-05-14 15:33:47 +0200 jsc  r271894 : #i99163# apply patch to correct wrong tags for autodoc
2009-05-14 14:49:58 +0200 jsc  r271889 : #i99707# apply patch to remove unused code
2009-08-06 07:01:05 +00:00
f4a2f19886 CWS-TOOLING: integrate CWS jsc311 2008-10-01 08:05:58 +00:00
93532bf025 INTEGRATION: CWS jsc21 (1.27.2); FILE MERGED
2008/07/03 16:02:02 jsc 1.27.2.2: #88797# rework optional module, make standalone product
2008/05/27 18:27:02 jsc 1.27.2.1: #i88797# update compiler versions
2008-07-11 13:14:55 +00:00
f17e3d2dcc INTEGRATION: CWS jsc20 (1.26.152); FILE MERGED
2008/01/08 15:35:48 jsc 1.26.152.1: #i82046# adapt DevGuide links to wiki
2008-01-28 15:15:42 +00:00
67d4a3fa45 INTEGRATION: CWS sdkinstaller2 (1.25.4); FILE MERGED
2005/11/11 12:19:13 jsc 1.25.4.1: #i57724# correct reference to user specific setsdkenv_windows.bat (windows only)
2005-12-14 09:04:32 +00:00
d7a35aea43 INTEGRATION: CWS sdkinstaller (1.24.14); FILE MERGED
2005/10/20 14:32:08 jsc 1.24.14.1: #124595# reviewed
2005-11-09 08:30:17 +00:00
2d41610e4e INTEGRATION: CWS sb31 (1.23.2); FILE MERGED
2005/05/04 12:51:21 sb 1.23.2.1: #121393# Adapted the SDK to work with either an Office or a URE.
2005-06-17 08:38:19 +00:00
1e75ff77d9 INTEGRATION: CWS sdkdevguide (1.22.8); FILE MERGED
2005/04/14 11:27:51 jsc 1.22.8.1: #120062# adapt year 2004 -> 2005
2005-04-18 08:15:58 +00:00
3d10f0ccb8 INTEGRATION: CWS sdkbugfix01 (1.21.6); FILE MERGED
2005/02/17 15:40:07 jsc 1.21.6.1: #i42831# correct links
2005-03-01 11:08:14 +00:00
4bc2150e68 INTEGRATION: CWS sdksample (1.19.4); FILE MERGED
2005/01/27 17:06:49 jsc 1.19.4.10: #i38748# correct typo
2005/01/11 10:33:15 jsc 1.19.4.9: #i39817# change zip version
2004/12/21 17:15:15 jsc 1.19.4.8: #i38748# redesigned and updated
2004/11/26 17:18:58 jsc 1.19.4.7: #i37906# insert link to OASIS, update links to DevGuide
2004/10/22 09:40:47 jsc 1.19.4.6: #i35871# adapt for Java 5.0
2004/10/04 13:45:58 jsc 1.19.4.5: RESYNC: (1.19-1.20); FILE MERGED
2004/08/05 12:01:16 jsc 1.19.4.4: #i29308# modify C++ compiler version for Windows
2004/08/04 12:38:22 jsc 1.19.4.3: #i29308# insert docu for .NET framework
2004/07/21 12:45:04 jsc 1.19.4.2: i29308# inset UNO_PATH variable for new bootstrap mechanism
2004/06/21 07:48:56 jsc 1.19.4.1: #i26335# insert zip docu
2005-01-31 14:56:26 +00:00
d0c234f6d0 INTEGRATION: CWS jl2 (1.17.6); FILE MERGED
2004/07/26 09:57:11 jl 1.17.6.4: RESYNC: (1.18-1.19); FILE MERGED
2004/05/26 11:49:08 jl 1.17.6.3: RESYNC: (1.17-1.18); FILE MERGED
2003/11/11 10:00:09 jl 1.17.6.2: #i22191# integratring Cli-uno examples into SDK
2003/11/10 15:52:36 jl 1.17.6.1: #i22191# integratring Cli-uno examples into SDK
2004-08-23 12:16:16 +00:00
9d23e68a98 INTEGRATION: CWS sdk13 (1.17.40); FILE MERGED
2004/05/12 14:06:43 jsc 1.17.40.4: #116705# improve output
2004/05/12 13:52:54 jsc 1.17.40.3: #116705# insert descr for optional output dir
2004/05/12 10:04:37 jsc 1.17.40.2: RESYNC: (1.17-1.18); FILE MERGED
2004/05/11 12:16:47 jsc 1.17.40.1: #116705# ask for optional output directory
2004-05-18 12:19:00 +00:00
4e6021c226 INTEGRATION: CWS sdk12bugfix (1.17.30); FILE MERGED
2004/02/27 14:32:50 jsc 1.17.30.1: #110612# extend docu
2004-03-17 10:51:21 +00:00
b8774aa277 INTEGRATION: CWS sdk08 (1.16.30); FILE MERGED
2003/10/16 13:56:21 jsc 1.16.30.2: #112579# change staroffice version number
2003/09/19 13:51:26 jsc 1.16.30.1: #110082# renamed configure file for windows
2003-10-20 12:11:23 +00:00
3043f11e61 INTEGRATION: CWS sdk04 (1.14.6); FILE MERGED
2003/06/25 07:39:33 jsc 1.14.6.2: #110423# resolve merge conflicts
2003/06/24 11:06:07 jsc 1.14.6.1: #110423# insert workaround for IE6
2003-06-30 14:03:52 +00:00
4ba5893cde INTEGRATION: CWS sdk03 (1.14.2); FILE MERGED
2003/06/11 21:31:09 mi 1.14.2.1: #107198# ALT tags inserted for acessibility
2003-06-20 09:12:28 +00:00
541a6a9fb0 INTEGRATION: CWS sdk02 (1.13.6); FILE MERGED
2003/06/06 11:35:47 jsc 1.13.6.4: #109632# use new logo_color style
2003/05/28 14:28:58 jsc 1.13.6.3: #109909# prepare branding
2003/05/14 10:36:52 jsc 1.13.6.2: #109632# set background color
2003/05/09 10:04:07 jsc 1.13.6.1: #109284# remove links to configure scripts because they are not really needed
2003-06-10 09:03:11 +00:00
0d930c589d INTEGRATION: CWS sdk01 (1.8.4.1.6); FILE MERGED
2003/03/13 11:03:43 jsc 1.8.4.1.6.2: #107906# improve usability
2003/03/12 09:25:04 jsc 1.8.4.1.6.1: #107916# change Java requirements
2003-04-17 08:38:38 +00:00
61218185e7 #107931# synch with OOO_STABLE_1 2003-02-28 16:54:30 +00:00
3f148f03a0 #99053# lingu review 2003-01-14 11:07:55 +00:00
b1cb0a81b9 #99053# change variable names 2003-01-08 14:29:37 +00:00
5044eda68d #99053# updated 2003-01-03 15:54:38 +00:00
9615f48418 #99053# insert stylesheets for some color settings 2002-10-23 15:28:51 +00:00
bbe74bb9e1 #100528# Rename 'configureUnix' to 'configure'. 2002-07-18 09:45:43 +00:00
b5c4156758 #99053# change title 2002-07-15 06:57:00 +00:00
259133b160 #100528# Customize the documenation to the new scripts. 2002-07-01 15:12:04 +00:00
8b94a1b8ad #99053# correct spelling 2002-06-06 07:09:05 +00:00
065ad27b6b #99053# insert env varible for auto deployment 2002-05-28 10:26:40 +00:00
3176d04998 #99053# insert links 2002-05-28 06:24:06 +00:00
bc0ce24428 #99053# new docu html files 2002-05-07 12:03:23 +00:00