Skip to content

C
core
Kaydet (Commit) e28ab69d authored tarafından Mathias Bauer's avatar Mathias Bauer
Dosyalara gözat
Seçenekler

CWS changehid: resync to m84

üst 7ce3cfb1 3839427b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 85 additions and 46 deletions
odk/cfgWin.js
Dosyayı görüntüle @ e28ab69d
...@@ -846,7 +846,7 @@ function writeBatFile(fdir, file) ...@@ -846,7 +846,7 @@ function writeBatFile(fdir, file)
"REM if exist \"%OO_SDK_HOME%\\windows\\lib\\stlport_vc71_stldebug.lib\". (\n" + "REM if exist \"%OO_SDK_HOME%\\windows\\lib\\stlport_vc71_stldebug.lib\". (\n" +
"REM set STLDEBUG=_stldebug\n" + "REM set STLDEBUG=_stldebug\n" +
"REM )\n\n" + "REM )\n\n" +
"REM Check installation path for the StarOffice Development Kit.\n" + "REM Check installation path for the Office Development Kit.\n" +
"if not defined OO_SDK_HOME (\n" + "if not defined OO_SDK_HOME (\n" +
" echo Error: the variable OO_SDK_HOME is missing!\n" + " echo Error: the variable OO_SDK_HOME is missing!\n" +
" goto :error\n" + " goto :error\n" +
......
odk/configure.pl
Dosyayı görüntüle @ e28ab69d
...@@ -37,6 +37,7 @@ if ( $main::operatingSystem =~ m/darwin/ ) ...@@ -37,6 +37,7 @@ if ( $main::operatingSystem =~ m/darwin/ )
} else { } else {
$main::OO_SDK_URE_HOME = `cd $main::sdkpath/../../ure && pwd`; $main::OO_SDK_URE_HOME = `cd $main::sdkpath/../../ure && pwd`;
} }
chomp($main::OO_SDK_URE_HOME);
$main::OO_SDK_MAKE_HOME = ""; $main::OO_SDK_MAKE_HOME = "";
$main::makeName = "make"; $main::makeName = "make";
...@@ -625,6 +626,9 @@ sub searchMacOffice ...@@ -625,6 +626,9 @@ sub searchMacOffice
if (-d "/Applications/OpenOffice.org.app" ) { if (-d "/Applications/OpenOffice.org.app" ) {
return "/Applications/OpenOffice.org.app" return "/Applications/OpenOffice.org.app"
} }
if (-d "/Applications/Oracle Open Office.app" ) {
return "/Applications/Oracle Open Office.app";
}
if (-d "/Applications/StarOffice.app" ) { if (-d "/Applications/StarOffice.app" ) {
return "/Applications/StarOffice.app"; return "/Applications/StarOffice.app";
} }
...@@ -650,6 +654,16 @@ sub searchoffice ...@@ -650,6 +654,16 @@ sub searchoffice
return $officepath; return $officepath;
} }
# fallback # fallback
my $tmpversion = $main::OO_MAJORVERSION;
# if ( $main::OO_MINORVERSION > 0) {
# $tmpversion = "$tmpversion.$main::OO_MINORVERSION";
# }
$officepath = "$tmpOffice/oracle_open_office$tmpversion";
if (-d $officepath && -e "$officepath/program/soffice") {
return $officepath;
}
my $tmpversion = $main::OO_MAJORVERSION + 6; my $tmpversion = $main::OO_MAJORVERSION + 6;
if ( $main::OO_MINORVERSION > 0) { if ( $main::OO_MINORVERSION > 0) {
$tmpversion = "$tmpversion.$main::OO_MINORVERSION"; $tmpversion = "$tmpversion.$main::OO_MINORVERSION";
......
odk/docs/install.html
Dosyayı görüntüle @ e28ab69d
<html> <html>
<head> <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"> <link rel="stylesheet" type="text/css" href="sdk_styles.css">
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<meta name="author" content="J&uuml;rgen Schmidt"> <meta name="author" content="J&uuml;rgen Schmidt">
...@@ -36,16 +36,16 @@ ...@@ -36,16 +36,16 @@
<table class="table3"> <table class="table3">
<tr> <tr>
<td colspan="2"> <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 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 your own programs, or to use the API (scripting or remote control the
office). For a complete working environment, we have some additional office). For a complete working environment, we have some additional
requirements:</p> requirements:</p>
</td> </td>
</tr> </tr>
<tr valign="top"> <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 <td class="content80">The SDK works on top of an existing office
installation and uses the same libraries as the office installation.</td> installation and uses the same libraries as the office installation.</td>
</tr> </tr>
...@@ -218,7 +218,7 @@ ...@@ -218,7 +218,7 @@
the output is generated in the SDK directory itself. If an output the output is generated in the SDK directory itself. If an output
directory is specified, the output is generated in a SDK dependent directory is specified, the output is generated in a SDK dependent
subdirectory in this directory (e.g. &lt;OO_SDK_OUTPUT_DIR&gt; 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>
<tr> <tr>
<td class="cell20"><b>SDK_AUTO_DEPLOYMENT</b></td> <td class="cell20"><b>SDK_AUTO_DEPLOYMENT</b></td>
......
odk/docs/notsupported.html
Dosyayı görüntüle @ e28ab69d
<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" /> <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> 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> </div> </td> </tr></table><map name="Map"> <area shape="rect" coords="10,68,93,105" href="http://www.sun.com"></map></body></html>
odk/docs/tools.html
Dosyayı görüntüle @ e28ab69d
<html> <html>
<head> <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"> <link rel="stylesheet" type="text/css" href="sdk_styles.css">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="author" content="J&uuml;rgen Schmidt"> <meta name="author" content="J&uuml;rgen Schmidt">
...@@ -145,7 +145,7 @@ ...@@ -145,7 +145,7 @@
office installation. UNO packages are UNO components (single libraries or 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 or more complex zip files that contains one or more libraries|
Jar files, type libraries and configuration items), scripts and 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 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> 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 <p>More details concerning deployment and this tool can be find in the
......
odk/examples/examples.html
Dosyayı görüntüle @ e28ab69d
This diff is collapsed.
odk/index.html
Dosyayı görüntüle @ e28ab69d
<html> <html>
<head> <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"> <link rel="stylesheet" type="text/css" href="docs/sdk_styles.css">
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<meta name="author" content="J&uuml;rgen Schmidt"> <meta name="author" content="J&uuml;rgen Schmidt">
...@@ -21,12 +21,12 @@ ...@@ -21,12 +21,12 @@
<tr> <tr>
<td><img class="nothing8" src="docs/images/nada.gif"></td> <td><img class="nothing8" src="docs/images/nada.gif"></td>
<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 office productivity suite that provides, in combination with this
SDK, all the essential tools for building and deploying custom 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> 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 eases the development of office components. It provides a set of
libraries, binaries, header, and IDL files which have final API's libraries, binaries, header, and IDL files which have final API's
and can only be extended with new functionality. This set of libraries and can only be extended with new functionality. This set of libraries
...@@ -41,8 +41,8 @@ ...@@ -41,8 +41,8 @@
with new functions.</p> with new functions.</p>
<p>The SDK provides the basic building blocks for external developers <p>The SDK provides the basic building blocks for external developers
to develop components in any language for which a binding exists. to develop components in any language for which a binding exists.
Currently, there are language bindings for OpenOffice.org 3.2 Basic, Java, Currently, there are language bindings for OpenOffice.org %PRODUCT_RELEASE% Basic, Java,
and different C++ compilers on different platforms, for OpenOffice.org 3.2, and different C++ compilers on different platforms, for OpenOffice.org %PRODUCT_RELEASE%,
thus covering the two most commonly used programming languages. There thus covering the two most commonly used programming languages. There
will be no limit for office automation in heterogeneous environments. will be no limit for office automation in heterogeneous environments.
Currently supported platforms of the SDK are Linux, Solaris (sparc, Currently supported platforms of the SDK are Linux, Solaris (sparc,
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
<tr valign="top"> <tr valign="top">
<td class="content4"><img src="docs/images/arrow-1.gif"></td> <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 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, API and the concepts behind it, with a rich set of examples,
implemented mainly in Java. This documentation is online in the implemented mainly in Java. This documentation is online in the
OpenOffice.org Wiki.</td> OpenOffice.org Wiki.</td>
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
<tr valign="top"> <tr valign="top">
<td class="content4"><img src="docs/images/arrow-1.gif"></td> <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 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>
<tr valign="top"> <tr valign="top">
<td class="content4"><img src="docs/images/arrow-1.gif"></td> <td class="content4"><img src="docs/images/arrow-1.gif"></td>
...@@ -132,7 +132,7 @@ ...@@ -132,7 +132,7 @@
Office Applications (OpenDocument) Technical Committee where you Office Applications (OpenDocument) Technical Committee where you
can find the latest information about the OASIS Open Document XML can find the latest information about the OASIS Open Document XML
file format which is the default document format file format which is the default document format
for OpenOffice.org 3.2.</td> for OpenOffice.org %PRODUCT_RELEASE%.</td>
</tr> </tr>
<tr valign="top"> <tr valign="top">
<td class="content4"><img src="docs/images/arrow-1.gif"></td> <td class="content4"><img src="docs/images/arrow-1.gif"></td>
...@@ -147,7 +147,7 @@ ...@@ -147,7 +147,7 @@
<tr valign="top"> <tr valign="top">
<td class="content4"><img src="docs/images/arrow-1.gif"></td> <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 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>
<tr valign="middle"> <tr valign="middle">
<td><img class="nothing10" src="docs/images/nada.gif"></td> <td><img class="nothing10" src="docs/images/nada.gif"></td>
......
odk/pack/copying/makefile.mk
Dosyayı görüntüle @ e28ab69d
...@@ -241,7 +241,7 @@ $(DESTDIRSETTINGS)/dk.mk : dk.mk ...@@ -241,7 +241,7 @@ $(DESTDIRSETTINGS)/dk.mk : dk.mk
tr -d "\015" < dk.mk | sed -e 's/@@RELEASE@@/$(PRODUCT_RELEASE)/' -e 's/@@BUILDID@@/$(RSCREVISION)/'> $@ tr -d "\015" < dk.mk | sed -e 's/@@RELEASE@@/$(PRODUCT_RELEASE)/' -e 's/@@BUILDID@@/$(RSCREVISION)/'> $@
$(CONVERTTAGFLAG) : $(DOCUHTMLFILES) $(CONVERTTAGFLAG) : $(DOCUHTMLFILES)
$(PERL) $(CONVERTTAGSCRIPT) 1 "$(TITLE)" "$(OFFICEPRODUCTNAME)" $(DOCUHTMLFILES) # $(PERL) $(CONVERTTAGSCRIPT) 1 "$(TITLE)" "$(OFFICEPRODUCTNAME)" $(DOCUHTMLFILES)
@echo "tags converted" > $@ @echo "tags converted" > $@
$(IDL_DOCU_CLEANUP_FLAG) : $(IDL_CHAPTER_REFS) $(PRJ)/docs/common/ref/idl.css $(DESTIDLLIST) $(IDL_DOCU_CLEANUP_FLAG) : $(IDL_CHAPTER_REFS) $(PRJ)/docs/common/ref/idl.css $(DESTIDLLIST)
......
odk/setsdkenv_unix.csh.in
Dosyayı görüntüle @ e28ab69d
...@@ -9,16 +9,16 @@ setenv OO_SDK_NAME @OO_SDK_NAME@ ...@@ -9,16 +9,16 @@ setenv OO_SDK_NAME @OO_SDK_NAME@
# Installation directory of the Software Development Kit. # Installation directory of the Software Development Kit.
# Example: setenv OO_SDK_HOME /opt/openoffice.org/basis3.0/sdk # Example: setenv OO_SDK_HOME /opt/openoffice.org/basis3.0/sdk
setenv OO_SDK_HOME @OO_SDK_HOME@ setenv OO_SDK_HOME '@OO_SDK_HOME@'
# Office installation directory. # Office installation directory.
# Example: set OFFICE_HOME=/opt/openoffice.org3 # Example: set OFFICE_HOME=/opt/openoffice.org3
set OFFICE_HOME=@OFFICE_HOME@ set OFFICE_HOME='@OFFICE_HOME@'
OFFICE_BASE_HOME=@OFFICE_BASE_HOME@ OFFICE_BASE_HOME='@OFFICE_BASE_HOME@'
# URE installation directory. # URE installation directory.
# Example: setenv OO_SDK_URE_HOME /opt/openoffice.org/ure # Example: setenv OO_SDK_URE_HOME /opt/openoffice.org/ure
setenv OO_SDK_URE_HOME @OO_SDK_URE_HOME@ setenv OO_SDK_URE_HOME '@OO_SDK_URE_HOME@'
# Directory of the make command. # Directory of the make command.
# Example: setenv OO_SDK_MAKE_HOME /usr/bin # Example: setenv OO_SDK_MAKE_HOME /usr/bin
......
odk/setsdkenv_unix.sh.in
Dosyayı görüntüle @ e28ab69d
...@@ -10,16 +10,16 @@ export OO_SDK_NAME ...@@ -10,16 +10,16 @@ export OO_SDK_NAME
# Installation directory of the Software Development Kit. # Installation directory of the Software Development Kit.
# Example: OO_SDK_HOME=/opt/openoffice.org/basis3.0/sdk # Example: OO_SDK_HOME=/opt/openoffice.org/basis3.0/sdk
OO_SDK_HOME=@OO_SDK_HOME@ OO_SDK_HOME='@OO_SDK_HOME@'
# Office installation directory. # Office installation directory.
# Example: OFFICE_HOME=/opt/openoffice.org3 # Example: OFFICE_HOME=/opt/openoffice.org3
OFFICE_HOME=@OFFICE_HOME@ OFFICE_HOME='@OFFICE_HOME@'
OFFICE_BASE_HOME=@OFFICE_BASE_HOME@ OFFICE_BASE_HOME='@OFFICE_BASE_HOME@'
# URE installation directory. # URE installation directory.
# Example: OO_SDK_URE_HOME=/opt/openoffice.org/ure # Example: OO_SDK_URE_HOME=/opt/openoffice.org/ure
OO_SDK_URE_HOME=@OO_SDK_URE_HOME@ OO_SDK_URE_HOME='@OO_SDK_URE_HOME@'
export OO_SDK_URE_HOME export OO_SDK_URE_HOME
# Directory of the make command. # Directory of the make command.
......
odk/settings/settings.mk
Dosyayı görüntüle @ e28ab69d
...@@ -443,12 +443,12 @@ SALHELPERLIB=-luno_salhelper$(COMID) ...@@ -443,12 +443,12 @@ SALHELPERLIB=-luno_salhelper$(COMID)
REGLIB=-lreg REGLIB=-lreg
STORELIB=-lstore STORELIB=-lstore
SALDYLIB=-Wl,-dylib_file,@__________________________________________________URELIB/libuno_sal.dylib.3:$(OO_SDK_URE_LIB_DIR)/libuno_sal.dylib SALDYLIB=-Wl,-dylib_file,@__________________________________________________URELIB/libuno_sal.dylib.3:'$(OO_SDK_URE_LIB_DIR)/libuno_sal.dylib'
CPPUDYLIB=-Wl,-dylib_file,@__________________________________________________URELIB/libuno_cppu.dylib.3:$(OO_SDK_URE_LIB_DIR)/libuno_cppu.dylib CPPUDYLIB=-Wl,-dylib_file,@__________________________________________________URELIB/libuno_cppu.dylib.3:'$(OO_SDK_URE_LIB_DIR)/libuno_cppu.dylib'
CPPUHELPERDYLIB=-Wl,-dylib_file,@__________________________________________________URELIB/libuno_cppuhelper$(COMID).dylib.3:$(OO_SDK_URE_LIB_DIR)/libuno_cppuhelper$(COMID).dylib CPPUHELPERDYLIB=-Wl,-dylib_file,@__________________________________________________URELIB/libuno_cppuhelper'$(COMID).dylib.3:$(OO_SDK_URE_LIB_DIR)/libuno_cppuhelper$(COMID).dylib'
SALHELPERDYLIB=-Wl,-dylib_file,@__________________________________________________URELIB/libuno_salhelper$(COMID).dylib.3:$(OO_SDK_URE_LIB_DIR)/libuno_salhelper$(COMID).dylib SALHELPERDYLIB=-Wl,-dylib_file,@__________________________________________________URELIB/libuno_salhelper$(COMID).dylib.3:'$(OO_SDK_URE_LIB_DIR)/libuno_salhelper$(COMID).dylib'
REGDYLIB=-Wl,-dylib_file,@__________________________________________________URELIB/libreg.dylib.3:$(OO_SDK_URE_LIB_DIR)/libreg.dylib REGDYLIB=-Wl,-dylib_file,@__________________________________________________URELIB/libreg.dylib.3:'$(OO_SDK_URE_LIB_DIR)/libreg.dylib'
STOREDYLIB=-Wl,-dylib_file,@__________________________________________________URELIB/libstore.dylib.3:$(OO_SDK_URE_LIB_DIR)/libstore.dylib STOREDYLIB=-Wl,-dylib_file,@__________________________________________________URELIB/libstore.dylib.3:'$(OO_SDK_URE_LIB_DIR)/libstore.dylib'
INSTALL_NAME_URELIBS=install_name_tool -change @__________________________________________________URELIB/libuno_sal.dylib.3 @executable_path/urelibs/libuno_sal.dylib.3 -change @__________________________________________________URELIB/libuno_cppu.dylib.3 @executable_path/urelibs/libuno_cppu.dylib.3 -change @__________________________________________________URELIB/libuno_cppuhelper$(COMID).dylib.3 @executable_path/urelibs/libuno_cppuhelper$(COMID).dylib.3 -change @__________________________________________________URELIB/libuno_salhelper$(COMID).dylib.3 @executable_path/urelibs/libuno_salhelper$(COMID).dylib.3 -change @__________________________________________________URELIB/libreg.dylib.3 @executable_path/urelibs/libreg.dylib.3 -change @__________________________________________________URELIB/libstore.dylib.3 @executable_path/urelibs/libstore.dylib.3 INSTALL_NAME_URELIBS=install_name_tool -change @__________________________________________________URELIB/libuno_sal.dylib.3 @executable_path/urelibs/libuno_sal.dylib.3 -change @__________________________________________________URELIB/libuno_cppu.dylib.3 @executable_path/urelibs/libuno_cppu.dylib.3 -change @__________________________________________________URELIB/libuno_cppuhelper$(COMID).dylib.3 @executable_path/urelibs/libuno_cppuhelper$(COMID).dylib.3 -change @__________________________________________________URELIB/libuno_salhelper$(COMID).dylib.3 @executable_path/urelibs/libuno_salhelper$(COMID).dylib.3 -change @__________________________________________________URELIB/libreg.dylib.3 @executable_path/urelibs/libreg.dylib.3 -change @__________________________________________________URELIB/libstore.dylib.3 @executable_path/urelibs/libstore.dylib.3
...@@ -498,13 +498,37 @@ ifneq (,$(findstring freebsd,$(PLATFORM))) ...@@ -498,13 +498,37 @@ ifneq (,$(findstring freebsd,$(PLATFORM)))
PROCTYPE := $(shell $(PRJ)/config.guess | cut -d"-" -f1) PROCTYPE := $(shell $(PRJ)/config.guess | cut -d"-" -f1)
# Default is freebsd on a intel machine ifeq (kfreebsd,$(findstring kfreebsd,$(PLATFORM)))
PLATFORM=kfreebsd
ifeq "$(PROCTYPE)" "x86_64"
PACKAGE_LIB_DIR=kfreebsd_x86_64.plt
UNOPKG_PLATFORM=kFreeBSD_x86_64
else
PACKAGE_LIB_DIR=kfreebsd_x86.plt
UNOPKG_PLATFORM=kFreeBSD_x86
endif
else
PLATFORM=freebsd PLATFORM=freebsd
ifeq "$(PROCTYPE)" "x86_64"
PACKAGE_LIB_DIR=freebsd_x86_64.plt
UNOPKG_PLATFORM=FreeBSD_x86_64
else
PACKAGE_LIB_DIR=freebsd_x86.plt PACKAGE_LIB_DIR=freebsd_x86.plt
UNOPKG_PLATFORM=FreeBSD_x86 UNOPKG_PLATFORM=FreeBSD_x86
endif
endif
ifeq "$(PROCTYPE)" "x86_64"
JAVA_PROC_TYPE=amd64
else
JAVA_PROC_TYPE=i386 JAVA_PROC_TYPE=i386
endif
ifeq (kfreebsd,$(findstring kfreebsd,$(PLATFORM)))
OS=LINUX
else
OS=FREEBSD OS=FREEBSD
endif
PS=/ PS=/
ICL=\$$ ICL=\$$
CC=gcc CC=gcc
...@@ -520,13 +544,8 @@ SHAREDLIB_OUT=$(OUT_LIB) ...@@ -520,13 +544,8 @@ SHAREDLIB_OUT=$(OUT_LIB)
GCC_VERSION=$(shell $(CC) -dumpversion) GCC_VERSION=$(shell $(CC) -dumpversion)
ifeq "$(shell echo $(GCC_VERSION) | cut -c 1)" "3"
COMID=gcc3 COMID=gcc3
CPPU_ENV=gcc3 CPPU_ENV=gcc3
else
COMID=GCC
CPPU_ENV=gcc2
endif
OSEP=\< OSEP=\<
CSEP=\> CSEP=\>
......
odk/settings/std.mk
Dosyayı görüntüle @ e28ab69d
...@@ -32,8 +32,16 @@ OFFICE_SERVICES=$(subst \\,\,$(OFFICE_BASE_PROGRAM_PATH)$(PS)services.rdb) ...@@ -32,8 +32,16 @@ OFFICE_SERVICES=$(subst \\,\,$(OFFICE_BASE_PROGRAM_PATH)$(PS)services.rdb)
OFFICE_TYPE_LIBRARY="$(OFFICE_TYPES)" 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 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_JAVAC="$(OO_SDK_JAVA_HOME)/$(JAVABIN)/javac"
SDK_JAR="$(OO_SDK_JAVA_HOME)/$(JAVABIN)/jar" SDK_JAR="$(OO_SDK_JAVA_HOME)/$(JAVABIN)/jar"
SDK_ZIP="$(OO_SDK_ZIP_HOME)/zip" SDK_ZIP="$(OO_SDK_ZIP_HOME)/zip"
......
odk/source/unowinreg/win/makefile.mk
Dosyayı görüntüle @ e28ab69d
...@@ -42,7 +42,6 @@ USE_DEFFILE=TRUE ...@@ -42,7 +42,6 @@ USE_DEFFILE=TRUE
JAVA_INCLUDES:= -I$(JAVA_HOME)/include JAVA_INCLUDES:= -I$(JAVA_HOME)/include
# values taken from set_soenv.in # values taken from set_soenv.in
.IF "$(JDK)" != "gcj"
.IF "$(OS)" == "LINUX" .IF "$(OS)" == "LINUX"
JAVA_INCLUDES+= -I$(JAVA_HOME)/include/linux JAVA_INCLUDES+= -I$(JAVA_HOME)/include/linux
.ELIF "$(OS)" == "FREEBSD" .ELIF "$(OS)" == "FREEBSD"
...@@ -52,7 +51,6 @@ JAVA_INCLUDES+= -I$(JAVA_HOME)/include/linux ...@@ -52,7 +51,6 @@ JAVA_INCLUDES+= -I$(JAVA_HOME)/include/linux
.ELIF "$(OS)" == "NETBSD" .ELIF "$(OS)" == "NETBSD"
JAVA_INCLUDES+= -I$(JAVA_HOME)/include/netbsd JAVA_INCLUDES+= -I$(JAVA_HOME)/include/netbsd
.ENDIF .ENDIF
.ENDIF
.IF "$(SOLAR_JAVA)"=="" .IF "$(SOLAR_JAVA)"==""
nojava: nojava:
......
odk/util/odk_rules.pmk
Dosyayı görüntüle @ e28ab69d
...@@ -28,15 +28,15 @@ ...@@ -28,15 +28,15 @@
$(DESTDIRDOCU)/%.html : $(PRJ)/docs/%.html $(DESTDIRDOCU)/%.html : $(PRJ)/docs/%.html
@@-rm -f $@ @@-rm -f $@
$(MY_TEXTCOPY) $< $@ tr -d "\015" < $< | sed -e 's/%PRODUCT_RELEASE%/$(PRODUCT_RELEASE)/g' > $@
$(DESTDIREXAMPLES)/%.html : $(PRJ)/examples/%.html $(DESTDIREXAMPLES)/%.html : $(PRJ)/examples/%.html
@@-rm -f $@ @@-rm -f $@
$(MY_TEXTCOPY) $< $@ tr -d "\015" < $< | sed -e 's/%PRODUCT_RELEASE%/$(PRODUCT_RELEASE)/g' > $@
$(DESTDIR)/index.html : $(PRJ)/index.html $(DESTDIR)/index.html : $(PRJ)/index.html
@@-rm -f $@ @@-rm -f $@
$(MY_TEXTCOPY) $< $@ tr -d "\015" < $< | sed -e 's/%PRODUCT_RELEASE%/$(PRODUCT_RELEASE)/g' > $@
$(DESTDIRDOCU)/%.css : $(PRJ)/docs/%.css $(DESTDIRDOCU)/%.css : $(PRJ)/docs/%.css
@@-rm -f $@ @@-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