Author: jsc
Date: Fri Jun 7 12:21:31 2013
New Revision: 1490608
URL: http://svn.apache.org/r1490608
Log:
#122477# adapt config script, support 64bit Windows, fix search path
Modified:
openoffice/trunk/main/odk/cfgWin.js
openoffice/trunk/main/odk/setsdkenv_windows.template
Modified: openoffice/trunk/main/odk/cfgWin.js
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/odk/cfgWin.js?rev=1490608&r1=1490607&r2=1490608&view=diff
==============================================================================
--- openoffice/trunk/main/odk/cfgWin.js (original)
+++ openoffice/trunk/main/odk/cfgWin.js Fri Jun 7 12:21:31 2013
@@ -18,10 +18,13 @@
// under the License.
//
// *************************************************************
+
// This script asks for variables, which are necessary for building the
// examples of the Office Development Kit. The script duplicates the template
// script and inserts the variables into the copied script.
// The Script was developed for the operating systems Microsoft Windows.
+var regKeyOfficeCurrentUser6432Node =
"HKEY_CURRENT_USER\\Software\\Wow6432Node\\OpenOffice\\UNO\\InstallPath\\";
+var regKeyOfficeLocaleMachine6432Node =
"HKEY_LOCAL_MACHINE\\Software\\Wow6432Node\\OpenOffice\\UNO\\InstallPath\\";
var regKeyOfficeCurrentUser =
"HKEY_CURRENT_USER\\Software\\OpenOffice\\UNO\\InstallPath\\";
var regKeyOfficeLocaleMachine =
"HKEY_LOCAL_MACHINE\\Software\\OpenOffice\\UNO\\InstallPath\\";
var regKeyDotNetInstallRoot =
"HKEY_LOCAL_MACHINE\\Software\\Microsoft\\.NETFramework\\InstallRoot";
@@ -58,7 +61,6 @@ var oo_user_sdk_env_script=oo_user_sdk_d
var office_home=getOfficeHome();
var office_base_home=getOfficeBaseHome();
-var oo_sdk_ure_home=getUreHome();
var oo_sdk_make_home=getMakeHome();
var oo_sdk_zip_home=getZipHome();
@@ -174,16 +176,32 @@ function getOfficeHome()
if (sSuggestedHome.length == 0)
{
try {
- sSuggestedHome = WshShell.RegRead(regKeyOfficeCurrentUser);
- //The registry entry points to the program folder but
we need the
- //installation folder
+ sSuggestedHome = WshShell.RegRead(regKeyOfficeCurrentUser6432Node);
+ //The registry entry points to the program folder but we need the
+ //installation folder
} catch(exc) {}
if (sSuggestedHome.length == 0)
{
try {
+ sSuggestedHome =
WshShell.RegRead(regKeyOfficeLocaleMachine6432Node);
+ //The registry entry points to the program folder but we need
+ //the installation folder
+ } catch (exc) {}
+ }
+ if (sSuggestedHome.length == 0)
+ {
+ try {
sSuggestedHome = WshShell.RegRead(regKeyOfficeLocaleMachine);
//The registry entry points to the program folder but we need
- //the installation folder
+ //the installation folder
+ } catch (exc) {}
+ }
+ if (sSuggestedHome.length == 0)
+ {
+ try {
+ sSuggestedHome = WshShell.RegRead(regKeyOfficeLocaleMachine);
+ //The registry entry points to the program folder but we need
+ //the installation folder
} catch (exc) {}
}
@@ -245,7 +263,7 @@ function searchOffice()
var officepath ="";
var index=-1;
- if ((index = tmp.lastIndexOf("\\Basis")) != -1) {
+ if ((index = tmp.lastIndexOf("\\sdk")) != -1) {
tmp = tmp.substr(0, index);
}
@@ -267,39 +285,6 @@ function getOfficeBaseHome()
return officebase;
}
-function getUreHome()
-{
- var tmpure = oo_sdk_home;
- var ure = "";
- var index=0;
- if ((index = tmpure.lastIndexOf("Basis")) != -1)
- tmpure = tmpure.substr(0, index);
-
- if (aFileSystemObject.FileExists(tmpure + "\\URE\\bin\\uno.exe")) {
- ure = tmpure + "\URE";
- }
-
- return ure;
-
-/*
- var suggestion = WshSysEnv("OO_SDK_URE_HOME");
- var choice;
- for (;;) {
- stdout.Write(
- "\n Enter the URE installation directory [" + suggestion + "]:");
- choice = stdin.ReadLine();
- if (choice == "") {
- choice = suggestion;
- }
- if (aFileSystemObject.FileExists(choice + "\\bin\\uno.exe")) {
- break;
- }
- stdout.WriteLine("\n Error: A valid URE installation is required.");
- }
- return choice;
-*/
-}
-
function getMakeHome()
{
var sSuggestedHome = WshSysEnv("OO_SDK_MAKE_HOME");
@@ -352,6 +337,10 @@ function getMakeHome()
function getZipHome()
{
var sSuggestedHome = WshSysEnv("OO_SDK_ZIP_HOME");
+
+ if (sSuggestedHome.length == 0 && oo_sdk_make_home.length > 0) {
+ sSuggestedHome = oo_sdk_make_home;
+ }
while(true)
{
@@ -399,6 +388,10 @@ function getCatHome()
{
var sSuggestedHome = WshSysEnv("OO_SDK_CAT_HOME");
+ if (sSuggestedHome.length == 0 && oo_sdk_make_home.length > 0) {
+ sSuggestedHome = oo_sdk_make_home;
+ }
+
while(true)
{
stdout.Write("\n Enter a cat (2.0 or higher) tools directory [" +
@@ -451,6 +444,10 @@ function getSedHome()
{
var sSuggestedHome = WshSysEnv("OO_SDK_SED_HOME");
+ if (sSuggestedHome.length == 0 && oo_sdk_make_home.length > 0) {
+ sSuggestedHome = oo_sdk_make_home;
+ }
+
while(true)
{
stdout.Write("\n Enter a sed (3.02 or higher) tools directory [" +
@@ -925,75 +922,61 @@ 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 +
- "\n\n" +
+ "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\\4\\sdk\n" +
- "@set OO_SDK_HOME=" + oo_sdk_home +
- "\n\n" +
+ "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 4\"\n" +
+ "@set \"OFFICE_HOME=" + office_home +
+ "\"\n\n" +
"REM Directory of the make command.\n" +
- "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 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=C:\\UnxUtils\\usr\\local\\wbin\n" +
- "@set OO_SDK_ZIP_HOME=" + oo_sdk_zip_home +
- "\n\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 +
- "\n\n" +
+ "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 +
- "\n\n" +
+ "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 +
- "\n@set CPP_MANIFEST=" + oo_sdk_manifest_used +
- "\n@set CPP_WINDOWS_SDK=" + oo_sdk_windowssdk +
- "\n\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 +
+ "\"\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 +
- "\n\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 +
+ "\"\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 +
- "\n\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 +
+ "\"\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 +
- "\n\n" +
+ "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 +
- "\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" +
+ "REM Example: @set \"SDK_AUTO_DEPLOYMENT=YES\"\n" +
+ "@set \"SDK_AUTO_DEPLOYMENT=" + sdk_auto_deployment +
+ "\"\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" +
" goto :error\n" +
" )\n" +
- "\n" +
- "REM Check installation path for the office.\n" +
- "REM if not defined OFFICE_HOME (\n" +
- "REM if not defined OO_SDK_URE_HOME (\n" +
- "REM echo Error: either of the variables OFFICE_HOME and\n" +
- "REM echo OO_SDK_URE_HOME is missing!\n" +
- "REM goto :error\n" +
- "REM )\n" +
- "REM )\n" +
- "\n" +
+ "\n\n" +
"REM Check installation path for GNU make.\n" +
"if not defined OO_SDK_MAKE_HOME (\n" +
" echo Error: the variable OO_SDK_MAKE_HOME is missing!\n" +
@@ -1019,55 +1002,50 @@ 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" +
+ " @set \"OFFICE_PROGRAM_PATH=%OFFICE_HOME%\\program\"\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" +
+ " @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\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" +
"\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"
+
+ "@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\"\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;%OO_SDK_MAKE_HOME%;%OO_SDK_ZIP_HOME%;%OO_SDK_CAT_HOME%;%OO_SDK_SED_HOME%;%PATH%\n"
+
+ "set
\"PATH=%OO_SDK_HOME%\\bin;%OO_SDK_OFFICE_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 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" +
Modified: openoffice/trunk/main/odk/setsdkenv_windows.template
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/odk/setsdkenv_windows.template?rev=1490608&r1=1490607&r2=1490608&view=diff
==============================================================================
--- openoffice/trunk/main/odk/setsdkenv_windows.template (original)
+++ openoffice/trunk/main/odk/setsdkenv_windows.template Fri Jun 7 12:21:31
2013
@@ -1,177 +1,133 @@
@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 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=openoffice4.0_sdk
-set OO_SDK_NAME=openoffice4.0_sdk
+REM Example: @set "OO_SDK_NAME=openoffice4.0_sdk"
+@set "OO_SDK_NAME=<your_input_here>"
REM Installation directory of the Software Development Kit.
-REM Example: set OO_SDK_HOME=C:\Program Files\OpenOffice 4\sdk
-@set OO_SDK_HOME=
+REM Example: @set "OO_SDK_HOME=C:\Program Files\OpenOffice\4\sdk"
+@set "OO_SDK_HOME=<your_input_here>"
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 4"
+@set "OFFICE_HOME=<your_input_here>"
REM Directory of the make command.
-REM Example: set OO_SDK_MAKE_HOME=C:\UnixTools\usr\local\wbin
-@set OO_SDK_MAKE_HOME=
+REM Example: @set "OO_SDK_MAKE_HOME=C:\UnxUtils\usr\local\wbin"
+@set "OO_SDK_MAKE_HOME=<your_input_here>"
REM Directory of the zip tool.
-REM Example: set OO_SDK_ZIP_HOME=C:\UnixTools\usr\local\wbin
-@set OO_SDK_ZIP_HOME=
+REM Example: @set "OO_SDK_ZIP_HOME=C:\UnxUtils\usr\local\wbin"
+@set "OO_SDK_ZIP_HOME=<your_input_here>"
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=<your_input_here>"
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=<your_input_here>"
REM Directory of the C++ compiler.
-REM Example:set OO_SDK_CPP_HOME=C:\Program Files\Microsoft Visual Studio
9.0\VC\bin
-@set OO_SDK_CPP_HOME=
-@set CPP_MANIFEST=
-@set CPP_WINDOWS_SDK=
+REM Example: @set "OO_SDK_CPP_HOME=C:\Program Files\Microsoft Visual Studio
9.0\VC\bin"
+@set "OO_SDK_CPP_HOME=<your_input_here>"
+@set "CPP_MANIFEST=true"
+@set "CPP_WINDOWS_SDK=<your_input_here>"
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=
+REM Example: @set "OO_SDK_CLI_HOME=C:\WINXP\Microsoft.NET\Framework\v1.0.3705"
+@set "OO_SDK_CLI_HOME=<your_input_here>"
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=
+REM Example: @set "OO_SDK_JAVA_HOME=C:\Program Files\Java\jdk1.6.0_05"
+@set "OO_SDK_JAVA_HOME=<your_input_here>"
REM Special output directory
-REM Example: set OO_SDK_OUT=C:\openoffice4.0_sdk
-@set OO_SDK_OUT=
+REM Example: @set "OO_SDK_OUT=C:\openoffice4.0_sdk"
+@set "OO_SDK_OUT=<your_input_here>"
REM Automatic deployment
-REM Example: set SDK_AUTO_DEPLOYMENT=YES
-@set SDK_AUTO_DEPLOYMENT=YES
-
-@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 )
+REM Example: @set "SDK_AUTO_DEPLOYMENT=YES"
+@set "SDK_AUTO_DEPLOYMENT=YES"
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 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
+ @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 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
+@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 Set classpath
-@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
+@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_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%
+set
"PATH=%OO_SDK_HOME%\bin;%OO_SDK_OFFICE_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%"
+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%
-)
-
-REM Add directory of the command make to the path, if necessary.
-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.
-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.
-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.
-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.
-REM if defined OO_SDK_CPP_HOME @set PATH+=%OO_SDK_CPP_HOME%
+ @set "PATH=%OO_SDK_OUT%\WINexample.out\bin;%PATH%"
+ ) else (
+ @set "PATH=%OO_SDK_HOME%\WINexample.out\bin;%PATH%"
+ )
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%
+ @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"
@@ -199,10 +155,9 @@ 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
