Kaydet (Commit) 4c463afb authored tarafından Lars Langhans's avatar Lars Langhans

sb123:merge

<html>
<head>
<title>OpenOffice.org 3.2 SDK - Installation Guide</title>
<title>OpenOffice.org %PRODUCT_RELEASE% SDK - Installation Guide</title>
<link rel="stylesheet" type="text/css" href="sdk_styles.css">
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<meta name="author" content="J&uuml;rgen Schmidt">
......@@ -36,16 +36,16 @@
<table class="table3">
<tr>
<td colspan="2">
<p>The OpenOffice.org 3.2 SDK comes with a set of development tools, base
<p>The OpenOffice.org %PRODUCT_RELEASE% SDK comes with a set of development tools, base
libraries, header files and helper class files that can be used to
develop Java/C++ components, to embed the OpenOffice.org 3.2 application in
develop Java/C++ components, to embed the OpenOffice.org %PRODUCT_RELEASE% application in
your own programs, or to use the API (scripting or remote control the
office). For a complete working environment, we have some additional
requirements:</p>
</td>
</tr>
<tr valign="top">
<td><b>OpenOffice.org 3.2 installation</td>
<td><b>OpenOffice.org %PRODUCT_RELEASE% installation</td>
<td class="content80">The SDK works on top of an existing office
installation and uses the same libraries as the office installation.</td>
</tr>
......@@ -218,7 +218,7 @@
the output is generated in the SDK directory itself. If an output
directory is specified, the output is generated in a SDK dependent
subdirectory in this directory (e.g. &lt;OO_SDK_OUTPUT_DIR&gt;
/OpenOffice.org 3.2/LINUXExample.out)</td>
/OpenOffice.org %PRODUCT_RELEASE%/LINUXExample.out)</td>
</tr>
<tr>
<td class="cell20"><b>SDK_AUTO_DEPLOYMENT</b></td>
......
<html><head> <title>OpenOffice.org 3.2 SDK - Not supported page</title> <link rel="stylesheet" type="text/css" href="sdk_styles.css"> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> <meta name="author" content="J&uuml;rgen Schmidt"> <meta name="created" content="2004-12-14"></head><body class="sdkbody"><table class="table1" cellpadding=0> <tr style="background-image:url(images/sdk_head-2.gif); backgorund-position: bottom; "> <td colspan="2" align="left"><img src="images/sdk_head-1.gif" width="335" height="109" usemap="#Map" border="0"></td> <td align=right><img src="images/sdk_head-3.gif" width="32" height="109"></td> </tr> <tr> <td colspan="3"><img class="nothing10" src="images/nada.gif"></td> </tr> <tr> <td colspan="3"> <table class="table2"> <tr> <td> <p align="center"><a href="../index.html" title="link to the SDK start page"><img class="navigate" src="images/nav_home.png"></a></p> </td> </tr> <tr> <td><img class="nothing8" src="images/nada.gif"></td> </tr> <tr> <td> <p class="note">This page is currently not supported!</p> </td> </tr> </table> </td> </tr> <tr> <td colspan="3"><img class="nothing30" src="images/nada.gif"></td> </tr> <tr> <td colspan="3"><img class="line" src="images/sdk_line-1.gif"></td> </tr> <tr> <td colspan="3"> <div class="centertext">
<html><head> <title>OpenOffice.org %PRODUCT_RELEASE% SDK - Not supported page</title> <link rel="stylesheet" type="text/css" href="sdk_styles.css"> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> <meta name="author" content="J&uuml;rgen Schmidt"> <meta name="created" content="2004-12-14"></head><body class="sdkbody"><table class="table1" cellpadding=0> <tr style="background-image:url(images/sdk_head-2.gif); backgorund-position: bottom; "> <td colspan="2" align="left"><img src="images/sdk_head-1.gif" width="335" height="109" usemap="#Map" border="0"></td> <td align=right><img src="images/sdk_head-3.gif" width="32" height="109"></td> </tr> <tr> <td colspan="3"><img class="nothing10" src="images/nada.gif"></td> </tr> <tr> <td colspan="3"> <table class="table2"> <tr> <td> <p align="center"><a href="../index.html" title="link to the SDK start page"><img class="navigate" src="images/nav_home.png"></a></p> </td> </tr> <tr> <td><img class="nothing8" src="images/nada.gif"></td> </tr> <tr> <td> <p class="note">This page is currently not supported!</p> </td> </tr> </table> </td> </tr> <tr> <td colspan="3"><img class="nothing30" src="images/nada.gif"></td> </tr> <tr> <td colspan="3"><img class="line" src="images/sdk_line-1.gif"></td> </tr> <tr> <td colspan="3"> <div class="centertext">
<p><img class="oraclelogo" src="images/odk-footer-logo.gif" title="Sponsored by Oracle" alt="Oracle Logo" />
Copyright &copy; 2010, Oracle and/or its affiliates. All rights reserved. Oracle and Java are registered trademarks of Oracle and/or its affiliates. Other names may be trademarks of their respective owners.<p>
</div> </td> </tr></table><map name="Map"> <area shape="rect" coords="10,68,93,105" href="http://www.sun.com"></map></body></html>
<html>
<head>
<title>OpenOffice.org 3.2 SDK SDK - Development Tools</title>
<title>OpenOffice.org %PRODUCT_RELEASE% SDK - Development Tools</title>
<link rel="stylesheet" type="text/css" href="sdk_styles.css">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="author" content="J&uuml;rgen Schmidt">
......@@ -145,7 +145,7 @@
office installation. UNO packages are UNO components (single libraries or
Jar files or more complex zip files that contains one or more libraries|
Jar files, type libraries and configuration items), scripts and
OpenOffice.org 3.2 Basic libraries as zip package. 'unopkg' is not part of the
OpenOffice.org %PRODUCT_RELEASE% Basic libraries as zip package. 'unopkg' is not part of the
SDK but comes with the office directly and is a development tool as well
as an end user tool to deploy extension into an office installation.</p>
<p>More details concerning deployment and this tool can be find in the
......
This diff is collapsed.
<html>
<head>
<title>OpenOffice.org 3.2 SDK - SDK</title>
<title>OpenOffice.org %PRODUCT_RELEASE% SDK - Overview</title>
<link rel="stylesheet" type="text/css" href="docs/sdk_styles.css">
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<meta name="author" content="J&uuml;rgen Schmidt">
......@@ -21,12 +21,12 @@
<tr>
<td><img class="nothing8" src="docs/images/nada.gif"></td>
<td>
<p>OpenOffice.org 3.2 software is a complete, feature-rich
<p>OpenOffice.org %PRODUCT_RELEASE% software is a complete, feature-rich
office productivity suite that provides, in combination with this
SDK, all the essential tools for building and deploying custom
solutions that build on, or integrate with, the OpenOffice.org 3.2 suite
solutions that build on, or integrate with, the OpenOffice.org %PRODUCT_RELEASE% suite
of products.</p>
<p>The SDK is a development kit for OpenOffice.org 3.2, which
<p>The SDK is a development kit for OpenOffice.org %PRODUCT_RELEASE%, which
eases the development of office components. It provides a set of
libraries, binaries, header, and IDL files which have final API's
and can only be extended with new functionality. This set of libraries
......@@ -41,8 +41,8 @@
with new functions.</p>
<p>The SDK provides the basic building blocks for external developers
to develop components in any language for which a binding exists.
Currently, there are language bindings for OpenOffice.org 3.2 Basic, Java,
and different C++ compilers on different platforms, for OpenOffice.org 3.2,
Currently, there are language bindings for OpenOffice.org %PRODUCT_RELEASE% Basic, Java,
and different C++ compilers on different platforms, for OpenOffice.org %PRODUCT_RELEASE%,
thus covering the two most commonly used programming languages. There
will be no limit for office automation in heterogeneous environments.
Currently supported platforms of the SDK are Linux, Solaris (sparc,
......@@ -83,7 +83,7 @@
<tr valign="top">
<td class="content4"><img src="docs/images/arrow-1.gif"></td>
<td colspan="2"><a href="http://wiki.services.openoffice.org/wiki/Documentation/DevGuide/OpenOffice.org_Developers_Guide" title="link to the Developer's Guide in the Wiki">Developer's Guide</a></td>
<td class="content70">Detailed documentation, explaining the OpenOffice.org 3.2
<td class="content70">Detailed documentation, explaining the OpenOffice.org %PRODUCT_RELEASE%
API and the concepts behind it, with a rich set of examples,
implemented mainly in Java. This documentation is online in the
OpenOffice.org Wiki.</td>
......@@ -91,7 +91,7 @@
<tr valign="top">
<td class="content4"><img src="docs/images/arrow-1.gif"></td>
<td colspan="2"><a href="docs/common/ref/com/sun/star/module-ix.html" title="link to the IDL reference documentation">IDL Reference</a></td>
<td class="content70">Complete OpenOffice.org 3.2 API reference.</td>
<td class="content70">Complete OpenOffice.org %PRODUCT_RELEASE% API reference.</td>
</tr>
<tr valign="top">
<td class="content4"><img src="docs/images/arrow-1.gif"></td>
......@@ -132,7 +132,7 @@
Office Applications (OpenDocument) Technical Committee where you
can find the latest information about the OASIS Open Document XML
file format which is the default document format
for OpenOffice.org 3.2.</td>
for OpenOffice.org %PRODUCT_RELEASE%.</td>
</tr>
<tr valign="top">
<td class="content4"><img src="docs/images/arrow-1.gif"></td>
......@@ -147,7 +147,7 @@
<tr valign="top">
<td class="content4"><img src="docs/images/arrow-1.gif"></td>
<td colspan="2"><a href="share/readme/LICENSE_en-US.html" title="link to the SDK license file">License</a></td>
<td class="content70">The license for the OpenOffice.org 3.2 SDK.</td>
<td class="content70">The license for the OpenOffice.org %PRODUCT_RELEASE% SDK.</td>
</tr>
<tr valign="middle">
<td><img class="nothing10" src="docs/images/nada.gif"></td>
......
......@@ -241,7 +241,7 @@ $(DESTDIRSETTINGS)/dk.mk : dk.mk
tr -d "\015" < dk.mk | sed -e 's/@@RELEASE@@/$(PRODUCT_RELEASE)/' -e 's/@@BUILDID@@/$(RSCREVISION)/'> $@
$(CONVERTTAGFLAG) : $(DOCUHTMLFILES)
$(PERL) $(CONVERTTAGSCRIPT) 1 "$(TITLE)" "$(OFFICEPRODUCTNAME)" $(DOCUHTMLFILES)
# $(PERL) $(CONVERTTAGSCRIPT) 1 "$(TITLE)" "$(OFFICEPRODUCTNAME)" $(DOCUHTMLFILES)
@echo "tags converted" > $@
$(IDL_DOCU_CLEANUP_FLAG) : $(IDL_CHAPTER_REFS) $(PRJ)/docs/common/ref/idl.css $(DESTIDLLIST)
......
......@@ -32,8 +32,16 @@ OFFICE_SERVICES=$(subst \\,\,$(OFFICE_BASE_PROGRAM_PATH)$(PS)services.rdb)
OFFICE_TYPE_LIBRARY="$(OFFICE_TYPES)"
JAVA_OPTIONS=
ifneq "$(OO_SDK_JAVA_HOME)" ""
JAVA_BITS := $(shell $(OO_SDK_JAVA_HOME)/$(JAVABIN)/java -version 2>&1 | tail -1 | cut -d " " -f3)
ifeq "$(JAVA_BITS)" "64-Bit"
JAVA_OPTIONS=-d32
endif
endif
DEPLOYTOOL="$(OFFICE_PROGRAM_PATH)$(PS)unopkg" add -f
SDK_JAVA="$(OO_SDK_JAVA_HOME)/$(JAVABIN)/java"
SDK_JAVA="$(OO_SDK_JAVA_HOME)/$(JAVABIN)/java" $(JAVA_OPTIONS)
SDK_JAVAC="$(OO_SDK_JAVA_HOME)/$(JAVABIN)/javac"
SDK_JAR="$(OO_SDK_JAVA_HOME)/$(JAVABIN)/jar"
SDK_ZIP="$(OO_SDK_ZIP_HOME)/zip"
......
......@@ -28,15 +28,15 @@
$(DESTDIRDOCU)/%.html : $(PRJ)/docs/%.html
@@-rm -f $@
$(MY_TEXTCOPY) $< $@
tr -d "\015" < $< | sed -e 's/%PRODUCT_RELEASE%/$(PRODUCT_RELEASE)/g' > $@
$(DESTDIREXAMPLES)/%.html : $(PRJ)/examples/%.html
@@-rm -f $@
$(MY_TEXTCOPY) $< $@
tr -d "\015" < $< | sed -e 's/%PRODUCT_RELEASE%/$(PRODUCT_RELEASE)/g' > $@
$(DESTDIR)/index.html : $(PRJ)/index.html
@@-rm -f $@
$(MY_TEXTCOPY) $< $@
tr -d "\015" < $< | sed -e 's/%PRODUCT_RELEASE%/$(PRODUCT_RELEASE)/g' > $@
$(DESTDIRDOCU)/%.css : $(PRJ)/docs/%.css
@@-rm -f $@
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment