You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by js...@apache.org on 2013/05/31 09:23:17 UTC
svn commit: r1488117 - in /openoffice/trunk/main/odk: cfgWin.js configure.pl
setsdkenv_unix setsdkenv_unix.sh.in setsdkenv_windows.template
settings/settings.mk settings/std.mk settings/stdtarget.mk
Author: jsc
Date: Fri May 31 07:23:17 2013
New Revision: 1488117
URL: http://svn.apache.org/r1488117
Log:
#122356# adapt SDK config etc. to 3layer changes
Modified:
openoffice/trunk/main/odk/cfgWin.js
openoffice/trunk/main/odk/configure.pl
openoffice/trunk/main/odk/setsdkenv_unix
openoffice/trunk/main/odk/setsdkenv_unix.sh.in
openoffice/trunk/main/odk/setsdkenv_windows.template
openoffice/trunk/main/odk/settings/settings.mk
openoffice/trunk/main/odk/settings/std.mk
openoffice/trunk/main/odk/settings/stdtarget.mk
Modified: openoffice/trunk/main/odk/cfgWin.js
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/odk/cfgWin.js?rev=1488117&r1=1488116&r2=1488117&view=diff
==============================================================================
--- openoffice/trunk/main/odk/cfgWin.js (original)
+++ openoffice/trunk/main/odk/cfgWin.js Fri May 31 07:23:17 2013
@@ -37,7 +37,7 @@ var regKeyVC90 = "HKLM\\SOFTWARE\\Micros
//var regKeyVCExpress80 = "HKLM\\SOFTWARE\\Microsoft\\VCExpress\\8.0\\Setup\\VC\\ProductDir";
var regKeyVCExpress90 = "HKLM\\SOFTWARE\\Microsoft\\VCExpress\\9.0\\Setup\\VC\\ProductDir";
-
+var regKeyVCExpress90_2 = "HKLM\\SOFTWARE\\Wow6432Node\\Microsoft\\VCExpress\\9.0\\Setup\\VC\\ProductDir";
var regKeyWindowsSDK = "HKLM\\SOFTWARE\\Microsoft\\Microsoft SDKs\\Windows\\CurrentInstallFolder";
var WshShell = WScript.CreateObject("WScript.Shell");
@@ -510,11 +510,17 @@ function getCppHome()
}catch (exc) {}
if (sVC.length == 0)
{
- try {
- sVC = WshShell.RegRead(regKeyVC90);
- }catch (exc) {}
- }
- // check Windows SDK if VC 9
+ try {
+ sVC = WshShell.RegRead(regKeyVCExpress90_2);
+ }catch (exc) {}
+ }
+ if (sVC.length == 0)
+ {
+ try {
+ sVC = WshShell.RegRead(regKeyVC90);
+ }catch (exc) {}
+ }
+ // check Windows SDK if VC 9
if (sVC.length > 0)
{
oo_sdk_manifest_used="true";
@@ -919,67 +925,60 @@ function writeBatFile(fdir, file)
"REM are necessary for building the examples of the Office Development Kit.\n" +
"REM The Script was developed for the operating systems Windows.\n" +
"REM The SDK name\n" +
- "REM Example: set OO_SDK_NAME=openoffice4.0_sdk\n" +
- "set OO_SDK_NAME=" + oo_sdk_name +
+ "REM Example: @set OO_SDK_NAME=openoffice4.0_sdk\n" +
+ "@set OO_SDK_NAME=" + oo_sdk_name +
"\n\n" +
"REM Installation directory of the Software Development Kit.\n" +
- "REM Example: set OO_SDK_HOME=C:\\Program Files\\OpenOffice\\Basic 4.0\\sdk\n" +
- "set OO_SDK_HOME=" + oo_sdk_home +
+ "REM Example: @set OO_SDK_HOME=C:\\Program Files\\OpenOffice\\4\\sdk\n" +
+ "@set OO_SDK_HOME=" + oo_sdk_home +
"\n\n" +
"REM Office installation directory.\n" +
- "REM Example: set OFFICE_HOME=C:\\Program Files\\OpenOffice 4\n" +
- "set OFFICE_HOME=" + office_home +
- "\n\n" +
- "REM Example: set OFFICE_HOME=C:\\Program Files\\OpenOffice\\Basis 4.0\n" +
- "set OFFICE_BASE_HOME=" + office_base_home +
- "\n\n" +
- "REM URE installation directory.\n" +
- "REM Example: set OO_SDK_URE_HOME=C:\\Program Files\\OpenOffice\\URE\n" +
- "set OO_SDK_URE_HOME=" + oo_sdk_ure_home +
+ "REM Example: @set OFFICE_HOME=C:\\Program Files\\OpenOffice 4\n" +
+ "@set OFFICE_HOME=" + office_home +
"\n\n" +
"REM Directory of the make command.\n" +
- "REM Example: set OO_SDK_MAKE_HOME=D:\\NextGenerationMake\\make\n" +
- "set OO_SDK_MAKE_HOME=" + oo_sdk_make_home +
+ "REM Example: @set OO_SDK_MAKE_HOME=C:\\UnxUtils\\usr\\local\\wbin\n" +
+ "@set OO_SDK_MAKE_HOME=" + oo_sdk_make_home +
"\n\n" +
- "REM Directory of the zip tool.\n" +
- "REM Example: set OO_SDK_ZIP_HOME=D:\\infozip\\bin\n" +
- "set OO_SDK_ZIP_HOME=" + oo_sdk_zip_home +
+ "REM Directory of the zip tool.\n" +
+ "REM Example: @set OO_SDK_ZIP_HOME=C:\\UnxUtils\\usr\\local\\wbin\n" +
+ "@set OO_SDK_ZIP_HOME=" + oo_sdk_zip_home +
"\n\n" +
"REM Directory of the cat tool.\n" +
- "REM Example: set OO_SDK_CAT_HOME=C:\\UnxUtils\\usr\\local\\wbin\n" +
- "set OO_SDK_CAT_HOME=" + oo_sdk_cat_home +
+ "REM Example: @set OO_SDK_CAT_HOME=C:\\UnxUtils\\usr\\local\\wbin\n" +
+ "@set OO_SDK_CAT_HOME=" + oo_sdk_cat_home +
"\n\n" +
"REM Directory of the sed tool.\n" +
- "REM Example: set OO_SDK_SED_HOME=C:\\UnxUtils\\usr\\local\\wbin\n" +
- "set OO_SDK_SED_HOME=" + oo_sdk_sed_home +
+ "REM Example: @set OO_SDK_SED_HOME=C:\\UnxUtils\\usr\\local\\wbin\n" +
+ "@set OO_SDK_SED_HOME=" + oo_sdk_sed_home +
"\n\n" +
"REM Directory of the C++ compiler.\n" +
- "REM Example:set OO_SDK_CPP_HOME=C:\\Program Files\\Microsoft Visual Studio 9.0\\VC\\bin\n" +
- "set OO_SDK_CPP_HOME=" + oo_sdk_cpp_home +
- "\nset CPP_MANIFEST=" + oo_sdk_manifest_used +
- "\nset CPP_WINDOWS_SDK=" + oo_sdk_windowssdk +
+ "REM Example: @set OO_SDK_CPP_HOME=C:\\Program Files\\Microsoft Visual Studio 9.0\\VC\\bin\n" +
+ "@set OO_SDK_CPP_HOME=" + oo_sdk_cpp_home +
+ "\n@set CPP_MANIFEST=" + oo_sdk_manifest_used +
+ "\n@set CPP_WINDOWS_SDK=" + oo_sdk_windowssdk +
"\n\n" +
"REM Directory of the C# and VB.NET compilers.\n" +
- "REM Example:set OO_SDK_CLI_HOME=C:\\WINXP\\Microsoft.NET\\Framework\\v1.0.3705\n" +
- "set OO_SDK_CLI_HOME=" + oo_sdk_cli_home +
+ "REM Example: @set OO_SDK_CLI_HOME=C:\\WINXP\\Microsoft.NET\\Framework\\v1.0.3705\n" +
+ "@set OO_SDK_CLI_HOME=" + oo_sdk_cli_home +
"\n\n" +
"REM Java SDK installation directory.\n" +
"REM Example: set OO_SDK_JAVA_HOME=C:\\Program Files\\Java\\jdk1.6.0_05\n" +
- "set OO_SDK_JAVA_HOME=" + oo_sdk_java_home +
+ "@set OO_SDK_JAVA_HOME=" + oo_sdk_java_home +
"\n\n" +
"REM Special output directory\n" +
- "REM Example: set OO_SDK_OUT=C:\\" + oo_sdk_name + "\n" +
- "set OO_SDK_OUT=" + oo_sdk_out +
+ "REM Example: @set OO_SDK_OUT=C:\\" + oo_sdk_name + "\n" +
+ "@set OO_SDK_OUT=" + oo_sdk_out +
"\n\n" +
"REM Automatic deployment\n" +
- "REM Example: set SDK_AUTO_DEPLOYMENT=YES\n" +
- "set SDK_AUTO_DEPLOYMENT=" + sdk_auto_deployment +
+ "REM Example: @set SDK_AUTO_DEPLOYMENT=YES\n" +
+ "@set SDK_AUTO_DEPLOYMENT=" + sdk_auto_deployment +
"\n\n" +
- "set STLDEBUG=" + stldebug + "\n" +
- "REM check stlport lib in 4NT shell\n" +
- "REM if exist \"%OO_SDK_HOME%\\windows\\lib\\stlport_vc71_stldebug.lib\". (\n" +
- "REM set STLDEBUG=_stldebug\n" +
- "REM )\n\n" +
+ "@set STLDEBUG=" + stldebug + "\n" +
+ "REM check stlport lib in 4NT shell\n" +
+ "REM if exist \"%OO_SDK_HOME%\\windows\\lib\\stlport_vc71_stldebug.lib\". (\n" +
+ "REM @set STLDEBUG=_stldebug\n" +
+ "REM )\n\n" +
"REM Check installation path for the Office Development Kit.\n" +
"if not defined OO_SDK_HOME (\n" +
" echo Error: the variable OO_SDK_HOME is missing!\n" +
@@ -1020,79 +1019,55 @@ function writeBatFile(fdir, file)
" )\n" +
"\n" +
"REM Set library path. \n" +
- "set LIB=%OO_SDK_HOME%\\lib;%LIB%\n" +
+ "@set LIB=%OO_SDK_HOME%\\lib;%LIB%\n" +
"if defined CPP_WINDOWS_SDK (\n" +
- " set LIB=%LIB%;%CPP_WINDOWS_SDK%\\lib\n" +
+ " @set LIB=%LIB%;%CPP_WINDOWS_SDK%\\lib\n" +
" )\n" +
"\n" +
"REM Set office program path.\n" +
"if defined OFFICE_HOME (\n" +
- " set OFFICE_PROGRAM_PATH=%OFFICE_HOME%\\program\n" +
- " )\n" +
+ " @set OFFICE_PROGRAM_PATH=%OFFICE_HOME%\\program\n" +
+ " )" +
"\n" +
- "REM Set office program path.\n" +
- "if defined OFFICE_BASE_HOME (\n" +
- " set OFFICE_BASE_PROGRAM_PATH=%OFFICE_BASE_HOME%\\program\n" +
- " )\n" +
- "\n" +
- "REM Set UNO path, necessary to ensure that the cpp examples using the\n" +
- "REM new UNO bootstrap mechanism use the configured office installation\n" +
- "REM (only set when using an Office).\n" +
- "if defined OFFICE_HOME (\n" +
- " set UNO_PATH=%OFFICE_PROGRAM_PATH%\n" +
- " )\n" +
- "\n" +
- "REM if defined OO_SDK_URE_HOME (\n" +
- "set OO_SDK_URE_BIN_DIR=%OO_SDK_URE_HOME%\\bin\n" +
- "set OO_SDK_URE_LIB_DIR=%OO_SDK_URE_HOME%\\bin\n" +
- "set OO_SDK_URE_JAVA_DIR=%OO_SDK_URE_HOME%\\java\n" +
- "REM ) else (\n" +
- "set OO_SDK_OFFICE_BIN_DIR=%OFFICE_PROGRAM_PATH%\n" +
- "set OO_SDK_OFFICE_LIB_DIR=%OFFICE_BASE_PROGRAM_PATH%\n" +
- "set OO_SDK_OFFICE_JAVA_DIR=%OFFICE_BASE_PROGRAM_PATH%\\classes\n" +
+ "REM Set UNO path, necessary to ensure that the cpp examples using the\n" +
+ "REM new UNO bootstrap mechanism use the configured office installation\n" +
+ "REM (only set when using an Office).\n" +
+ "if defined OFFICE_HOME (\n" +
+ " @set UNO_PATH=%OFFICE_PROGRAM_PATH%\n" +
+ " )\n" +
+ "\n" +
+ "REM @set OO_SDK_URE_BIN_DIR=%OO_SDK_URE_HOME%\\bin\n" +
+ "REM @set OO_SDK_URE_LIB_DIR=%OO_SDK_URE_HOME%\\bin\n" +
+ "REM @set OO_SDK_URE_JAVA_DIR=%OO_SDK_URE_HOME%\\java\n" +
+ "\n" +
+ "@set OO_SDK_OFFICE_BIN_DIR=%OFFICE_PROGRAM_PATH%\n" +
+ "@set OO_SDK_OFFICE_LIB_DIR=%OFFICE_BASE_PROGRAM_PATH%\n" +
+ "@set OO_SDK_OFFICE_JAVA_DIR=%OFFICE_BASE_PROGRAM_PATH%\\classes\n" +
"REM )\n" +
"\n" +
"REM Set classpath\n" +
- "set CLASSPATH=%OO_SDK_URE_JAVA_DIR%\\juh.jar;%OO_SDK_URE_JAVA_DIR%\\jurt.jar;%OO_SDK_URE_JAVA_DIR%\\ridl.jar;%OO_SDK_URE_JAVA_DIR%\\unoloader.jar;%OO_SDK_OFFICE_JAVA_DIR%\\unoil.jar\n" +
- "REM if defined OFFICE_HOME (\n" +
- "REM set CLASSPATH=%CLASSPATH%;%OO_SDK_OFFICE_JAVA_DIR%\\unoil.jar\n" +
- "REM )\n" +
+ "@set CLASSPATH=%OO_SDK_URE_JAVA_DIR%\\juh.jar;%OO_SDK_URE_JAVA_DIR%\\jurt.jar;%OO_SDK_URE_JAVA_DIR%\\ridl.jar;%OO_SDK_URE_JAVA_DIR%\\unoloader.jar;%OO_SDK_OFFICE_JAVA_DIR%\\unoil.jar\n" +
"\n" +
"REM Add directory of the SDK tools to the path.\n" +
- "set PATH=%OO_SDK_HOME%\\bin;%OO_SDK_URE_BIN_DIR%;%OO_SDK_OFFICE_BIN_DIR%;%OO_SDK_HOME%\\WINexample.out\\bin;%PATH%\n" +
+ "set PATH=%OO_SDK_HOME%\\bin;%OO_SDK_URE_BIN_DIR%;%OO_SDK_OFFICE_BIN_DIR%;%OO_SDK_HOME%\\WINexample.out\\bin;%OO_SDK_MAKE_HOME%;%OO_SDK_ZIP_HOME%;%OO_SDK_CAT_HOME%;%OO_SDK_SED_HOME%;%PATH%\n" +
"\n" +
"REM Set PATH appropriate to the output directory\n" +
"if defined OO_SDK_OUT (\n" +
- " set PATH=%OO_SDK_OUT%\\WINexample.out\\bin;%PATH%\n" +
+ " @set PATH=%OO_SDK_OUT%\\WINexample.out\\bin;%PATH%\n" +
" ) else (\n" +
- " set PATH=%OO_SDK_HOME%\\WINexample.out\\bin;%PATH%\n" +
+ " @set PATH=%OO_SDK_HOME%\\WINexample.out\\bin;%PATH%\n" +
" )\n" +
"\n" +
- "REM Add directory of the command make to the path, if necessary.\n" +
- "if defined OO_SDK_MAKE_HOME set PATH=%OO_SDK_MAKE_HOME%;%PATH%\n" +
- "\n" +
- "REM Add directory of the zip tool to the path, if necessary.\n" +
- "if defined OO_SDK_ZIP_HOME set PATH=%OO_SDK_ZIP_HOME%;%PATH%\n" +
- "\n" +
- "REM Add directory of the cat tool to the path, if necessary.\n" +
- "if defined OO_SDK_CAT_HOME set PATH=%OO_SDK_CAT_HOME%;%PATH%\n" +
- "\n" +
- "REM Add directory of the sed tool to the path, if necessary.\n" +
- "if defined OO_SDK_SED_HOME set PATH=%OO_SDK_SED_HOME%;%PATH%\n" +
- "\n" +
- "REM Add directory of the C++ compiler to the path, if necessary.\n" +
- "if defined OO_SDK_CPP_HOME set PATH=%OO_SDK_CPP_HOME%;%PATH%\n" +
- "\n" +
"REM Add directory of the Win SDK to the path, if necessary.\n" +
"if defined CPP_WINDOWS_SDK (\n" +
- " set PATH=%CPP_WINDOWS_SDK\\bin%;%PATH%\n" +
- " set INCLUDE=%CPP_WINDOWS_SDK\\Include%;%INCLUDE%\n" +
+ " @set PATH=%CPP_WINDOWS_SDK\\bin%;%PATH%\n" +
+ " @set INCLUDE=%CPP_WINDOWS_SDK\\Include%;%INCLUDE%\n" +
")\n" +
"REM Add directory of the C# and VB.NET compilers to the path, if necessary.\n" +
- "if defined OO_SDK_CLI_HOME set PATH=%OO_SDK_CLI_HOME%;%PATH%\n" +
+ "if defined OO_SDK_CLI_HOME @set PATH=%OO_SDK_CLI_HOME%;%PATH%\n" +
"\n" +
"REM Add directory of the Java tools to the path, if necessary.\n" +
- "if defined OO_SDK_JAVA_HOME set PATH=%OO_SDK_JAVA_HOME%\\bin;%OO_SDK_JAVA_HOME%\\jre\\bin;%PATH%\n" +
+ "if defined OO_SDK_JAVA_HOME @set PATH=%OO_SDK_JAVA_HOME%\\bin;%OO_SDK_JAVA_HOME%\\jre\\bin;%PATH%\n" +
"\n" +
"REM Set environment for C++ compiler tools, if necessary.\n" +
"if defined OO_SDK_CPP_HOME call \"%OO_SDK_CPP_HOME%\\VCVARS32.bat\"\n" +
@@ -1107,8 +1082,6 @@ function writeBatFile(fdir, file)
"echo *\n" +
"echo * SDK = %OO_SDK_HOME%\n" +
"echo * Office = %OFFICE_HOME%\n" +
- "echo * Office Base = %OFFICE_BASE_HOME%\n" +
- "echo * URE = %OO_SDK_URE_HOME%\n" +
"echo * Make = %OO_SDK_MAKE_HOME%\n" +
"echo * Zip = %OO_SDK_ZIP_HOME%\n" +
"echo * cat = %OO_SDK_CAT_HOME%\n" +
Modified: openoffice/trunk/main/odk/configure.pl
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/odk/configure.pl?rev=1488117&r1=1488116&r2=1488117&view=diff
==============================================================================
--- openoffice/trunk/main/odk/configure.pl (original)
+++ openoffice/trunk/main/odk/configure.pl Fri May 31 07:23:17 2013
@@ -43,23 +43,11 @@ $main::operatingSystem = `$main::sdkpath
chomp ($main::operatingSystem);
$main::OO_SDK_HOME = $main::sdkpath;
-#$main::OO_SDK_HOME = "";
$main::OO_SDK_HOME_SUGGESTION = $main::sdkpath;
-$main::OFFICE_OR_URE = "Office";
-$main::OFFICE_OR_URE_SUGGESTION = "Office";
-
$main::OFFICE_HOME = "";
-$main::OFFICE_BASE_HOME = substr($main::sdkpath, 0, rindex($main::sdkpath, "/sdk"));
-
-if ( $main::operatingSystem =~ m/darwin/ )
-{
-# $main::OO_SDK_URE_HOME = `cd $main::sdkpath/../ure-link && pwd`;
-} else {
- $main::OO_SDK_URE_HOME = `cd $main::sdkpath/../ure-link && pwd`;
-}
-chomp($main::OO_SDK_URE_HOME);
+#$main::OFFICE_BASE_HOME = substr($main::sdkpath, 0, rindex($main::sdkpath, "/sdk"));
$main::OO_SDK_MAKE_HOME = "";
$main::makeName = "make";
@@ -115,143 +103,106 @@ $main::skipOutputDir = 0;
$main::return = 0;
-if ( $main::OFFICE_OR_URE eq "Office" )
+if ( $main::operatingSystem =~ m/darwin/ )
{
- if ( $main::operatingSystem =~ m/darwin/ )
- {
# used for a SDK as part of the office installation
-# $main::OFFICE_HOME = `cd $main::sdkpath/../../.. && pwd`;
-# chomp($main::OFFICE_HOME);
-# print " Used Office = $main::OFFICE_HOME\n";
- print " Used SDK = $main::OO_SDK_HOME\n\n";
-
- $main::OFFICE_HOME_SUGGESTION = searchMacOffice();
- while ( (! -d "$main::OFFICE_HOME" ) ||
- ((-d "$main::OFFICE_HOME") && (! -d "$main::OFFICE_HOME/Contents/MacOS")) )
- {
- print " Enter the Office installation directory [$main::OFFICE_HOME_SUGGESTION]: ";
- $main::OFFICE_HOME = readStdIn();
- chop($main::OFFICE_HOME);
- if ( $main::OFFICE_HOME eq "" )
- {
- $main::OFFICE_HOME = $main::OFFICE_HOME_SUGGESTION;
- }
-
- if ( ! -d "$main::OFFICE_HOME" )
- {
- $main::OFFICE_HOME = "";
- print " Error: An office installation is required, please specify the path to a valid installation.\n";
- }
-
- # check more details
- if ( -d "$main::OFFICE_HOME/Contents/basis-link" ) {
- $main::OFFICE_BASE_HOME = "$main::OFFICE_HOME/Contents/basis-link";
- if ( -d "$main::OFFICE_BASE_HOME/ure-link" ) {
- $main::OO_SDK_URE_HOME = "$main::OFFICE_BASE_HOME/ure-link";
- } else {
- $main::OFFICE_HOME = "";
- $main::OFFICE_BASE_HOME = "";
- $main::OO_SDK_URE_HOME = "";
- print " Error: no URE found in office installation, please specify the path to a valid installation.\n";
- }
- } else {
- $main::OFFICE_HOME = "";
- $main::OFFICE_BASE_HOME = "";
- $main::OO_SDK_URE_HOME = "";
- print " Error: no base layer found in office installation, please specify the path to a valid installation.\n";
- }
- }
+# $main::OFFICE_HOME = `cd $main::sdkpath/../../.. && pwd`;
+# chomp($main::OFFICE_HOME);
+# print " Used Office = $main::OFFICE_HOME\n";
+ print " Used SDK = $main::OO_SDK_HOME\n\n";
+
+ $main::OFFICE_HOME_SUGGESTION = searchMacOffice();
+ while ( (! -d "$main::OFFICE_HOME" ) ||
+ ((-d "$main::OFFICE_HOME") && (! -d "$main::OFFICE_HOME/Contents/MacOS")) )
+ {
+ print " Enter the Office installation directory [$main::OFFICE_HOME_SUGGESTION]: ";
+ $main::OFFICE_HOME = readStdIn();
+ chop($main::OFFICE_HOME);
+ if ( $main::OFFICE_HOME eq "" )
+ {
+ $main::OFFICE_HOME = $main::OFFICE_HOME_SUGGESTION;
+ }
+
+ if ( ! -d "$main::OFFICE_HOME" )
+ {
+ $main::OFFICE_HOME = "";
+ print " Error: An office installation is required, please specify the path to a valid installation.\n";
+ }
+
+# $main::OFFICE_BASE_HOME = "$main::OFFICE_HOME/Contents";
+ }
+} else
+{
+ $main::OFFICE_HOME_SUGGESTION = searchoffice();
+
+ if ( $main::OFFICE_HOME_SUGGESTION eq "" ) {
+ # prepare Office path
+ $main::OFFICE_HOME_SUGGESTION = searchprog("soffice");
+ }
+
+ if ( ! $main::OFFICE_HOME_SUGGESTION eq "" )
+ {
+ my $tmpOffice = readlink "$main::OFFICE_HOME_SUGGESTION/soffice";
+
+ if ( $tmpOffice eq "" )
+ {
+ $tmpOffice = "$main::OFFICE_HOME_SUGGESTION/soffice";
+ }
+
+ my $offset = rindex($tmpOffice, "/program/soffice");
+ if ( $offset != -1 )
+ {
+ $main::OFFICE_HOME_SUGGESTION = substr($tmpOffice, 0, $offset);
} else
{
- $main::OFFICE_HOME_SUGGESTION = searchoffice();
-
- if ( $main::OFFICE_HOME_SUGGESTION eq "" ) {
- # prepare Office path
- $main::OFFICE_HOME_SUGGESTION = searchprog("soffice");
- }
-
- if ( ! $main::OFFICE_HOME_SUGGESTION eq "" )
- {
- my $tmpOffice = readlink "$main::OFFICE_HOME_SUGGESTION/soffice";
-
- if ( $tmpOffice eq "" )
- {
- $tmpOffice = "$main::OFFICE_HOME_SUGGESTION/soffice";
- }
-
- my $offset = rindex($tmpOffice, "/program/soffice");
- if ( $offset != -1 )
- {
- $main::OFFICE_HOME_SUGGESTION = substr($tmpOffice, 0, $offset);
- } else
- {
- $offset = rindex($tmpOffice, "/soffice");
- if ( $offset != -1 )
- {
- $main::OFFICE_HOME_SUGGESTION = substr($tmpOffice, 0, $offset);
- } else
- {
- $main::OFFICE_HOME_SUGGESTION = "";
- }
- }
- }
+ $offset = rindex($tmpOffice, "/soffice");
+ if ( $offset != -1 )
+ {
+ $main::OFFICE_HOME_SUGGESTION = substr($tmpOffice, 0, $offset);
+ } else
+ {
+ $main::OFFICE_HOME_SUGGESTION = "";
+ }
+ }
+ }
+
+ while ( (! -d "$main::OFFICE_HOME" ) ||
+ ((-d "$main::OFFICE_HOME") && (! -d "$main::OFFICE_HOME/program")) )
+ {
+ print " Enter the Office installation directory [$main::OFFICE_HOME_SUGGESTION]: ";
+ $main::OFFICE_HOME = readStdIn();
+ chop($main::OFFICE_HOME);
+ if ( $main::OFFICE_HOME eq "" )
+ {
+ $main::OFFICE_HOME = $main::OFFICE_HOME_SUGGESTION;
+ }
+
+ if ( ! -d "$main::OFFICE_HOME" )
+ {
+ $main::OFFICE_HOME = "";
+ print " Error: An office installation is required, please specify the path to a valid installation.\n";
+ } else
+ {
+ # special work for a network installation, no prgram directory but a link to the soffice binary
+ if ( (! -d "$main::OFFICE_HOME/program") && (-e "$main::OFFICE_HOME/soffice") )
+ {
+ my $soserver = `ls -l $OFFICE_HOME_SUGGESTION/soffice | sed -n 's/.* -> //p'`;
+ $soserver= substr($soserver, 0, rindex($soserver, "program") - 1);
- while ( (! -d "$main::OFFICE_HOME" ) ||
- ((-d "$main::OFFICE_HOME") && (! -d "$main::OFFICE_HOME/program")) )
+ if ( ! -d $soserver )
{
- print " Enter the Office installation directory [$main::OFFICE_HOME_SUGGESTION]: ";
- $main::OFFICE_HOME = readStdIn();
- chop($main::OFFICE_HOME);
- if ( $main::OFFICE_HOME eq "" )
- {
- $main::OFFICE_HOME = $main::OFFICE_HOME_SUGGESTION;
- }
-
- if ( ! -d "$main::OFFICE_HOME" )
- {
- $main::OFFICE_HOME = "";
- print " Error: An office installation is required, please specify the path to a valid installation.\n";
- } else
- {
- # special work for a network installation, no prgram directory but a link to the soffice binary
- if ( (! -d "$main::OFFICE_HOME/program") && (-e "$main::OFFICE_HOME/soffice") )
- {
- my $soserver = `ls -l $OFFICE_HOME_SUGGESTION/soffice | sed -n 's/.* -> //p'`;
- $soserver= substr($soserver, 0, rindex($soserver, "program") - 1);
-
- if ( ! -d $soserver )
- {
- $main::OFFICE_HOME = "";
- print " Error: An office installation is required, please specify the path to a valid installation.\n";
- } else
- {
- $main::OFFICE_HOME = $soserver;
- }
- }
- }
+ $main::OFFICE_HOME = "";
+ print " Error: An office installation is required, please specify the path to a valid installation.\n";
+ } else
+ {
+ $main::OFFICE_HOME = $soserver;
}
+ }
}
-}
-else
-{
- # prepare URE path
- $main::OO_SDK_URE_HOME_SUGGESTION = "/opt/openoffice/ure";
- $main::OO_SDK_URE_HOME_SUGGESTION = "" unless
- -e "$main::OO_SDK_URE_HOME_SUGGESTION/bin/uno";
- for (;;)
- {
- print " Enter the URE installation directory",
- " [$main::OO_SDK_URE_HOME_SUGGESTION]: ";
- $main::OO_SDK_URE_HOME = readStdIn();
- chop $main::OO_SDK_URE_HOME;
- $main::OO_SDK_URE_HOME = $main::OO_SDK_URE_HOME_SUGGESTION if
- $main::OO_SDK_URE_HOME eq "" &&
- $main::OO_SDK_URE_HOME_SUGGESTION ne "";
- last if -e "$main::OO_SDK_URE_HOME/bin/uno";
- print " Error: A valid URE installation is required.\n";
}
}
+
# prepare GNU make path
while ( (!$main::correctVersion) &&
((! -d "$main::OO_SDK_MAKE_HOME" ) ||
@@ -573,25 +524,18 @@ while ( (!$main::skipOutputDir) &&
}
# prepare auto deployment
-if ( $main::OFFICE_OR_URE eq "Office" )
-{
- while ( $main::SDK_AUTO_DEPLOYMENT eq "" ||
- ((! $main::SDK_AUTO_DEPLOYMENT eq "YES") &&
- (! $main::SDK_AUTO_DEPLOYMENT eq "NO")) )
+while ( $main::SDK_AUTO_DEPLOYMENT eq "" ||
+ ((! $main::SDK_AUTO_DEPLOYMENT eq "YES") &&
+ (! $main::SDK_AUTO_DEPLOYMENT eq "NO")) )
+{
+ print " Automatic deployment of UNO components (YES/NO) [$main::SDK_AUTO_DEPLOYMENT_SUGGESTION]: ";
+ $main::SDK_AUTO_DEPLOYMENT = uc <STDIN>;
+ chop($main::SDK_AUTO_DEPLOYMENT);
+ if ( $main::SDK_AUTO_DEPLOYMENT eq "" )
{
- print " Automatic deployment of UNO components (YES/NO) [$main::SDK_AUTO_DEPLOYMENT_SUGGESTION]: ";
- $main::SDK_AUTO_DEPLOYMENT = uc <STDIN>;
- chop($main::SDK_AUTO_DEPLOYMENT);
- if ( $main::SDK_AUTO_DEPLOYMENT eq "" )
- {
- $main::SDK_AUTO_DEPLOYMENT = "YES";
- }
+ $main::SDK_AUTO_DEPLOYMENT = "YES";
}
}
-else
-{
- $main::SDK_AUTO_DEPLOYMENT = "NO";
-}
prepareScriptFile("setsdkenv_unix.sh.in", "setsdkenv_unix.sh");
chmod 0644, "$main::OO_SDK_CONFIG_HOME/$main::hostname/setsdkenv_unix.sh";
@@ -714,19 +658,6 @@ sub searchMacOffice
if (-d "/Applications/OpenOffice.app" ) {
return "/Applications/OpenOffice.app"
}
- if (-d "/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" ) {
- return "/Applications/StarOffice.app";
- }
- if (-d "/Applications/StarSuite.app" ) {
- return "/Applications/StarSuite.app";
- }
-
return "";
}
@@ -744,59 +675,7 @@ sub searchoffice
if (-d $officepath && -e "$officepath/program/soffice") {
return $officepath;
}
- # 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;
- if ( $main::OO_MINORVERSION > 0) {
- $tmpversion = "$tmpversion.$main::OO_MINORVERSION";
- }
-
- $officepath = "$tmpOffice/staroffice$tmpversion";
- if (-d $officepath && -e "$officepath/program/soffice") {
- return $officepath;
- }
- $officepath = "$tmpOffice/StarOffice$tmpversion";
- if (-d $officepath && -e "$officepath/program/soffice") {
- return $officepath;
- }
- $officepath = "$tmpOffice/starsuite$tmpversion";
- if (-d $officepath && -e "$officepath/program/soffice") {
- return $officepath;
- }
- $officepath = "$tmpOffice/StarSuite$tmpversion";
- if (-d $officepath && -e "$officepath/program/soffice") {
- return $officepath;
- }
- $officepath = "";
-
- # search other potential matching office versions
- my $path = "/opt/";
- my $entry = "";
- my $version = "0";
- for $entry (glob($path.'*')) {
- ## if the file is a directory
- if( -d $entry) {
-
- if ($entry =~ m#(.+(o|O)ffice(\.org){0,1}(\d([\d\.]){0,2}))# ||
- $entry =~ m#(.+(s|S)uite(.*)(\d([\d\.]){0,2}))# )
- {
- if ($4 > $version) {
- $version = $4;
- $officepath = $entry;
- }
- }
- }
- }
- return $officepath;
+ return "";
}
@@ -865,12 +744,11 @@ sub prepareScriptFile()
$_ =~ s#\@OO_SDK_NAME\@#$main::OO_SDK_NAME#go;
$_ =~ s#\@OO_SDK_HOME\@#$main::OO_SDK_HOME#go;
$_ =~ s#\@OFFICE_HOME\@#$main::OFFICE_HOME#go;
- $_ =~ s#\@OFFICE_BASE_HOME\@#$main::OFFICE_BASE_HOME#go;
- $_ =~ s#\@OO_SDK_URE_HOME\@#$main::OO_SDK_URE_HOME#go;
+# $_ =~ s#\@OFFICE_BASE_HOME\@#$main::OFFICE_BASE_HOME#go;
$_ =~ s#\@OO_SDK_MAKE_HOME\@#$main::OO_SDK_MAKE_HOME#go;
$_ =~ s#\@OO_SDK_ZIP_HOME\@#$main::OO_SDK_ZIP_HOME#go;
- $_ =~ s#\@OO_SDK_CAT_HOME\@#$main::OO_SDK_CAT_HOME#go;
- $_ =~ s#\@OO_SDK_SED_HOME\@#$main::OO_SDK_SED_HOME#go;
+ $_ =~ s#\@OO_SDK_CAT_HOME\@#$main::OO_SDK_CAT_HOME#go;
+ $_ =~ s#\@OO_SDK_SED_HOME\@#$main::OO_SDK_SED_HOME#go;
$_ =~ s#\@OO_SDK_CPP_HOME\@#$main::OO_SDK_CPP_HOME#go;
$_ =~ s#\@OO_SDK_CC_55_OR_HIGHER\@#$main::OO_SDK_CC_55_OR_HIGHER#go;
$_ =~ s#\@OO_SDK_JAVA_HOME\@#$main::OO_SDK_JAVA_HOME#go;
Modified: openoffice/trunk/main/odk/setsdkenv_unix
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/odk/setsdkenv_unix?rev=1488117&r1=1488116&r2=1488117&view=diff
==============================================================================
--- openoffice/trunk/main/odk/setsdkenv_unix (original)
+++ openoffice/trunk/main/odk/setsdkenv_unix Fri May 31 07:23:17 2013
@@ -30,7 +30,7 @@ if [ "$OSTYPE" = "Darwin" ]
then
OO_SDK_NAME=`basename $OO_SDK_HOME`
else
- OO_SDK_NAME=apacheopenoffice${OOVERSION}_sdk
+ OO_SDK_NAME=openoffice${OOVERSION}_sdk
fi
export OO_SDK_HOME
@@ -41,11 +41,7 @@ then
then
rm $HOME/$OO_SDK_NAME/$HOSTNAME/setsdkenv_unix.sh
fi
- if [ -r $HOME/$OO_SDK_NAME/$HOSTNAME/setsdkenv_unix.csh ]
- then
- rm $HOME/$OO_SDK_NAME/$HOSTNAME/setsdkenv_unix.csh
- fi
- shift
+ shift
elif [ "$1" = "-h" ] || [ "$1" = "--help" ] || [ -n "$1" ]
then
echo
Modified: openoffice/trunk/main/odk/setsdkenv_unix.sh.in
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/odk/setsdkenv_unix.sh.in?rev=1488117&r1=1488116&r2=1488117&view=diff
==============================================================================
--- openoffice/trunk/main/odk/setsdkenv_unix.sh.in (original)
+++ openoffice/trunk/main/odk/setsdkenv_unix.sh.in Fri May 31 07:23:17 2013
@@ -35,12 +35,6 @@ OO_SDK_HOME='@OO_SDK_HOME@'
# Office installation directory.
# Example: OFFICE_HOME=/opt/openoffice4
OFFICE_HOME='@OFFICE_HOME@'
-OFFICE_BASE_HOME='@OFFICE_BASE_HOME@'
-
-# URE installation directory.
-# Example: OO_SDK_URE_HOME=/opt/openoffice/ure
-OO_SDK_URE_HOME='@OO_SDK_URE_HOME@'
-export OO_SDK_URE_HOME
# Directory of the make command.
# Example: OO_SDK_MAKE_HOME=/usr/bin
@@ -115,14 +109,6 @@ then
export OFFICE_PROGRAM_PATH
fi
-# Set office program path (only set when using an Office).
-if [ "${OFFICE_BASE_HOME}" ]
-then
- OFFICE_BASE_PROGRAM_PATH=${OFFICE_BASE_HOME}/program
- export OFFICE_BASE_PROGRAM_PATH
-fi
-
-
# Set UNO path, necessary to ensure that the cpp examples using the
# new UNO bootstrap mechanism use the configured office installation (only set
# when using an Office).
@@ -132,16 +118,10 @@ then
export UNO_PATH
fi
-if [ "${OO_SDK_URE_HOME}" ]
-then
- OO_SDK_URE_BIN_DIR=${OO_SDK_URE_HOME}/bin
- OO_SDK_URE_LIB_DIR=${OO_SDK_URE_HOME}/lib
- OO_SDK_URE_JAVA_DIR=${OO_SDK_URE_HOME}/share/java
-else
- OO_SDK_URE_BIN_DIR=${OFFICE_PROGRAM_PATH}
- OO_SDK_URE_LIB_DIR=${OFFICE_BASE_PROGRAM_PATH}
- OO_SDK_URE_JAVA_DIR=${OFFICE_BASE_PROGRAM_PATH}/classes
-fi
+OO_SDK_URE_BIN_DIR=${OFFICE_PROGRAM_PATH}
+OO_SDK_URE_LIB_DIR=${OFFICE_PROGRAM_PATH}
+OO_SDK_URE_JAVA_DIR=${OFFICE_PROGRAM_PATH}/classes
+
export OO_SDK_URE_BIN_DIR
export OO_SDK_URE_LIB_DIR
export OO_SDK_URE_JAVA_DIR
@@ -189,7 +169,7 @@ case ${sdk_platform} in
exampleout=MACOSXexample.out
platform=MacOSX
stldebug=_stldebug
- DYLD_LIBRARY_PATH=${OO_SDK_OUT}/${directoryname}/lib:${OO_SDK_OUT}/${exampleout}/lib:${OO_SDK_URE_LIB_DIR}:.:${DYLD_LIBRARY_PATH}
+ DYLD_LIBRARY_PATH=/usr/lib:${OO_SDK_OUT}/${directoryname}/lib:${OO_SDK_OUT}/${exampleout}/lib:${OO_SDK_URE_LIB_DIR}:.:${DYLD_LIBRARY_PATH}
export DYLD_LIBRARY_PATH
;;
@@ -257,7 +237,7 @@ esac
PATH=${OO_SDK_HOME}/bin:${OO_SDK_OUT}/${exampleout}/bin:${OO_SDK_URE_BIN_DIR}:${OFFICE_PROGRAM_PATH}:.:${PATH}
# Set the classpath
-CLASSPATH=${OO_SDK_URE_JAVA_DIR}/juh.jar:${OO_SDK_URE_JAVA_DIR}/jurt.jar:${OO_SDK_URE_JAVA_DIR}/ridl.jar:${OO_SDK_URE_JAVA_DIR}/unoloader.jar:${OFFICE_BASE_PROGRAM_PATH}/classes/unoil.jar:${CLASSPATH}
+CLASSPATH=${OO_SDK_URE_JAVA_DIR}/juh.jar:${OO_SDK_URE_JAVA_DIR}/jurt.jar:${OO_SDK_URE_JAVA_DIR}/ridl.jar:${OO_SDK_URE_JAVA_DIR}/unoloader.jar:${OO_SDK_URE_JAVA_DIR}/unoil.jar:${CLASSPATH}
export CLASSPATH
@@ -339,7 +319,7 @@ then
fi
# prepare links
- if [ "${OO_SDK_URE_HOME}" ]
+ if [ "${OFFICE_HOME}" ]
then
mkdir -p "${OO_SDK_OUT}/${directoryname}/lib"
ln -s "${OO_SDK_URE_LIB_DIR}/libuno_cppu.${soext}.3" \
@@ -370,8 +350,6 @@ echo " * SDK environment is prepared for
echo " *"
echo " * SDK = $OO_SDK_HOME"
echo " * Office = $OFFICE_HOME"
-echo " * Office Base = $OFFICE_BASE_HOME"
-echo " * URE = $OO_SDK_URE_HOME"
echo " * Make = $OO_SDK_MAKE_HOME"
echo " * Zip = $OO_SDK_ZIP_HOME"
echo " * cat = $OO_SDK_CAT_HOME"
Modified: openoffice/trunk/main/odk/setsdkenv_windows.template
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/odk/setsdkenv_windows.template?rev=1488117&r1=1488116&r2=1488117&view=diff
==============================================================================
--- openoffice/trunk/main/odk/setsdkenv_windows.template (original)
+++ openoffice/trunk/main/odk/setsdkenv_windows.template Fri May 31 07:23:17 2013
@@ -1,199 +1,157 @@
@echo off
-rem *************************************************************
-rem
-rem Licensed to the Apache Software Foundation (ASF) under one
-rem or more contributor license agreements. See the NOTICE file
-rem distributed with this work for additional information
-rem regarding copyright ownership. The ASF licenses this file
-rem to you under the Apache License, Version 2.0 (the
-rem "License")rem you may not use this file except in compliance
-rem with the License. You may obtain a copy of the License at
-rem
-rem http://www.apache.org/licenses/LICENSE-2.0
-rem
-rem Unless required by applicable law or agreed to in writing,
-rem software distributed under the License is distributed on an
-rem "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-rem KIND, either express or implied. See the License for the
-rem specific language governing permissions and limitations
-rem under the License.
-rem
-rem *************************************************************
-REM This script sets all enviroment variables, which
+Rem This script sets all enviroment variables, which
REM are necessary for building the examples of the Office Development Kit.
REM The Script was developed for the operating systems Windows.
REM The SDK name
-REM Example: set OO_SDK_NAME=apacheopenoffice4.0_sdk
-set OO_SDK_NAME=apacheopenoffice4.0_sdk
+REM Example: set OO_SDK_NAME=openoffice4.0_sdk
+set OO_SDK_NAME=openoffice4.0_sdk
REM Installation directory of the Software Development Kit.
-REM Example: set OO_SDK_HOME=C:\Program Files\OpenOffice\Basic 4.0\sdk
-set OO_SDK_HOME=
+REM Example: set OO_SDK_HOME=C:\Program Files\OpenOffice 4\sdk
+@set OO_SDK_HOME=
REM Office installation directory.
REM Example: set OFFICE_HOME=C:\Program Files\OpenOffice 4
-set OFFICE_HOME=
-
-REM Example: set OFFICE_HOME=C:\Program Files\OpenOffice\Basis 4.0
-set OFFICE_BASE_HOME=
-
-REM URE installation directory.
-REM Example: set OO_SDK_URE_HOME=C:\Program Files\OpenOffice\URE
-set OO_SDK_URE_HOME=
+@set OFFICE_HOME=
REM Directory of the make command.
-REM Example: set OO_SDK_MAKE_HOME=D:\NextGenerationMake\make
-set OO_SDK_MAKE_HOME=
+REM Example: set OO_SDK_MAKE_HOME=C:\UnixTools\usr\local\wbin
+@set OO_SDK_MAKE_HOME=
REM Directory of the zip tool.
-REM Example: set OO_SDK_ZIP_HOME=D:\infozip\bin
-set OO_SDK_ZIP_HOME=
+REM Example: set OO_SDK_ZIP_HOME=C:\UnixTools\usr\local\wbin
+@set OO_SDK_ZIP_HOME=
REM Directory of the cat tool.
-REM Example: set OO_SDK_CAT_HOME=C:\UnxUtils\usr\local\wbin\
-set OO_SDK_CAT_HOME=
+REM Example: set OO_SDK_CAT_HOME=C:\UnxUtils\usr\local\wbin
+@set OO_SDK_CAT_HOME=
REM Directory of the sed tool.
-REM Example: set OO_SDK_SED_HOME=C:\UnxUtils\usr\local\wbin\
-set OO_SDK_SED_HOME=
+REM Example: set OO_SDK_SED_HOME=C:\UnxUtils\usr\local\wbin
+@set OO_SDK_SED_HOME=
REM Directory of the C++ compiler.
REM Example:set OO_SDK_CPP_HOME=C:\Program Files\Microsoft Visual Studio 9.0\VC\bin
-REM Example:set CPP_WINDOWS_SDK=C:\Program Files\\Microsoft SDKs\Windows\v6.0A\
-set OO_SDK_CPP_HOME=
-set CPP_VC8=
-set CPP_WINDOWS_SDK=
+@set OO_SDK_CPP_HOME=
+@set CPP_MANIFEST=
+@set CPP_WINDOWS_SDK=
REM Directory of the C# and VB.NET compilers.
REM Example:set OO_SDK_CLI_HOME=C:\WINXP\Microsoft.NET\Framework\v1.0.3705
-set OO_SDK_CLI_HOME=
+@set OO_SDK_CLI_HOME=
REM Java SDK installation directory.
REM Example: set OO_SDK_JAVA_HOME=C:\Program Files\Java\jdk1.6.0_05
-set OO_SDK_JAVA_HOME=
+@set OO_SDK_JAVA_HOME=
REM Special output directory
-REM Example: set OO_SDK_OUT=C:\apacheopenoffice4.0_sdk
-set OO_SDK_OUT=
+REM Example: set OO_SDK_OUT=C:\openoffice4.0_sdk
+@set OO_SDK_OUT=
REM Automatic deployment
REM Example: set SDK_AUTO_DEPLOYMENT=YES
-set SDK_AUTO_DEPLOYMENT=YES
+@set SDK_AUTO_DEPLOYMENT=YES
-set STLDEBUG=
+@set STLDEBUG=
REM check stlport lib in 4NT shell
REM if exist "%OO_SDK_HOME%\windows\lib\stlport_vc71_stldebug.lib". (
-REM set STLDEBUG=_stldebug
+REM @set STLDEBUG=_stldebug
REM )
-REM Check installation path for the StarOffice Development Kit.
+REM Check installation path for the Office Development Kit.
if not defined OO_SDK_HOME (
echo Error: the variable OO_SDK_HOME is missing!
- goto :error
+ goto error
)
-REM Check installation path for the office.
-REM if not defined OFFICE_HOME (
-REM if not defined OO_SDK_URE_HOME (
-REM echo Error: either of the variables OFFICE_HOME and
-REM echo OO_SDK_URE_HOME is missing!
-REM goto :error
-REM )
-REM )
-
REM Check installation path for GNU make.
if not defined OO_SDK_MAKE_HOME (
echo Error: the variable OO_SDK_MAKE_HOME is missing!
- goto :error
+ goto error
)
REM Check installation path for the zip tool.
if not defined OO_SDK_ZIP_HOME (
echo Error: the variable OO_SDK_ZIP_HOME is missing!
- goto :error
+ goto error
)
REM Check installation path for the cat tool.
if not defined OO_SDK_CAT_HOME (
echo Error: the variable OO_SDK_CAT_HOME is missing!
- goto :error
+ goto error
)
REM Check installation path for the sed tool.
if not defined OO_SDK_SED_HOME (
echo Error: the variable OO_SDK_SED_HOME is missing!
- goto :error
+ goto error
)
REM Set library path.
-set LIB=%OO_SDK_HOME%\lib;%LIB%
+@set LIB=%OO_SDK_HOME%\lib;%LIB%
if defined CPP_WINDOWS_SDK (
- set LIB=%LIB%;%CPP_WINDOWS_SDK%\lib
+ @set LIB=%LIB%;%CPP_WINDOWS_SDK%\lib
)
REM Set office program path.
if defined OFFICE_HOME (
- set OFFICE_PROGRAM_PATH=%OFFICE_HOME%\program
- )
-
-REM Set office program path.
-if defined OFFICE_BASE_HOME (
- set OFFICE_BASE_PROGRAM_PATH=%OFFICE_BASE_HOME%\program
+ @set OFFICE_PROGRAM_PATH=%OFFICE_HOME%\program
)
REM Set UNO path, necessary to ensure that the cpp examples using the
REM new UNO bootstrap mechanism use the configured office installation
REM (only set when using an Office).
if defined OFFICE_HOME (
- set UNO_PATH=%OFFICE_PROGRAM_PATH%
- )
+ @set UNO_PATH=%OFFICE_PROGRAM_PATH%
+)
-REM if defined OO_SDK_URE_HOME (
-set OO_SDK_URE_BIN_DIR=%OO_SDK_URE_HOME%\bin
-set OO_SDK_URE_LIB_DIR=%OO_SDK_URE_HOME%\bin
-set OO_SDK_URE_JAVA_DIR=%OO_SDK_URE_HOME%\java
-REM ) else (
-set OO_SDK_OFFICE_BIN_DIR=%OFFICE_PROGRAM_PATH%
-set OO_SDK_OFFICE_LIB_DIR=%OFFICE_BASE_PROGRAM_PATH%
-set OO_SDK_OFFICE_JAVA_DIR=%OFFICE_BASE_PROGRAM_PATH%\classes
-REM )
+REM set OO_SDK_URE_BIN_DIR=%OFFICE_PROGRAM_PATH%
+REM set OO_SDK_URE_LIB_DIR=%OFFICE_PROGRAM_PATH%
+REM set OO_SDK_URE_JAVA_DIR=%OFFICE_PROGRAM_PATH%\classes
+
+@set OO_SDK_OFFICE_BIN_DIR=%OFFICE_PROGRAM_PATH%
+@set OO_SDK_OFFICE_LIB_DIR=%OFFICE_PROGRAM_PATH%
+@set OO_SDK_OFFICE_JAVA_DIR=%OFFICE_PROGRAM_PATH%\classes
REM Set classpath
-set CLASSPATH=%OO_SDK_URE_JAVA_DIR%\juh.jar;%OO_SDK_URE_JAVA_DIR%\jurt.jar;%OO_SDK_URE_JAVA_DIR%\ridl.jar;%OO_SDK_URE_JAVA_DIR%\unoloader.jar;%OO_SDK_OFFICE_JAVA_DIR%\unoil.jar
-REM if defined OFFICE_HOME (
-REM set CLASSPATH=%CLASSPATH%;%OO_SDK_OFFICE_JAVA_DIR%\unoil.jar
-REM )
+@set CLASSPATH=%OO_SDK_OFFICE_JAVA_DIR%\juh.jar;%OO_SDK_OFFICE_JAVA_DIR%\jurt.jar;%OO_SDK_OFFICE_JAVA_DIR%\ridl.jar;%OO_SDK_OFFICE_JAVA_DIR%\unoloader.jar;%OO_SDK_OFFICE_JAVA_DIR%\unoil.jar
REM Add directory of the SDK tools to the path.
-set PATH=%OO_SDK_HOME%\bin;%OO_SDK_URE_BIN_DIR%;%OO_SDK_OFFICE_BIN_DIR%;%OO_SDK_HOME%\WINexample.out\bin;%PATH%
+@set PATH=%OO_SDK_HOME%\bin;%OO_SDK_OFFICE_BIN_DIR%;%OO_SDK_HOME%\WINexample.out\bin;%OO_SDK_MAKE_HOME%;%OO_SDK_ZIP_HOME%;%OO_SDK_CAT_HOME%;%OO_SDK_SED_HOME%;%PATH%
-REM Set PATH appropriate to the output directory
if defined OO_SDK_OUT (
- set PATH=%OO_SDK_OUT%\WINexample.out\bin;%PATH%
- ) else (
- set PATH=%OO_SDK_HOME%\WINexample.out\bin;%PATH%
- )
+ @set PATH=%OO_SDK_OUT%\WINexample.out\bin;%PATH%
+) else (
+ @set PATH=%OO_SDK_HOME%\WINexample.out\bin;%PATH%
+)
REM Add directory of the command make to the path, if necessary.
-if defined OO_SDK_MAKE_HOME set PATH=%OO_SDK_MAKE_HOME%;%PATH%
+REM if defined OO_SDK_MAKE_HOME @set PATH+=%OO_SDK_MAKE_HOME%
-REM Add directory of the zip tool to the path, if necessary.
-if defined OO_SDK_ZIP_HOME set PATH=%OO_SDK_ZIP_HOME%;%PATH%
+Rem Add directory of the zip tool to the path, if necessary.
+REM if defined OO_SDK_ZIP_HOME @set PATH+=%OO_SDK_ZIP_HOME%
REM Add directory of the cat tool to the path, if necessary.
-if defined OO_SDK_CAT_HOME set PATH=%OO_SDK_CAT_HOME%;%PATH%
+REM if defined OO_SDK_CAT_HOME @set PATH+=%OO_SDK_CAT_HOME
REM Add directory of the sed tool to the path, if necessary.
-if defined OO_SDK_SED_HOME set PATH=%OO_SDK_SED_HOME%;%PATH%
+REM if defined OO_SDK_SED_HOME @set PATH+=%OO_SDK_SED_HOME%
REM Add directory of the C++ compiler to the path, if necessary.
-if defined OO_SDK_CPP_HOME set PATH=%OO_SDK_CPP_HOME%;%PATH%
+REM if defined OO_SDK_CPP_HOME @set PATH+=%OO_SDK_CPP_HOME%
+
+REM Add directory of the Win SDK to the path, if necessary.
+if defined CPP_WINDOWS_SDK (
+ @set PATH=%CPP_WINDOWS_SDK%\bin;%PATH%
+ @set INCLUDE=%CPP_WINDOWS_SDK%\Include;%INCLUDE%
+)
REM Add directory of the C# and VB.NET compilers to the path, if necessary.
-if defined OO_SDK_CLI_HOME set PATH=%OO_SDK_CLI_HOME%;%PATH%
+if defined OO_SDK_CLI_HOME @set PATH=%OO_SDK_CLI_HOME%;%PATH%
REM Add directory of the Java tools to the path, if necessary.
-if defined OO_SDK_JAVA_HOME set PATH=%OO_SDK_JAVA_HOME%\bin;%OO_SDK_JAVA_HOME%\jre\bin;%PATH%
+if defined OO_SDK_JAVA_HOME @set PATH=%OO_SDK_JAVA_HOME%\bin;%OO_SDK_JAVA_HOME%\jre\bin;%PATH%
REM Set environment for C++ compiler tools, if necessary.
if defined OO_SDK_CPP_HOME call "%OO_SDK_CPP_HOME%\VCVARS32.bat"
@@ -209,8 +167,6 @@ echo * SDK environment is prepared for
echo *
echo * SDK = %OO_SDK_HOME%
echo * Office = %OFFICE_HOME%
-echo * Office Base = %OFFICE_BASE_HOME%
-echo * URE = %OO_SDK_URE_HOME%
echo * Make = %OO_SDK_MAKE_HOME%
echo * Zip = %OO_SDK_ZIP_HOME%
echo * cat = %OO_SDK_CAT_HOME%
@@ -223,9 +179,10 @@ echo * Auto deployment = %SDK_AUTO_DEPL
echo *
echo ******************************************************************
echo.
-goto end
+goto:end
- :error
+:error
Error: Please insert the necessary environment variables into the batch file.
- :end
+:end
+
Modified: openoffice/trunk/main/odk/settings/settings.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/odk/settings/settings.mk?rev=1488117&r1=1488116&r2=1488117&view=diff
==============================================================================
--- openoffice/trunk/main/odk/settings/settings.mk (original)
+++ openoffice/trunk/main/odk/settings/settings.mk Fri May 31 07:23:17 2013
@@ -135,9 +135,9 @@ endif
LINK_JAVA_LIBS=/LIBPATH:"$(OO_SDK_JAVA_HOME)/lib"
-ifneq "$(OO_SDK_URE_HOME)" ""
-URE_MISC=$(OO_SDK_URE_HOME)\misc
-endif
+#ifneq "$(OFFICE_PROGRAM_PATH)" ""
+#URE_MISC=$(OFFICE_PROGRAM_PATH)\misc
+#endif
# use this for release version
#EXE_LINK_FLAGS=/MAP /OPT:NOREF /SUBSYSTEM:CONSOLE /BASE:0x1100000
@@ -154,7 +154,7 @@ endif
ifneq (,$(findstring solaris,$(PLATFORM)))
# Settings for Solaris using Sun Workshop compiler
-PROCTYPE := $(shell $(PRJ)/config.guess | cut -d"-" -f1)$(shell /usr/ccs/bin/elfdump -e "$(OO_SDK_URE_HOME)/lib/libuno_sal.so.3" | /usr/xpg4/bin/grep -q -w ELFCLASS64 && echo 64)
+PROCTYPE := $(shell $(PRJ)/config.guess | cut -d"-" -f1)$(shell /usr/ccs/bin/elfdump -e "$(OFFICE_PROGRAM_PATH)/libuno_sal.so.3" | /usr/xpg4/bin/grep -q -w ELFCLASS64 && echo 64)
ifeq "$(PROCTYPE)" "sparc"
PLATFORM=solsparc
@@ -255,8 +255,8 @@ LIBRARY_LINK_FLAGS+=-m64
EXE_LINK_FLAGS+=-m64
endif
-ifneq "$(OO_SDK_URE_HOME)" ""
-URE_MISC=$(OO_SDK_URE_HOME)/share/misc
+ifneq "$(OFFICE_PROGRAM_PATH)" ""
+URE_MISC=$(OFFICE_PROGRAM_PATH)/share/misc
endif
endif
@@ -402,8 +402,8 @@ EXE_LINK_FLAGS=-Wl,--allow-shlib-undefin
LINK_LIBS=-L"$(OUT)/lib" -L"$(OO_SDK_HOME)/lib" -L"$(OO_SDK_URE_LIB_DIR)"
LINK_JAVA_LIBS=-L"$(OO_SDK_JAVA_HOME)/jre/lib/$(JAVA_PROC_TYPE)"
-ifneq "$(OO_SDK_URE_HOME)" ""
-URE_MISC=$(OO_SDK_URE_HOME)/share/misc
+ifneq "$(OFFICE_PROGRAM_PATH)" ""
+URE_MISC=$(OFFICE_PROGRAM_PATH)/share/misc
endif
endif
@@ -490,7 +490,7 @@ SALHELPERDYLIB=-Wl,-dylib_file,@________
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'
-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/libuno_sal.dylib.3 -change @__________________________________________________URELIB/libuno_cppu.dylib.3 @executable_path/libuno_cppu.dylib.3 -change @__________________________________________________URELIB/libuno_cppuhelper$(COMID).dylib.3 @executable_path/libuno_cppuhelper$(COMID).dylib.3 -change @__________________________________________________URELIB/libuno_salhelper$(COMID).dylib.3 @executable_path/libuno_salhelper$(COMID).dylib.3 -change @__________________________________________________URELIB/libreg.dylib.3 @executable_path/libreg.dylib.3 -change @__________________________________________________URELIB/libstore.dylib.3 @executable_path/libstore.dylib.3
INSTALL_NAME_URELIBS_BIN=install_name_tool -change @__________________________________________________URELIB/libuno_sal.dylib.3 libuno_sal.dylib.3 -change @__________________________________________________URELIB/libuno_cppu.dylib.3 libuno_cppu.dylib.3 -change @__________________________________________________URELIB/libuno_cppuhelper$(COMID).dylib.3 libuno_cppuhelper$(COMID).dylib.3 -change @__________________________________________________URELIB/libuno_salhelper$(COMID).dylib.3 libuno_salhelper$(COMID).dylib.3 -change @__________________________________________________URELIB/libreg.dylib.3 libreg.dylib.3 -change @__________________________________________________URELIB/libstore.dylib.3 libstore.dylib.3
@@ -528,8 +528,8 @@ LINK_LIBS=-L$(OUT)/lib -L$(OO_SDK_OUT)/$
LINK_JAVA_LIBS=-framework JavaVM
#LINK_JAVA_LIBS=-L"$(OO_SDK_JAVA_HOME)/Libraries"
-ifneq "$(OO_SDK_URE_HOME)" ""
-URE_MISC=$(OO_SDK_URE_HOME)/share/misc
+ifneq "$(OFFICE_PROGRAM_PATH)" ""
+URE_MISC=$(OFFICE_PROGRAM_PATH)/share/misc
endif
endif
@@ -652,9 +652,9 @@ EXE_LINK_FLAGS=-Wl,--allow-shlib-undefin
LINK_LIBS=-L"$(OUT)/lib" -L"$(OO_SDK_HOME)/lib" -L"$(OO_SDK_URE_LIB_DIR)" $(PTHREAD_LIBS)
LINK_JAVA_LIBS=-L"$(OO_SDK_JAVA_HOME)/jre/lib/$(JAVA_PROC_TYPE)"
-ifneq "$(OO_SDK_URE_HOME)" ""
-URE_MISC=$(OO_SDK_URE_HOME)/share/misc
-endif
+#ifneq "$(OFFICE_PROGRAM_PATH)" ""
+#URE_MISC=$(OFFICE_PROGRAM_PATH)/share/misc
+#endif
endif
Modified: openoffice/trunk/main/odk/settings/std.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/odk/settings/std.mk?rev=1488117&r1=1488116&r2=1488117&view=diff
==============================================================================
--- openoffice/trunk/main/odk/settings/std.mk (original)
+++ openoffice/trunk/main/odk/settings/std.mk Fri May 31 07:23:17 2013
@@ -40,17 +40,17 @@ OUT_DEPLOY=$(OUT)/deploy
IDL_DIR=$(PRJ)/idl
BIN_DIR=$(PRJ)/bin
CLASSES_DIR=$(PRJ)/classes
-URE_CLASSES_DIR=$(subst \,/,$(OO_SDK_URE_JAVA_DIR))
-OFFICE_CLASSES_DIR=$(subst \,/,$(OFFICE_BASE_PROGRAM_PATH))/classes
+URE_CLASSES_DIR=$(subst \,/,$(OFFICE_PROGRAM_PATH))/classes
+OFFICE_CLASSES_DIR=$(subst \,/,$(OFFICE_PROGRAM_PATH))/classes
COMP_PACKAGE_DIR=$(subst /,$(PS),$(OUT_BIN))
SDKTYPEFLAG=$(OUT_MISC)/oosdk_cpp_types.flag
-URE_TYPES="$(subst \,/,$(URE_MISC)$(PS)types.rdb)"
-URE_SERVICES=$(subst \\,\,$(URE_MISC)$(PS)services.rdb)
+URE_TYPES="$(subst \,/,$(OFFICE_PROGRAM_PATH)$(PS)types.rdb)"
+URE_SERVICES=$(subst \\,\,$(OFFICE_PROGRAM_PATH)$(PS)services.rdb)
-OFFICE_TYPES="$(subst \,/,$(OFFICE_BASE_PROGRAM_PATH)$(PS)offapi.rdb)"
-OFFICE_SERVICES=$(subst \\,\,$(OFFICE_BASE_PROGRAM_PATH)$(PS)services.rdb)
+OFFICE_TYPES="$(subst \,/,$(OFFICE_PROGRAM_PATH)$(PS)types.rdb)"
+OFFICE_SERVICES=$(subst \\,\,$(OFFICE_PROGRAM_PATH)$(PS)services.rdb)
OFFICE_TYPE_LIBRARY="$(OFFICE_TYPES)"
@@ -64,6 +64,12 @@ endif
endif
endif
+ifeq "$(PLATFORM)" "macosx"
+OFFICE_LAUNCHER=DYLD_LIBRARY_PATH="" && "$(OFFICE_PROGRAM_PATH)$(PS)soffice"
+else
+OFFICE_LAUNCHER="$(OFFICE_PROGRAM_PATH)$(PS)soffice"
+endif
+
DEPLOYTOOL="$(OFFICE_PROGRAM_PATH)$(PS)unopkg" add -f
SDK_JAVA="$(OO_SDK_JAVA_HOME)/$(JAVABIN)/java" $(JAVA_OPTIONS)
SDK_JAVAC="$(OO_SDK_JAVA_HOME)/$(JAVABIN)/javac"
@@ -74,8 +80,8 @@ SDK_SED="$(OO_SDK_SED_HOME)/sed"
IDLC="$(OO_SDK_HOME)/bin/idlc"
CPPUMAKER="$(OO_SDK_HOME)/bin/cppumaker"
JAVAMAKER="$(OO_SDK_HOME)/bin/javamaker"
-REGMERGE="$(OO_SDK_URE_HOME)/bin/regmerge"
-REGCOMP="$(OO_SDK_URE_HOME)/bin/regcomp"
+REGMERGE="$(OFFICE_PROGRAM_PATH)/regmerge"
+REGCOMP="$(OFFICE_PROGRAM_PATH)/regcomp"
SDK_JAVA_UNO_BOOTSTRAP_FILES=\
-C $(CLASSES_DIR) $(SQM)com/sun/star/lib/loader/Loader.class$(SQM) \
Modified: openoffice/trunk/main/odk/settings/stdtarget.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/odk/settings/stdtarget.mk?rev=1488117&r1=1488116&r2=1488117&view=diff
==============================================================================
--- openoffice/trunk/main/odk/settings/stdtarget.mk (original)
+++ openoffice/trunk/main/odk/settings/stdtarget.mk Fri May 31 07:23:17 2013
@@ -32,5 +32,5 @@ install: $(REGISTERFLAG)
$(SDKTYPEFLAG): #$(URE_TYPES) $(OFFICE_TYPES)
-$(MKDIR) $(subst /,$(PS),$(@D))
-$(DEL) $(subst \\,\,$(subst /,$(PS),$(SDKTYPEFLAG)))
- $(CPPUMAKER) -Gc -BUCR -O$(OUT_INC) $(URE_TYPES) $(OFFICE_TYPES)
+ $(CPPUMAKER) -Gc -BUCR -O$(OUT_INC) $(OFFICE_TYPES)
echo flagged > $@