diff options
Diffstat (limited to 'odk')
| -rw-r--r-- | odk/docs/install.html | 58 | ||||
| -rw-r--r-- | odk/docs/notsupported.html | 8 | ||||
| -rw-r--r-- | odk/docs/tools.html | 62 | ||||
| -rw-r--r-- | odk/index.html | 56 | ||||
| -rw-r--r-- | odk/pack/copying/makefile.mk | 278 | ||||
| -rw-r--r-- | odk/util/makefile.pmk | 4 |
6 files changed, 263 insertions, 203 deletions
diff --git a/odk/docs/install.html b/odk/docs/install.html index 96328922d802..533683abbf3d 100644 --- a/odk/docs/install.html +++ b/odk/docs/install.html @@ -51,8 +51,8 @@ <blockquote> <table width="100%" border="0" cellpadding="4"> <tr> - <td colspan="4" align=center><a name="examples"/><font size="6"><b>Installation guide</b></font> - <a href="../index.html">SDK home</a> + <td colspan="4" align=center><font size="6"><b>Installation guide</b></font> + <a href="../index.html" title="link to the SDK start page">SDK home</a> </td> </tr> <tr> @@ -71,27 +71,27 @@ the office installation. <dt><b>JDK (1.3.1_02 or higher)</b> <dd>A JDK is necessary for developing Java components or applications. An appropriate Java - SDK can be found on <a target="_blank" href="http://java.sun.com/products"> + SDK can be found on <a target="_blank" href="http://java.sun.com/products" title="link to the Java SDK download page (online)"> http://java.sun.com/products</a>. <dt><b>C++ compiler</b> - <dd>A C++ compler is necessary for developing C++ components or applications. UNO depends + <dd>A C++ compiler is necessary for developing C++ components or applications. UNO depends on a compiler dependent language binding so that we use the appropriate compiler where a - language binsing exists:<br> + language binding exists:<br> Solaris, Sun WorkShop 6 update 1 C++ 5.2 2000/09/11<br> Linux, GNU C++ compiler, gcc version 3.0.1<br> Windows, Microsoft C++ Compiler, Microsoft Developer Studio 6.0 (cl, version 12.00.8168) <dt><b>GNU make (3.79.1 or higher)</b> <dd>GNU make is used to build the examples of the SDK. GNU make is available from - <a target="_blank" href="http://www.gnu.org">http://www.gnu.org</a>, it can be ftped via - <a target="_blank" href="ftp://ftp.gnu.org/gnu/make">ftp://ftp.gnu.org/gnu/make</a><br> + <a target="_blank" href="http://www.gnu.org" title="link the www.gnu.org (online)">http://www.gnu.org</a>, it can be ftped via + <a target="_blank" href="ftp://ftp.gnu.org/gnu/make" title="link to gnumake on www.gnu.org (online)">ftp://ftp.gnu.org/gnu/make</a><br> NOTE: Windows user can find an executable of gnu make under - <a target="_blank" href="http://www.nextgeneration.dk/gnu/make.zip"> + <a target="_blank" href="http://www.nextgeneration.dk/gnu/make.zip" title="link to a windows version of gnumake on www.nextgeneration.dk (online)"> http://www.nextgeneration.dk/gnu/make.zip</a>. It is not recommended to use the Cygwin make, because it does not work well. <dt><b>STLPORT (4.5.3)</b> <dd>Some examples use the STL. If you want to test this example, you have to install - a vesion of the STLPORT library on your machine. The STLPORT library is available from - <a target="_blank" href="http://www.stlport.org">http://www.stlport.org</a>. + a version of the STLPORT library on your machine. The STLPORT library is available from + <a target="_blank" href="http://www.stlport.org" title="link to www.stlport.org (online)">http://www.stlport.org</a>. </dl> <p>The SDK provides a configure script (Unix and WindowsNT/2000/XP) that asks for relevant directories (SDK, StarOffice, GNU make, Java, C++, STLPORT and ANT). After completing the @@ -99,15 +99,15 @@ necessary environment variables for using the SDK and the required tools. </p> <ul> - <li><a href="../configure">configure</a> -> for Unix - <li><a href="../configureWindowsNT.bat">configureWindowsNT.bat</a> -> for + <li><a href="../configure" title="link to the Unix configure script (Unix only)">configure</a> -> for Unix + <li><a href="../configureWindowsNT.bat" title="link to the windows configure batch file (windows only)">configureWindowsNT.bat</a> -> for WindowsNT/2000/XP </ul> <p>Other versions of the operating system Windows should use the batch program <OO_SDK_HOME>setsdkenv_windows.bat directly and adopt it to their local environment. </p> <ul> - <li><a href="../setsdkenv_windows.bat">setsdkenv_windows.bat</a> + <li><a href="../setsdkenv_windows.bat" title="link to the set SDK environment template script (windows only)">setsdkenv_windows.bat</a> </ul> <p>The first time you use the batch program, you must prepare it for your environment. Edit the script and set the following variables: @@ -116,12 +116,12 @@ <table width="100%" border=1 cellpadding=4 cellspacing=0> <tr> <td widht=35%><b>OFFICE_HOME</b></td> - <td widht=65%>path to an exisiting StarOffice™ or OpenOffice.org installation, e.g. - "/usr/local/StarOffice6.0"</td> + <td widht=65%>path to an existing StarOffice™ or OpenOffice.org installation, e.g. + "/usr/local/StarOffice6.0"</td> </tr> <tr> <td widht=35%><b>OO_SDK_HOME</b></td> - <td widht=65%>path to the SDK root directory, e.g "/usr/local/StarOffice6.0SDK"</td> + <td widht=65%>path to the SDK root directory, e.g. "/usr/local/StarOffice6.0SDK"</td> </tr> <tr> <td widht=35%><b>OO_SDK_JAVA_HOME</b></td> @@ -144,8 +144,8 @@ <td widht=35%><b>SDK_AUTO_DEPLOYMENT</b></td> <td widht=65%>if this variable is set, the component examples will be automatically deployed into the Office installation referenced by OFFICE_HOME. See also chapter - <a href="DevelopersGuide/Components/Components.htm#1+7+1+UNO+Package+Installation"> - "UNO Package installation"</a> from the Developer's Guide. + <a href="DevelopersGuide/Components/Components.htm#1+7+1+UNO+Package+Installation" title="link to "UNO package installation" chapter in the Developer's Guide"> + "UNO Package installation"</a> from the Developer's Guide. </tr> </table> </p> @@ -161,7 +161,7 @@ <td widht=65%><b>=<i>$OFFICE_HOME/program</i></b><br> This variable is used to register example components automatically in your Office installation. If you do not want automatic registration, - pleace comment this variable out in the script.</td> + please comment this variable out in the script.</td> </tr> <tr> <td widht=35%>LD_LIBRARY_PATH</td> @@ -205,15 +205,15 @@ <td widht=35%>PATH</td> <td widht=65%><b>=<i>$OO_SDK_HOME/linux/bin:$OO_SDK_MAKE_HOME:$OO_SDK_CPP_HOME:$OO_SDK_JAVA_HOME/bin: $PATH</i></b><br> - The PATH variable will be extended by the pathes for the SDK development tools, + The PATH variable will be extended by the paths for the SDK development tools, the compiler, the JDK and GNU make. </td> </tr> </table> - </p> + </p><br> <p><b>Environment variables for Windows</b></p> - <p> In addition to setting these environment variables, the script calls the "vcvar32.bat" - batch file, which is provided by the Microsoft Develper Studio to set the necessary + <p> In addition to setting these environment variables, the script calls the "vcvar32.bat" + batch file, which is provided by the Microsoft Developer Studio to set the necessary environment variables for the compiler. <table width="100%" border=1 cellpadding=4 cellspacing=0> <tr> @@ -221,13 +221,13 @@ <td widht=65%><b>=<i>%OFFICE_HOME%\program</i></b><br> This variable is used to register example components automatically in your Office installation. If you don't want automatic registration, - pleace comment this variable out in the script.</td> + please comment this variable out in the script.</td> </tr> <tr> <td widht=35%>PATH</td> <td widht=65%><b>=<i>%OO_SDK_HOME%\windows\bin;%OO_SDK_MAKE_HOME%;%OO_SDK_CPP_HOME%;%OO_SDK_JAVA_HOME% \bin;%OFFICE_PROGRAM_PATH%;%OO_STLPORT_HOME%\lib;%PATH%</i></b><br> - The PATH variable will be extended by the pathes for the SDK development tools, + The PATH variable will be extended by the paths for the SDK development tools, the compiler, the JDK, the STLPORT library, GNU make and the <OFFICE_PROGRAM_PATH>. </td> @@ -236,13 +236,13 @@ <td widht=35%>LIB</td> <td widht=65%><b>=<i>%OO_SDK_HOME%\windows\lib;%OO_STLPORT_HOME\lib;;%LIB%</i></b><br> The LIB variable will be extended by the path to the import libraries which are - necessary for winsows. + necessary for windows. </td> </tr> <tr> - <td colspan="2">Additionally to setting these environment varibales the script calls the - "vcvar32.bat" batch file which is provided by the Microsoft Develper Studio to set - the necessary environment variables for the compiler.</td> + <td colspan="2">Additionally to setting these environment variables the script calls the + "vcvar32.bat" batch file which is provided by the Microsoft Developer + Studio to set the necessary environment variables for the compiler.</td> </tr> </table> </p> diff --git a/odk/docs/notsupported.html b/odk/docs/notsupported.html index 9e1e5e53d4a7..41b83d558543 100644 --- a/odk/docs/notsupported.html +++ b/odk/docs/notsupported.html @@ -50,6 +50,14 @@ <td colspan="3" height="8"> <table width="100%" border="0" cellpadding="5"> <tr> + <td colspan="4" align=center><a href="../index.html" title="link to the SDK start page"> + SDK home</a> + </td> + </tr> + <tr> + <td colspan="4"> </td> + </tr> + <tr> <td> <p align=center><font SIZE=6><b><i>This page is currently not supported!<i></b></font></p> </td> diff --git a/odk/docs/tools.html b/odk/docs/tools.html index 188d74cb1d0d..a5b946cad111 100644 --- a/odk/docs/tools.html +++ b/odk/docs/tools.html @@ -51,7 +51,7 @@ <table width="100%" border="0" cellpadding="4"> <tr> <td colspan="4" align=center><a name="tools"/><font size="6"><b>Development Tools</b></font> - <a href="../index.html">SDK home</a> + <a href="../index.html" title="link to the SDK start page">SDK home</a> </td> </tr> <tr> @@ -60,7 +60,7 @@ <tr> <td width=2%></td> <td width=10%> - <font size="3"><a href="#idlc">idlc</a></font> + <font size="3"><a href="#idlc" title="link to the idlc tool description">idlc</a></font> </td> <td width=86%> The UNOIDL compiler, generates a common binary type library format as base for all codemaker @@ -71,7 +71,7 @@ <tr> <td width=2%></td> <td width=10%> - <font size="3"><a href="#cppumaker">cppumaker</a></font> + <font size="3"><a href="#cppumaker" title="link to the cppumaker tool description">cppumaker</a></font> </td> <td width=86%> Tool for generating C++ code for the UNOIDL types stored in a type library. @@ -81,7 +81,7 @@ <tr> <td width=2%></td> <td width=10%> - <font size="3"><a href="#javamaker">javamaker</a></font> + <font size="3"><a href="#javamaker" title="link to the javamaker tool description">javamaker</a></font> </td> <td width=86%> Tool for generating Java code for the UNOIDL types stored in a type library. @@ -91,7 +91,7 @@ <tr> <td width=2%></td> <td width=10%> - <font size="3"><a href="#rdbmaker">rdbmaker</a></font> + <font size="3"><a href="#rdbmaker" title="link to the rdbmaker tool description">rdbmaker</a></font> </td> <td width=86%> Tool for building type libraries with only a specified set of types and their dependencies. @@ -101,7 +101,7 @@ <tr> <td width=2%></td> <td width=10%> - <font size="3"><a href="#pkgchk">pkgchk</a></font> + <font size="3"><a href="#pkgchk" title="link to the pkgchk tool description">pkgchk</a></font> </td> <td width=86%> The UNO package deployment tool. @@ -111,7 +111,7 @@ <tr> <td width=2%></td> <td width=10%> - <font size="3"><a href="#regcomp">regcomp</a></font> + <font size="3"><a href="#regcomp" title="link to the regcomp tool description">regcomp</a></font> </td> <td width=86%> The UNO component registration tool. @@ -121,7 +121,7 @@ <tr> <td width=2%></td> <td width=10%> - <font size="3"><a href="#regmerge">regmerge</a></font> + <font size="3"><a href="#regmerge" title="link to the regmerge tool description">regmerge</a></font> </td> <td width=86%> Tool to merge several registry (type libraries) files into one file. @@ -131,7 +131,7 @@ <tr> <td width=2%></td> <td width=10%> - <font size="3"><a href="#regview">regview</a></font> + <font size="3"><a href="#regview" title="link to the regview tool description">regview</a></font> </td> <td width=86%> Tool to view the content of a registry key (type node). @@ -141,7 +141,7 @@ <tr> <td width=2%></td> <td width=10%> - <font size="3"><a href="#xml2cmp">xml2cmp</a></font> + <font size="3"><a href="#xml2cmp" title="link to the xml2cmp tool description">xml2cmp</a></font> </td> <td width=86%> A small helper tool to extract different information from xml module description files. @@ -151,7 +151,7 @@ <tr> <td width=2%></td> <td width=10%> - <font size="3"><a href="#unoexe">uno</a></font> + <font size="3"><a href="#unoexe" title="link to the uno tool description">uno</a></font> </td> <td width=86%> Tool to start UNO components and provide a UNO runtime environment. @@ -161,7 +161,7 @@ <tr> <td width=2%></td> <td width=10%> - <font size="3"><a href="#autodoc">autodoc</a></font> + <font size="3"><a href="#autodoc" title="link to the autodoc tool description">autodoc</a></font> </td> <td width=86%> Tool to generate javadoc-like documentation for C/C++ and UNOIDL files. @@ -197,12 +197,12 @@ <blockquote> <p><font size="5"><b><a name="idlc">idlc</a></b></font> - <a href="../index.html">SDK home</a> <a href="#tools">tools overview</a> + <a href="../index.html" title="link to the SDK start page">SDK home</a> <a href="#tools" title="link to the tools overview">tools overview</a> </p> <p>'idlc' is the UNOIDL compiler. It is a full featured compiler used to check UNODL type definitions and transform valid type definitions into a binary type library format, which is later used by all codemaker tools. It is also used as a dynamic type library for UNO at runtime.<br> - You can find a syntax description for UNOIDL <a href="notsupported.html">here</a>.</p> + You can find a syntax description for UNOIDL <a href="DevelopersGuide/Appendix/IDLSyntax/IDLSyntax.htm#1+UNOIDL+Syntax+Specification" title="link to the IDL syntax specification in the Developer's Guide">here</a>.</p> <p><b>Usage:</b></p> <blockquote> <b><code>idlc [-options] file_1 ... file_n | @<filename></code></b> @@ -288,7 +288,7 @@ <blockquote> <p><font size="5"><b><a name="cppumaker">cppumaker</a></b></font> - <a href="../index.html">SDK home</a> <a href="#tools">tools overview</a> + <a href="../index.html" title="link to the SDK start page">SDK home</a> <a href="#tools" title="link to the tools overview">tools overview</a> </p> <p>The cppumaker generates a C++ representation for idl types. The cppumaker works on a typelibrary, which is generated by the unoidl. It generates the output for all specified types and for all types @@ -403,7 +403,7 @@ <blockquote> <p><font size="5"><b><a name="javamaker">javamaker</a></b></font> - <a href="../index.html">SDK home</a> <a href="#tools">tools overview</a> + <a href="../index.html" title="link to the SDK start page">SDK home</a> <a href="#tools" title="link to the tools overview">tools overview</a> </p> <p>The javamaker generates the appropriate java file for each idl type. The javamaker works on a typelibrary which is generated by the unoidl. It generates the output for all specified @@ -466,7 +466,7 @@ <blockquote> <p><font size="5"><b><a name="rdbmaker">rdbmaker</a></b></font> - <a href="../index.html">SDK home</a> <a href="#tools">tools overview</a> + <a href="../index.html" title="link to the SDK start page">SDK home</a> <a href="#tools" title="link to the tools overview">tools overview</a> </p> <p>The rdbmaker generates subsets of the typelibrary. The rdbmaker works on a typelibrary that is generated by the unoidl. It generates a subset of the typelibrary, which contains all specified @@ -548,9 +548,9 @@ <blockquote> <p><font size="5"><b><A name="pkgchk">pkgchk (pkgchk.bin)</A></b></font> - <a href="../index.html">SDK home</a> <a href="#tools">tools overview</a> + <a href="../index.html" title="link to the SDK start page">SDK home</a> <a href="#tools" title="link to the tools overview">tools overview</a> </p> - <p>'pkgchk' is a tool for easy deployment of UNO packages in an exisiting office installation. + <p>'pkgchk' is a tool for easy deployment of UNO packages in an existing 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) and [PRODUCTNAME] libraries as zip package. More detailed information comes with the @@ -652,7 +652,7 @@ <blockquote> <p><font size="5"><b><A name="regcomp">regcomp</A></b></font> - <a href="../index.html">SDK home</a> <a href="#tools">tools overview</a> + <a href="../index.html" title="link to the SDK start page">SDK home</a> <a href="#tools" title="link to the tools overview">tools overview</a> </p> <p>'regcomp' is a tool to register|revoke external UNO components into|from a registry which is used for a UNO environment.</p> @@ -729,11 +729,11 @@ <blockquote> <p><font size="5"><b><A name="regmerge">regmerge</A></b></font> - <a href="../index.html">SDK home</a> <a href="#tools">tools overview</a> + <a href="../index.html" title="link to the SDK start page">SDK home</a> <a href="#tools" title="link to the tools overview">tools overview</a> </p> <p>'regmerge' is a small tool to merge different registry files under a specified - key into another registry file. If a value already exists in the targetfile - the value would be overwritten by the value of the sourcefile.</p> + key into another registry file. If a value already exists in the target file + the value would be overwritten by the value of the source file.</p> <p><b>Usage:</b></p> <blockquote> <b><code>regmerge <mergefile> mergeKeyName &tg;regfile_1> ... <regfile_n></code></b> @@ -764,7 +764,7 @@ <td width=15%><code>-c<locationUrls></code></td> <td width=85%> the location of an component (DLL, Class name, or an url of a jar file) or a list of urls - seperated by ';'s. Note, if a list of urls is specified, the components must all need the + separated by ';'s. Note, if a list of urls is specified, the components must all need the same loader. </td> </tr> @@ -806,7 +806,7 @@ <blockquote> <p><font size="5"><b><A name="regview">regview</A></b></font> - <a href="../index.html">SDK home</a> <a href="#tools">tools overview</a> + <a href="../index.html" title="link to the SDK start page">SDK home</a> <a href="#tools" title="link to the tools overview">tools overview</a> </p> <p>'regview' is a tool to show the contents of a registry file. The tool dumps the hierarchical structure and the values of the nodes to stdout in a readable form.</p> @@ -861,7 +861,7 @@ <blockquote> <p><font size="5"><b><a name="xml2cmp">xml2cmp</a></b></font> - <a href="../index.html">SDK home</a> <a href="#tools">tools overview</a> + <a href="../index.html" title="link to the SDK start page">SDK home</a> <a href="#tools" title="link to the tools overview">tools overview</a> </p> <p>The tool xml2cmp parses .xml files, which contain the descriptions of components that implement UNO services. Each .xml file refers to one library. The library may contain one or more component @@ -962,7 +962,7 @@ <blockquote> <p><font size="5"><b><a name="unoexe">uno</a></b></font> - <a href="../index.html">SDK home</a> <a href="#tools">tools overview</a> + <a href="../index.html" title="link to the SDK start page">SDK home</a> <a href="#tools" title="link to the tools overview">tools overview</a> </p> <p>The UNO-starter is for running a component or service process, and providing a runtime environment. Raising a component might look like this </p> @@ -970,7 +970,7 @@ <p>or</p> <p><code>[c:\] uno.exe -s foo.bar.FooBarService -r myregistry.rdb -- foo bar </code> </p> <p>The starter loads the component and instantiates it. The component must export the interface - <a href="common/ref/com/sun/star/lang/XMain.html">com.sun.star.lang.XMain</a>:</p> + <a href="common/ref/com/sun/star/lang/XMain.html" title="link into the IDL reference to the interface com.sun.star.lang.XMain">com.sun.star.lang.XMain</a>:</p> <p><code>interface XMain : com::sun::star::uno::XInterface <br> { <br> /** This method is called to run the component.<br> @@ -1041,7 +1041,7 @@ </td> </tr> </table> - <p><b>Service <a href="common/ref/com/sun/star/bridge/UnoUrlResolver.html"> + <p><b>Service <a href="common/ref/com/sun/star/bridge/UnoUrlResolver.html" title="link into the IDL reference to the service com.sun.star.bridge.UnoUrlResolver"> com.sun.star.bridge.UnoUrlResolver</a></b></p> <p>You can easily connect to a server started with the -u (url) option by using this service, giving the same url to resolve. The service provides you an instance from remote.</p> @@ -1075,12 +1075,12 @@ <blockquote> <p><font size="5"><b><a name="autodoc">autodoc</a></b></font> - <a href="../index.html">SDK home</a> <a href="#tools">tools overview</a> + <a href="../index.html" title="link to the SDK start page">SDK home</a> <a href="#tools" title="link to the tools overview">tools overview</a> </p> <p>The autodoc tool is used for creating javadoc-like documentation from C++ and UNOIDL source code.</p> <p>There are some conventions to follow when documenting C++- or UNOIDL-sourcecode. See (( REFERENCE to commenting guides for C++ and IDL )). <br> - If you are not familiar with these, but do know Javadoc: For simple C++ sourcecode documentation, + If you are not familiar with these, but do know javadoc: For simple C++ sourcecode documentation, using javadoc-style comments will work.<br> </p> <p><b>Usage:</b></p> diff --git a/odk/index.html b/odk/index.html index bf81a9216005..aaa459d078f0 100644 --- a/odk/index.html +++ b/odk/index.html @@ -39,24 +39,6 @@ <td class="color2" height="12" width="222"></td> </tr> <tr> - <td height="5" background="docs/images/shadow_r.gif"><img src="docs/images/shadow_l.gif" width="587" height="5"></td> - <td background="docs/images/shadow_r.gif" height="5" width="1"></td> - <td background="docs/images/shadow_r.gif" height="5" width="222"><img src="docs/images/shadow_r.gif" width="1" height="5"></td> - </tr> - <tr> - <td colspan="3"><img src="docs/images/elements.jpg" width="587" height="147"></td> - </tr> - <tr> - <td bgcolor="#000000" height="1"></td> - <td bgcolor="#000000"><img src="docs/images/black_dot.gif" width="1" height="1"></td> - <td bgcolor="#000000" height="1" width="222"></td> - </tr> - <tr> - <td class="color2" height="6"></td> - <td bgcolor="#000000" height="6" width="1"><img src="docs/images/black_dot.gif" width="1" height="6"></td> - <td class="color1" height="6" width="222"></td> - </tr> - <tr> <td bgcolor="#000000" height="1"></td> <td bgcolor="#000000" height="1" width="1"><img src="docs/images/black_dot.gif" width="1" height="1"></td> <td bgcolor="#000000" height="1" width="222"></td> @@ -90,11 +72,12 @@ [PRODUCTNAME], 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), and Windows.</p> - <P>The SDK also contains <a href="docs/common/ref/com/sun/star/module-ix.html"> - reference</a> documentation for the API and a complete - <a href="docs/DevelopersGuide_intro.html">Developer's Guide</a>, with lots of examples, - which introduce the API, explain the concepts behind it, and make it possible for - all users to quickly get started with the Office API. + <P>The SDK also contains <a href="docs/common/ref/com/sun/star/module-ix.html" title= + "link to the IDL reference documentation"> reference</a> documentation for the API + and a complete + <a href="docs/DevelopersGuide_intro.html" title="link to the Developer's Guide introduction page">Developer's Guide</a>, with lots of examples, which introduce the API, + explain the concepts behind it, and make it possible for all users to quickly get started + with the Office API. </P> <hr> <table width="100%" border="0" cellpadding="4"> @@ -103,7 +86,8 @@ </tr> <tr> <td width=30%> - <font size="3"><a href="docs/install.html">Installation Guide</a></font> + <font size="3"><a href="docs/install.html" title="link to the installation guide"> + Installation Guide</a></font> </td> <td width=70%> An overview of all necessary installation steps (e.g. environment variables) to use @@ -115,7 +99,7 @@ </tr> <tr> <td width=30%> - <font size="3"><a href="docs/DevelopersGuide_intro.html">Developer's Guide</a></font> + <font size="3"><a href="docs/DevelopersGuide_intro.html" title="link to the Developer's Guide introduction page">Developer's Guide</a></font> </td> <td width=70%> Detailed documentation, explaining the [PRODUCTNAME] API and the concepts behind it, @@ -124,8 +108,7 @@ </tr> <tr> <td width=30%> - <font size="3"><a href="docs/common/ref/com/sun/star/module-ix.html"> - IDL Reference</a></font> + <font size="3"><a href="docs/common/ref/com/sun/star/module-ix.html" title="link to the IDL reference documentation">IDL Reference</a></font> </td> <td width=70%> Complete [PRODUCTNAME] API reference. @@ -133,7 +116,7 @@ </tr> <tr> <td width=30%> - <font size="3"><a href="docs/java/ref/index.html">Java UNO Runtime Reference + <font size="3"><a href="docs/java/ref/index.html" title="link to the Java UNO runtime API reference documentation">Java UNO Runtime Reference </a></font> </td> <td width=70%> @@ -142,7 +125,7 @@ </tr> <tr> <td width=30%> - <font size="3"><a href="docs/cpp/ref/index.html">C++ Reference</a></font> + <font size="3"><a href="docs/cpp/ref/index.html" title="link to the C++ API reference documentation">C++ Reference</a></font> </td> <td width=70%> Reference documentation of the C++ UNO runtime and a set of C/C++ base and helper @@ -154,7 +137,8 @@ </tr> <tr> <td width=30%> - <font size="3"><a href="docs/tools.html">Development Tools</a></font> + <font size="3"><a href="docs/tools.html" title="link to the tools overview page"> + Development Tools</a></font> </TD> <td width=70%> Overview and a short description of the UNO development tools. @@ -162,7 +146,7 @@ </tr> <tr> <td width=30%> - <font size="3"><a href="examples/examples.html">Examples</a></font> + <font size="3"><a href="examples/examples.html" title="link to the examples overview page">Examples</a></font> </td> <td width=70%> A collection of examples in different programming languages (Java, C++, Basic, OLE). @@ -173,7 +157,7 @@ </tr> <tr> <td width=30%> - <font size="3"><a href="docs/DevStudioWizards/wizards.html">Sun ONE Studio 4 Integration</a></font> + <font size="3"><a href="docs/DevStudioWizards/wizards.html" title="link to the Sun ONE Developer Studio integration">Sun ONE Studio 4 Integration</a></font> </td> <td width=70%> An introduction to use the SDK with Sun ONE Studio 4 (formerly Forte for Java) or @@ -186,7 +170,7 @@ </tr> <tr> <td width=30%> - <font size="3"><a href="docs/common/spec/xml_format/xml_specification_draft.pdf">XML File Format + <font size="3"><a href="docs/common/spec/xml_format/xml_specification_draft.pdf" title="link to the xml file format specification">XML File Format Specification</a></font> </td> <td width=70%> @@ -201,7 +185,7 @@ </tr> <tr> <td width=30%> - <font size="3"><a target="_blank" href="http://www.sun.com/developers/">Sun Developer Resources</a> + <font size="3"><a target="_blank" href="http://www.sun.com/developers/" title="link to the Sun Developer Resources (online)">Sun Developer Resources</a> </font> </td> <td width=70%> @@ -210,7 +194,7 @@ </tr> <tr> <td width=30%> - <font size="3"><a target="_blank" href="http://www.sun.com/staroffice/">StarOffice™</a></font> + <font size="3"><a target="_blank" href="http://www.sun.com/staroffice/" title="link to the StarOffice homepage (online)">StarOffice™</a></font> </td> <td width=70%> Full-featured suite of office productivity tools. @@ -218,7 +202,7 @@ </tr> <tr> <td width=30%> - <font size="3"><a target="_blank" href="http://www.openoffice.org/">OpenOffice.org</a></font> + <font size="3"><a target="_blank" href="http://www.openoffice.org/" title="link to the OpenOffice.org homepage (online)">OpenOffice.org</a></font> </TD> <td width=70%> Open Source community project of office-productivity software. diff --git a/odk/pack/copying/makefile.mk b/odk/pack/copying/makefile.mk index 3e1b9d75f635..505192349de8 100644 --- a/odk/pack/copying/makefile.mk +++ b/odk/pack/copying/makefile.mk @@ -9,10 +9,10 @@ TARGET=copying CONVERTTAGFLAG = $(MISC)$/converttags_html_files.flag -IDLLIST={$(subst,/,$/ $(shell $(FIND) $(IDLOUT)$/com -type f -print))} +IDLLIST={$(subst,/,$/ $(shell $(FIND) $(IDLOUT) -type f -print))} DESTIDLLIST={$(subst,$(IDLOUT),$(DESTDIRIDL) $(IDLLIST))} -IDLDIRLIST={$(subst,/,$/ $(shell $(FIND) $(IDLOUT)$/com -type d -print))} +IDLDIRLIST={$(subst,/,$/ $(shell $(FIND) $(IDLOUT) -type d -print))} DIRLIST = \ $(DESTDIRDOCU) \ @@ -33,10 +33,9 @@ DIRLIST = \ $(DESTDIRJAVAEXAMPLES)$/Car \ $(DESTDIRJAVAEXAMPLES)$/CalcAddins \ $(DESTDIRJAVAEXAMPLES)$/com$/sun$/star$/comp$/demo \ - $(DESTDIRJAVAEXAMPLES)$/compsamples \ - $(DESTDIRJAVAEXAMPLES)$/compsamples$/componentsamples \ $(DESTDIRJAVAEXAMPLES)$/ConverterServlet \ $(DESTDIRJAVAEXAMPLES)$/DocumentConverter \ + $(DESTDIRJAVAEXAMPLES)$/DocumentConverter$/test \ $(DESTDIRJAVAEXAMPLES)$/DocumentLoader \ $(DESTDIRJAVAEXAMPLES)$/DocumentPrinter \ $(DESTDIRJAVAEXAMPLES)$/DocumentSaver \ @@ -44,9 +43,6 @@ DIRLIST = \ $(DESTDIRJAVAEXAMPLES)$/Inspector \ $(DESTDIRJAVAEXAMPLES)$/NotesAccess \ $(DESTDIRJAVAEXAMPLES)$/ToDo \ - $(DESTDIRJAVAEXAMPLES)$/OfficeBean \ - $(DESTDIRJAVAEXAMPLES)$/OfficeBean/SimpleBean \ - $(DESTDIRJAVAEXAMPLES)$/OfficeBean/OfficeWriterBean \ $(DESTDIRJAVAEXAMPLES)$/MinimalComponent \ $(DESTDIRJAVAEXAMPLES)$/PropertySet \ $(DESTDIRJAVAEXAMPLES)$/WriterSelector \ @@ -70,13 +66,12 @@ DIRLIST = \ CPP_OFFICECLIENT= \ $(DESTDIRCPPEXAMPLES)$/officeclient$/officeclient.cxx \ $(DESTDIRCPPEXAMPLES)$/officeclient$/officeclientsample.xml \ - $(DESTDIRCPPEXAMPLES)$/officeclient$/README \ $(DESTDIRCPPEXAMPLES)$/officeclient$/Makefile \ $(DESTDIRCPPEXAMPLES)$/officeclient$/exports.dxp CPP_DOCUMENTLOADER= \ $(DESTDIRCPPEXAMPLES)$/DocumentLoader$/DocumentLoader.cxx \ - $(DESTDIRCPPEXAMPLES)$/DocumentLoader$/README \ + $(DESTDIRCPPEXAMPLES)$/DocumentLoader$/test.sxw \ $(DESTDIRCPPEXAMPLES)$/DocumentLoader$/Makefile CPP_GENERICXMLFILTER= \ @@ -95,19 +90,16 @@ CPP_GENERICXMLFILTER= \ JAVA_DRAW= \ $(DESTDIRJAVAEXAMPLES)$/draw$/SDraw.java \ - $(DESTDIRJAVAEXAMPLES)$/draw$/Makefile \ - $(DESTDIRJAVAEXAMPLES)$/draw$/README + $(DESTDIRJAVAEXAMPLES)$/draw$/Makefile JAVA_CALC= \ $(DESTDIRJAVAEXAMPLES)$/calc$/SCalc.java \ $(DESTDIRJAVAEXAMPLES)$/calc$/EuroAdaption.java \ - $(DESTDIRJAVAEXAMPLES)$/calc$/Makefile \ - $(DESTDIRJAVAEXAMPLES)$/calc$/README + $(DESTDIRJAVAEXAMPLES)$/calc$/Makefile JAVA_CALC_CHARTTYPECHANGE= \ $(DESTDIRJAVAEXAMPLES)$/calc$/ChartTypeChange$/ChartTypeChange.java \ $(DESTDIRJAVAEXAMPLES)$/calc$/ChartTypeChange$/Makefile \ - $(DESTDIRJAVAEXAMPLES)$/calc$/ChartTypeChange$/README JAVA_WRITER= \ $(DESTDIRJAVAEXAMPLES)$/writer$/SWriter.java \ @@ -117,44 +109,29 @@ JAVA_WRITER= \ $(DESTDIRJAVAEXAMPLES)$/writer$/BookmarkInsertion.java \ $(DESTDIRJAVAEXAMPLES)$/writer$/HardFormatting.java \ $(DESTDIRJAVAEXAMPLES)$/writer$/StyleCreation.java \ - $(DESTDIRJAVAEXAMPLES)$/writer$/Makefile \ - $(DESTDIRJAVAEXAMPLES)$/writer$/README + $(DESTDIRJAVAEXAMPLES)$/writer$/Makefile JAVA_CAR= \ $(DESTDIRJAVAEXAMPLES)$/Car$/Car.java \ $(DESTDIRJAVAEXAMPLES)$/Car$/Makefile \ - $(DESTDIRJAVAEXAMPLES)$/Car$/Manifest \ $(DESTDIRJAVAEXAMPLES)$/Car$/Test.java \ + $(DESTDIRJAVAEXAMPLES)$/Car$/Car.idl \ $(DESTDIRJAVAEXAMPLES)$/Car$/XAccelerationControl.idl \ - $(DESTDIRJAVAEXAMPLES)$/Car$/XCar.idl \ $(DESTDIRJAVAEXAMPLES)$/Car$/XDrivingDirection.idl JAVA_CALCADDINS= \ - $(DESTDIRJAVAEXAMPLES)$/CalcAddins$/CalcAddins.html \ $(DESTDIRJAVAEXAMPLES)$/CalcAddins$/CalcAddins.java \ $(DESTDIRJAVAEXAMPLES)$/CalcAddins$/Makefile \ - $(DESTDIRJAVAEXAMPLES)$/CalcAddins$/Manifest \ - $(DESTDIRJAVAEXAMPLES)$/CalcAddins$/README \ $(DESTDIRJAVAEXAMPLES)$/CalcAddins$/XCalcAddins.idl JAVA_DEMOCOMP= \ $(DESTDIRJAVAEXAMPLES)$/com$/sun$/star$/comp$/demo$/DemoComponent.java \ + $(DESTDIRJAVAEXAMPLES)$/com$/sun$/star$/comp$/demo$/DemoComponent.sxw \ $(DESTDIRJAVAEXAMPLES)$/com$/sun$/star$/comp$/demo$/Makefile \ - $(DESTDIRJAVAEXAMPLES)$/com$/sun$/star$/comp$/demo$/manifest \ - $(DESTDIRJAVAEXAMPLES)$/com$/sun$/star$/comp$/demo$/README \ $(DESTDIRJAVAEXAMPLES)$/com$/sun$/star$/comp$/demo$/SCalcDemo.java \ $(DESTDIRJAVAEXAMPLES)$/com$/sun$/star$/comp$/demo$/SDrawDemo.java \ $(DESTDIRJAVAEXAMPLES)$/com$/sun$/star$/comp$/demo$/SWriterDemo.java -JAVA_COMPSAMPLES= \ - $(DESTDIRJAVAEXAMPLES)$/compsamples$/componentsamples$/TestComponentA.java \ - $(DESTDIRJAVAEXAMPLES)$/compsamples$/componentsamples$/TestComponentB.java \ - $(DESTDIRJAVAEXAMPLES)$/compsamples$/componentsamples$/TestServiceProvider.java \ - $(DESTDIRJAVAEXAMPLES)$/compsamples$/componentsamples$/Makefile \ - $(DESTDIRJAVAEXAMPLES)$/compsamples$/componentsamples$/$/Manifest \ - $(DESTDIRJAVAEXAMPLES)$/compsamples$/componentsamples$/$/XSomethingA.idl \ - $(DESTDIRJAVAEXAMPLES)$/compsamples$/componentsamples$/$/XSomethingB.idl - JAVA_CONVERTERSERVLET= \ $(DESTDIRJAVAEXAMPLES)$/ConverterServlet$/ConverterServlet.html \ $(DESTDIRJAVAEXAMPLES)$/ConverterServlet$/ConverterServlet.java \ @@ -163,47 +140,38 @@ JAVA_CONVERTERSERVLET= \ JAVA_DOCUMENTCONVERTER= \ $(DESTDIRJAVAEXAMPLES)$/DocumentConverter$/DocumentConverter.java \ - $(DESTDIRJAVAEXAMPLES)$/DocumentConverter$/Makefile \ - $(DESTDIRJAVAEXAMPLES)$/DocumentConverter$/README + $(DESTDIRJAVAEXAMPLES)$/DocumentConverter$/Makefile \ + $(DESTDIRJAVAEXAMPLES)$/DocumentConverter$/test$/test1.sxw JAVA_DOCUMENTLOADER= \ $(DESTDIRJAVAEXAMPLES)$/DocumentLoader$/DocumentLoader.java \ - $(DESTDIRJAVAEXAMPLES)$/DocumentLoader$/Makefile \ - $(DESTDIRJAVAEXAMPLES)$/DocumentLoader$/README + $(DESTDIRJAVAEXAMPLES)$/DocumentLoader$/Makefile JAVA_DOCUMENTPRINTER= \ $(DESTDIRJAVAEXAMPLES)$/DocumentPrinter$/DocumentPrinter.java \ - $(DESTDIRJAVAEXAMPLES)$/DocumentPrinter$/Makefile \ - $(DESTDIRJAVAEXAMPLES)$/DocumentPrinter$/README + $(DESTDIRJAVAEXAMPLES)$/DocumentPrinter$/Makefile JAVA_DOCUMENTSAVER= \ $(DESTDIRJAVAEXAMPLES)$/DocumentSaver$/DocumentSaver.java \ - $(DESTDIRJAVAEXAMPLES)$/DocumentSaver$/Makefile \ - $(DESTDIRJAVAEXAMPLES)$/DocumentSaver$/README + $(DESTDIRJAVAEXAMPLES)$/DocumentSaver$/Makefile JAVA_GRAPHICSINSERTER= \ $(DESTDIRJAVAEXAMPLES)$/GraphicsInserter$/GraphicsInserter.java \ $(DESTDIRJAVAEXAMPLES)$/GraphicsInserter$/Makefile \ - $(DESTDIRJAVAEXAMPLES)$/GraphicsInserter$/OpenOfficeLogo.gif \ - $(DESTDIRJAVAEXAMPLES)$/GraphicsInserter$/README + $(DESTDIRJAVAEXAMPLES)$/GraphicsInserter$/oo_smiley.gif JAVA_INSPECTOR= \ - $(DESTDIRJAVAEXAMPLES)$/Inspector$/index.html \ - $(DESTDIRJAVAEXAMPLES)$/Inspector$/install.html \ $(DESTDIRJAVAEXAMPLES)$/Inspector$/Inspector.jpg \ $(DESTDIRJAVAEXAMPLES)$/Inspector$/InspectorThumbnail.jpg \ $(DESTDIRJAVAEXAMPLES)$/Inspector$/InstanceInspector.java \ $(DESTDIRJAVAEXAMPLES)$/Inspector$/Makefile \ - $(DESTDIRJAVAEXAMPLES)$/Inspector$/Manifest \ $(DESTDIRJAVAEXAMPLES)$/Inspector$/Test.java \ - $(DESTDIRJAVAEXAMPLES)$/Inspector$/XInstanceInspector.idl \ - $(DESTDIRJAVAEXAMPLES)$/Inspector$/README + $(DESTDIRJAVAEXAMPLES)$/Inspector$/XInstanceInspector.idl JAVA_NOTESACCESS= \ $(DESTDIRJAVAEXAMPLES)$/NotesAccess$/NotesAccess.java \ $(DESTDIRJAVAEXAMPLES)$/NotesAccess$/Makefile \ - $(DESTDIRJAVAEXAMPLES)$/NotesAccess$/Stocks.nsf \ - $(DESTDIRJAVAEXAMPLES)$/NotesAccess$/README + $(DESTDIRJAVAEXAMPLES)$/NotesAccess$/Stocks.nsf JAVA_TODO= \ $(DESTDIRJAVAEXAMPLES)$/ToDo$/ToDo.java \ @@ -215,48 +183,18 @@ JAVA_TODO= \ JAVA_WRITERSELECTOR= \ $(DESTDIRJAVAEXAMPLES)$/WriterSelector$/WriterSelector.java \ - $(DESTDIRJAVAEXAMPLES)$/WriterSelector$/Makefile \ - $(DESTDIRJAVAEXAMPLES)$/WriterSelector$/README - -JAVA_OFFICEBEAN_SIMPLEBEAN= \ - $(DESTDIRJAVAEXAMPLES)$/OfficeBean$/SimpleBean$/SimpleBean.java \ - $(DESTDIRJAVAEXAMPLES)$/OfficeBean$/SimpleBean$/SimpleBeanBeanInfo.java \ - $(DESTDIRJAVAEXAMPLES)$/OfficeBean$/SimpleBean$/SimpleViewer.java \ - $(DESTDIRJAVAEXAMPLES)$/OfficeBean$/SimpleBean$/manifest.tmp \ - $(DESTDIRJAVAEXAMPLES)$/OfficeBean$/SimpleBean$/Makefile - -JAVA_OFFICEBEAN_OFFICEWRITERBEAN= \ - $(DESTDIRJAVAEXAMPLES)$/OfficeBean$/OfficeWriterBean$/OfficeWriter.java \ - $(DESTDIRJAVAEXAMPLES)$/OfficeBean$/OfficeWriterBean$/OfficeWriterBeanInfo.java \ - $(DESTDIRJAVAEXAMPLES)$/OfficeBean$/OfficeWriterBean$/Office.java \ - $(DESTDIRJAVAEXAMPLES)$/OfficeBean$/OfficeWriterBean$/OfficeBeanInfo.java \ - $(DESTDIRJAVAEXAMPLES)$/OfficeBean$/OfficeWriterBean$/DocViewer.java \ - $(DESTDIRJAVAEXAMPLES)$/OfficeBean$/OfficeWriterBean$/Makefile \ - $(DESTDIRJAVAEXAMPLES)$/OfficeBean$/OfficeWriterBean$/manifest.tmp - -JAVA_OFFICEBEAN_HELPERBEANS= \ - $(DESTDIRJAVAEXAMPLES)$/OfficeBean$/OfficeCommand.java \ - $(DESTDIRJAVAEXAMPLES)$/OfficeBean$/BeanInfoAdapter.java \ - $(DESTDIRJAVAEXAMPLES)$/OfficeBean$/OfficeIconColor32.jpg \ - $(DESTDIRJAVAEXAMPLES)$/OfficeBean$/OfficeIconColor16.jpg \ - $(DESTDIRJAVAEXAMPLES)$/OfficeBean$/OfficeIconMono32.jpg \ - $(DESTDIRJAVAEXAMPLES)$/OfficeBean$/OfficeIconMono16.jpg \ - $(DESTDIRJAVAEXAMPLES)$/OfficeBean$/BasicOfficeBean.java + $(DESTDIRJAVAEXAMPLES)$/WriterSelector$/Makefile JAVA_MINIMALCOMPONENT= \ - $(DESTDIRJAVAEXAMPLES)$/MinimalComponent$/BuildMinimalComponent.xml \ $(DESTDIRJAVAEXAMPLES)$/MinimalComponent$/MinimalComponent.idl \ $(DESTDIRJAVAEXAMPLES)$/MinimalComponent$/MinimalComponent.java\ $(DESTDIRJAVAEXAMPLES)$/MinimalComponent$/MinimalComponent.xml \ $(DESTDIRJAVAEXAMPLES)$/MinimalComponent$/TestMinimalComponent.java\ - $(DESTDIRJAVAEXAMPLES)$/MinimalComponent$/README \ - $(DESTDIRJAVAEXAMPLES)$/MinimalComponent$/Manifest \ $(DESTDIRJAVAEXAMPLES)$/MinimalComponent$/Makefile JAVA_PROPERTYSET= \ $(DESTDIRJAVAEXAMPLES)$/PropertySet$/PropTest.java \ - $(DESTDIRJAVAEXAMPLES)$/PropertySet$/readme.txt \ - $(DESTDIRJAVAEXAMPLES)$/PropertySet$/manifest \ + $(DESTDIRJAVAEXAMPLES)$/PropertySet$/PropertySet.sxw \ $(DESTDIRJAVAEXAMPLES)$/PropertySet$/Makefile BASIC_EXAMPLES= \ @@ -326,7 +264,6 @@ EXAMPLESLIST= \ $(JAVA_WRITER) \ $(JAVA_CALCADDINS) \ $(JAVA_DEMOCOMP) \ - $(JAVA_COMPSAMPLES) \ $(JAVA_CONVERTERSERVLET) \ $(JAVA_DOCUMENTCONVERTER) \ $(JAVA_DOCUMENTLOADER) \ @@ -337,17 +274,13 @@ EXAMPLESLIST= \ $(JAVA_NOTESACCESS) \ $(JAVA_TODO) \ $(JAVA_WRITERSELECTOR) \ - $(JAVA_OFFICEBEAN_SIMPLEBEAN) \ - $(JAVA_OFFICEBEAN_OFFICEWRITERBEAN) \ - $(JAVA_OFFICEBEAN_HELPERBEANS) \ $(JAVA_MINIMALCOMPONENT) \ $(JAVA_PROPERTYSET) \ $(BASIC_EXAMPLES) \ $(OLE_EXAMPLES) \ $(OLE_EXAMPLES_DELPHI) \ $(OLE_EXAMPLES_DELPHI_INSERTTABLES) \ - $(OLE_EXAMPLES_ACTIVEX) \ - $(DESTDIRJAVAEXAMPLES)$/debugging_java.html + $(OLE_EXAMPLES_ACTIVEX) DOCUSTUDIO4INTEGRATIONHTMLFILES= \ $(DESTDIRDOCU)$/DevStudioWizards$/CalcAddinWizard.html \ @@ -413,12 +346,13 @@ DOCUSTUDIO4INTEGRATIONGRAPHICSFILES= \ DOCUHTMLFILES+= \ $(DOCUSTUDIO4INTEGRATIONHTMLFILES) \ $(DESTDIR)$/index.html \ - $(DESTDIRDOCU)$/sdk_styles.css \ $(DESTDIRDOCU)$/tools.html \ $(DESTDIRDOCU)$/notsupported.html \ - $(DESTDIRDOCU)$/devmanual_preview.html \ + $(DESTDIRDOCU)$/DevelopersGuide_intro.html \ $(DESTDIRDOCU)$/install.html \ - $(DESTDIREXAMPLES)$/examples.html + $(DESTDIRDOCU)$/sdk_styles.css \ + $(DESTDIREXAMPLES)$/examples.html \ + $(DESTDIREXAMPLES)$/DevelopersGuide$/examples.html DOCUFILES+= \ $(DOCUHTMLFILES) \ @@ -433,13 +367,16 @@ DOCUFILES+= \ .IF "$(GUI)"=="UNX" INSTALLSCRIPT= \ $(DESTDIR)$/configure \ - $(DESTDIR)$/setsdkenv_unix.in + $(DESTDIR)$/setsdkenv_unix.in \ + $(DESTDIR)$/oo1.0.2_sdk_linkpatch .ELSE INSTALLSCRIPT= \ $(DESTDIR)$/configureWindowsNT.bat \ $(DESTDIR)$/setsdkenv_windows.bat .ENDIF + + #-------------------------------------------------- # TARGETS #-------------------------------------------------- @@ -454,15 +391,14 @@ all : \ $(DESTDIR)$/settings$/dk.mk \ $(DESTDIRCLASSES)$/officebean.jar \ $(DESTDIRCLASSES)$/oosupport.nbm \ + $(DESTDIRDOCU)$/DevelopersGuide$/DevelopersGuide.htm \ + $(DESTDIRDOCU)$/DevelopersGuide$/DevelopersGuide.pdf \ + $(DESTDIREXAMPLES)$/DevelopersGuide$/examples.html \ $(CONVERTTAGFLAG) $(DIRLIST) : -$(MKDIRHIER) $@ -$(DESTDIRDOCU)$/sdk_styles.css : $(PRJ)$/docs$/sdk_styles.css - +-rm -f $(CONVERTTAGFLAG) >& $(NULLDEV) - $(MY_COPY) $? $@ - $(DESTDIR)$/index.html : $(PRJ)$/index.html +-rm -f $@ >& $(NULLDEV) $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $? $(MY_TEXTCOPY_TARGETPRE) $@ @@ -479,7 +415,7 @@ $(DESTDIRDOCU)$/notsupported.html : $(PRJ)$/docs$/notsupported.html +-rm -f $@ >& $(NULLDEV) $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $? $(MY_TEXTCOPY_TARGETPRE) $@ -$(DESTDIRDOCU)$/devmanual_preview.html : $(PRJ)$/docs$/devmanual_preview.html +$(DESTDIRDOCU)$/DevelopersGuide_intro.html : $(PRJ)$/docs$/DevelopersGuide_intro.html +-rm -f $@ >& $(NULLDEV) $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $? $(MY_TEXTCOPY_TARGETPRE) $@ @@ -487,6 +423,10 @@ $(DESTDIRDOCU)$/install.html : $(PRJ)$/docs$/install.html +-rm -f $@ >& $(NULLDEV) $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $? $(MY_TEXTCOPY_TARGETPRE) $@ +$(DESTDIRDOCU)$/sdk_styles.css : $(PRJ)$/docs$/sdk_styles.css + +-rm -f $@ >& $(NULLDEV) + $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $? $(MY_TEXTCOPY_TARGETPRE) $@ + $(DESTDIRDOCUIMAGES)$/% : $(PRJ)$/docs$/images$/% +-rm -f $@ >& $(NULLDEV) $(MY_COPY) $? $@ @@ -529,6 +469,13 @@ $(DESTDIR)$/setsdkenv_unix.in : $(PRJ)$/setsdkenv_unix.in +-chmod 755 $@ .ENDIF +$(DESTDIR)$/oo1.0.2_sdk_linkpatch : oo1.0.2_sdk_linkpatch + +-rm -f $@ >& $(NULLDEV) + $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $? $(MY_TEXTCOPY_TARGETPRE) $@ +.IF "$(GUI)"=="UNX" + +-chmod 755 $@ +.ENDIF + $(DESTDIR)$/configureWindowsNT.bat : $(PRJ)$/configureWindowsNT.bat +-rm -f $@ >& $(NULLDEV) $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $? $(MY_TEXTCOPY_TARGETPRE) $@ @@ -537,22 +484,130 @@ $(DESTDIR)$/setsdkenv_windows.bat : $(PRJ)$/setsdkenv_windows.bat +-rm -f $@ >& $(NULLDEV) $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $? $(MY_TEXTCOPY_TARGETPRE) $@ -$(DESTDIRCPPEXAMPLES)$/% : $(PRJ)$/examples$/cpp$/% $(DIRLIST) $(BIN)$/$(UDKNAME).zip +$(DESTDIREXAMPLES)$/%.sxw : $(PRJ)$/examples$/%.sxw $(DIRLIST) + +-rm -f $@ >& $(NULLDEV) + $(MY_COPY) $? $@ + +$(DESTDIREXAMPLES)$/%.sxc : $(PRJ)$/examples$/%.sxc $(DIRLIST) + +-rm -f $@ >& $(NULLDEV) + $(MY_COPY) $? $@ + +$(DESTDIREXAMPLES)$/%.sxd : $(PRJ)$/examples$/%.sxd $(DIRLIST) + +-rm -f $@ >& $(NULLDEV) + $(MY_COPY) $? $@ + +$(DESTDIREXAMPLES)$/%.xlb : $(PRJ)$/examples$/%.xlb $(DIRLIST) + +-rm -f $@ >& $(NULLDEV) + $(MY_COPY) $? $@ + +$(DESTDIREXAMPLES)$/%.xdl : $(PRJ)$/examples$/%.xdl $(DIRLIST) + +-rm -f $@ >& $(NULLDEV) + $(MY_COPY) $? $@ + +$(DESTDIREXAMPLES)$/%.gif : $(PRJ)$/examples$/%.gif $(DIRLIST) + +-rm -f $@ >& $(NULLDEV) + $(MY_COPY) $? $@ + +$(DESTDIREXAMPLES)$/%.jpg : $(PRJ)$/examples$/%.jpg $(DIRLIST) + +-rm -f $@ >& $(NULLDEV) + $(MY_COPY) $? $@ + +$(DESTDIREXAMPLES)$/%.wmf : $(PRJ)$/examples$/%.wmf $(DIRLIST) + +-rm -f $@ >& $(NULLDEV) + $(MY_COPY) $? $@ + +$(DESTDIREXAMPLES)$/%.nsf : $(PRJ)$/examples$/%.nsf $(DIRLIST) + +-rm -f $@ >& $(NULLDEV) + $(MY_COPY) $? $@ + +$(DESTDIREXAMPLES)$/%.pdf : $(PRJ)$/examples$/%.pdf $(DIRLIST) + +-rm -f $@ >& $(NULLDEV) + $(MY_COPY) $? $@ + +$(DESTDIREXAMPLES)$/%.xba : $(PRJ)$/examples$/%.xba $(DIRLIST) +-rm -f $@ >& $(NULLDEV) $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $? $(MY_TEXTCOPY_TARGETPRE) $@ -$(DESTDIRJAVAEXAMPLES)$/% : $(PRJ)$/examples$/java$/% $(DIRLIST) $(BIN)$/$(UDKNAME).zip +$(DESTDIREXAMPLES)$/%.cxx : $(PRJ)$/examples$/%.cxx $(DIRLIST) +-rm -f $@ >& $(NULLDEV) $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $? $(MY_TEXTCOPY_TARGETPRE) $@ -$(DESTDIRBASICEXAMPLES)$/% : $(PRJ)$/examples$/basic$/% $(DIRLIST) $(BIN)$/$(UDKNAME).zip +$(DESTDIREXAMPLES)$/%.hxx : $(PRJ)$/examples$/%.hxx $(DIRLIST) +-rm -f $@ >& $(NULLDEV) - $(MY_COPY) $? $@ + $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $? $(MY_TEXTCOPY_TARGETPRE) $@ + +$(DESTDIREXAMPLES)$/%.java : $(PRJ)$/examples$/%.java $(DIRLIST) + +-rm -f $@ >& $(NULLDEV) + $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $? $(MY_TEXTCOPY_TARGETPRE) $@ + +$(DESTDIREXAMPLES)$/%.idl : $(PRJ)$/examples$/%.idl $(DIRLIST) + +-rm -f $@ >& $(NULLDEV) + $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $? $(MY_TEXTCOPY_TARGETPRE) $@ + +$(DESTDIREXAMPLES)$/%.dxp : $(PRJ)$/examples$/%.dxp $(DIRLIST) + +-rm -f $@ >& $(NULLDEV) + $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $? $(MY_TEXTCOPY_TARGETPRE) $@ + +$(DESTDIREXAMPLES)$/%.xml : $(PRJ)$/examples$/%.xml $(DIRLIST) + +-rm -f $@ >& $(NULLDEV) + $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $? $(MY_TEXTCOPY_TARGETPRE) $@ + +$(DESTDIREXAMPLES)$/%.html : $(PRJ)$/examples$/%.html $(DIRLIST) + +-rm -f $@ >& $(NULLDEV) + $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $? $(MY_TEXTCOPY_TARGETPRE) $@ + +$(DESTDIREXAMPLES)$/%.txt : $(PRJ)$/examples$/%.txt $(DIRLIST) + +-rm -f $@ >& $(NULLDEV) + $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $? $(MY_TEXTCOPY_TARGETPRE) $@ + +$(DESTDIREXAMPLES)$/%$/Makefile : $(PRJ)$/examples$/%$/Makefile $(DIRLIST) + +-rm -f $@ >& $(NULLDEV) + $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $? $(MY_TEXTCOPY_TARGETPRE) $@ + +$(DESTDIREXAMPLES)$/%$/README : $(PRJ)$/examples$/%$/README $(DIRLIST) + +-rm -f $@ >& $(NULLDEV) + $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $? $(MY_TEXTCOPY_TARGETPRE) $@ + +$(DESTDIREXAMPLES)$/%.cpp : $(PRJ)$/examples$/%.cpp $(DIRLIST) + +-rm -f $@ >& $(NULLDEV) + $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $? $(MY_TEXTCOPY_TARGETPRE) $@ -$(DESTDIROLEEXAMPLES)$/% : $(PRJ)$/examples$/OLE$/% $(DIRLIST) $(BIN)$/$(UDKNAME).zip +$(DESTDIREXAMPLES)$/%.h : $(PRJ)$/examples$/%.h $(DIRLIST) +-rm -f $@ >& $(NULLDEV) $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $? $(MY_TEXTCOPY_TARGETPRE) $@ +$(DESTDIREXAMPLES)$/%.def : $(PRJ)$/examples$/%.def $(DIRLIST) + +-rm -f $@ >& $(NULLDEV) + $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $? $(MY_TEXTCOPY_TARGETPRE) $@ + +$(DESTDIREXAMPLES)$/%.rc : $(PRJ)$/examples$/%.rc $(DIRLIST) + +-rm -f $@ >& $(NULLDEV) + $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $? $(MY_TEXTCOPY_TARGETPRE) $@ + +$(DESTDIREXAMPLES)$/%.rgs : $(PRJ)$/examples$/%.rgs $(DIRLIST) + +-rm -f $@ >& $(NULLDEV) + $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $? $(MY_TEXTCOPY_TARGETPRE) $@ + +$(DESTDIREXAMPLES)$/%.dpr : $(PRJ)$/examples$/%.dpr $(DIRLIST) + +-rm -f $@ >& $(NULLDEV) + $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $? $(MY_TEXTCOPY_TARGETPRE) $@ + +$(DESTDIREXAMPLES)$/%.res : $(PRJ)$/examples$/%.res $(DIRLIST) + +-rm -f $@ >& $(NULLDEV) + $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $? $(MY_TEXTCOPY_TARGETPRE) $@ + +$(DESTDIREXAMPLES)$/%.pas : $(PRJ)$/examples$/%.pas $(DIRLIST) + +-rm -f $@ >& $(NULLDEV) + $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $? $(MY_TEXTCOPY_TARGETPRE) $@ + +$(DESTDIREXAMPLES)$/%.dfm : $(PRJ)$/examples$/%.dfm $(DIRLIST) + +-rm -f $@ >& $(NULLDEV) + $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $? $(MY_TEXTCOPY_TARGETPRE) $@ + +$(DESTDIREXAMPLES)$/%.vbs : $(PRJ)$/examples$/%.vbs $(DIRLIST) + +-rm -f $@ >& $(NULLDEV) + $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $? $(MY_TEXTCOPY_TARGETPRE) $@ + $(DESTDIRCLASSES)$/unoil.jar : $(BINOUT)$/unoil.jar $(GNUCOPY) -p $? $@ @@ -562,8 +617,8 @@ $(DESTDIRCLASSES)$/officebean.jar : $(OUT)$/class$/officebean.jar $(DESTDIRCLASSES)$/oosupport.nbm : $(OUT)$/class$/oosupport.nbm $(GNUCOPY) -p $? $@ -$(DESTDIRBIN)$/types.rdb : $(BINOUT)$/types.rdb - $(GNUCOPY) -p $(BINOUT)$/types.rdb $@ +$(DESTDIRBIN)$/applicat.rdb : $(BINOUT)$/applicat.rdb + $(GNUCOPY) -p $(BINOUT)$/applicat.rdb $@ $(DESTDIRDLL)$/$(MY_DLLPREFIX)officebean$(MY_DLLPOSTFIX) : $(MY_DLLOUT)$/$(MY_DLLPREFIX)officebean$(MY_DLLPOSTFIX) $(GNUCOPY) -p $? $@ @@ -578,9 +633,9 @@ $(DESTDIR)$/settings$/dk.mk : $(PRJ)$/util$/dk.mk echo DKNAME=${PRODUCT_NAME} >> $@ .ENDIF .IF "$(GUI)"=="UNX" - echo 'DKREGISTRYNAME=$$(OFFICE_PROGRAM_PATH)$$(PS)types.rdb' >> $@ + echo 'DKREGISTRYNAME=$$(subst \\,\,"$$(OFFICE_PROGRAM_PATH)$$(PS)applicat.rdb")' >> $@ .ELSE - echo DKREGISTRYNAME=$$(OFFICE_PROGRAM_PATH)$$(PS)types.rdb >> $@ + echo DKREGISTRYNAME=$$(subst \\,\,"$$(OFFICE_PROGRAM_PATH)$$(PS)applicat.rdb") >> $@ .ENDIF .IF "$(BUILD_SOSL)"=="" @@ -593,6 +648,19 @@ $(DESTDIR)$/odk_overview.html : $(PRJ)$/util$/odk_overview2.html $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $? $(MY_TEXTCOPY_TARGETPRE) $@ .ENDIF +$(DESTDIRDOCU)$/DevelopersGuide$/DevelopersGuide.pdf : DevelopersGuide.pdf + $(GNUCOPY) -p DevelopersGuide.pdf $(DESTDIRDOCU)$/DevelopersGuide + +$(DESTDIRDOCU)$/DevelopersGuide$/DevelopersGuide.htm : DevelopersGuide.zip + $(GNUCOPY) -p DevelopersGuide.zip $(DESTDIRDOCU) + unzip -quod $(DESTDIRDOCU) $(DESTDIRDOCU)$/DevelopersGuide.zip + +-$(MY_DELETE_RECURSIVE) $(DESTDIRDOCU)$/DevelopersGuide.zip >& $(NULLDEV) + +$(DESTDIREXAMPLES)$/DevelopersGuide$/examples.html : DevelopersGuideSamples.zip + $(GNUCOPY) -p DevelopersGuideSamples.zip $(DESTDIREXAMPLES) + unzip -quod $(DESTDIREXAMPLES) $(DESTDIREXAMPLES)$/DevelopersGuideSamples.zip + +-$(MY_DELETE_RECURSIVE) $(DESTDIREXAMPLES)$/DevelopersGuideSamples.zip >& $(NULLDEV) + $(DESTDIRIDL)$/% : $(IDLOUT)$/% +-rm -f $@ $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $? $(MY_TEXTCOPY_TARGETPRE) $@ diff --git a/odk/util/makefile.pmk b/odk/util/makefile.pmk index 036348706b3b..335204c080ef 100644 --- a/odk/util/makefile.pmk +++ b/odk/util/makefile.pmk @@ -3,8 +3,8 @@ ODK_RELEASE=1.0.2 OFFICEPRODUCTNAME="OpenOffice.org $(ODK_RELEASE)" -TITLE="OpenOffice.org $(ODK_RELEASE) Beta SDK" -PRODUCT_NAME=OpenOffice.org$(ODK_RELEASE)_Beta_SDK +TITLE="OpenOffice.org $(ODK_RELEASE) SDK" +PRODUCT_NAME=OpenOffice.org$(ODK_RELEASE)SDK PRODUCTZIPFILE=$(PRODUCT_NAME).zip PRODUCTTARGZFILE=$(PRODUCT_NAME).tar.gz |