[Libreoffice-commits] core.git: odk/config odk/docs odk/Package_config.mk odk/util
Stephan Bergmann
sbergman at redhat.com
Tue Dec 2 00:56:24 PST 2014
odk/Package_config.mk | 1
odk/config/setsdkenv_windows.template | 214 ----------------------------------
odk/docs/install.html | 5
odk/util/check.pl | 4
4 files changed, 224 deletions(-)
New commits:
commit d30caae7e76c580f30cdcc06516cb647c13a19c2
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Dec 2 09:55:33 2014 +0100
Remove obsolete setsdkenv_windows.template
Change-Id: I3a79830c5538e12fc6370ae30168266c0f1c533e
diff --git a/odk/Package_config.mk b/odk/Package_config.mk
index e9c495e..f378621 100644
--- a/odk/Package_config.mk
+++ b/odk/Package_config.mk
@@ -14,7 +14,6 @@ $(eval $(call gb_Package_set_outdir,odk_config,$(INSTDIR)))
ifeq ($(OS),WNT)
$(eval $(call gb_Package_add_files,odk_config,$(SDKDIRNAME),\
odk/config/cfgWin.js \
- odk/config/setsdkenv_windows.template \
odk/config/setsdkname.bat \
))
else
diff --git a/odk/config/setsdkenv_windows.template b/odk/config/setsdkenv_windows.template
deleted file mode 100644
index b7e5c04..0000000
--- a/odk/config/setsdkenv_windows.template
+++ /dev/null
@@ -1,214 +0,0 @@
-rem
-rem This file is part of the LibreOffice project.
-rem
-rem This Source Code Form is subject to the terms of the Mozilla Public
-rem License, v. 2.0. If a copy of the MPL was not distributed with this
-rem file, You can obtain one at http://mozilla.org/MPL/2.0/.
-rem
-rem This file incorporates work covered by the following license notice:
-rem
-rem Licensed to the Apache Software Foundation (ASF) under one or more
-rem contributor license agreements. See the NOTICE file distributed
-rem with this work for additional information regarding copyright
-rem ownership. The ASF licenses this file to you under the Apache
-rem License, Version 2.0 (the "License"); you may not use this file
-rem except in compliance with the License. You may obtain a copy of
-rem the License at http://www.apache.org/licenses/LICENSE-2.0 .
-rem
-
- at echo off
-REM This script sets all environment 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=libreoffice3.4_sdk
-set OO_SDK_NAME=libreoffice3.4_sdk
-
-REM Installation directory of the Software Development Kit.
-REM Example: set OO_SDK_HOME=C:\Program Files\LibreOffice 3\sdk
-set OO_SDK_HOME=
-
-REM Office installation directory.
-REM Example: set OFFICE_HOME=C:\Program Files\LibreOffice 3
-set OFFICE_HOME=
-
-REM URE installation directory.
-REM Example: set OO_SDK_URE_HOME=C:\Program Files\LibreOffice 3\URE
-set OO_SDK_URE_HOME=
-
-REM Directory of the make command.
-REM Example: set OO_SDK_MAKE_HOME=D:\NextGenerationMake\make
-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 Directory of the cat tool.
-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 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=
-
-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 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 Special output directory
-REM Example: set OO_SDK_OUT=C:\Program Files\Libreoffice 3\sdk
-set OO_SDK_OUT=
-
-REM Automatic deployment
-REM Example: set SDK_AUTO_DEPLOYMENT=YES
-set SDK_AUTO_DEPLOYMENT=YES
-
-REM Check installation path for the StarOffice Development Kit.
-if not defined OO_SDK_HOME (
- echo Error: the variable OO_SDK_HOME is missing!
- 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
- )
-
-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
- )
-
-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
- )
-
-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
- )
-
-REM Set library path.
-set LIB=%OO_SDK_HOME%\lib;%LIB%
-if defined CPP_WINDOWS_SDK (
- 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 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%
- )
-
-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_PROGRAM_PATH%
-set OO_SDK_OFFICE_JAVA_DIR=%OFFICE_PROGRAM_PATH%\classes
-REM )
-
-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 )
-
-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%
-
-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.
-if defined OO_SDK_MAKE_HOME set PATH=%OO_SDK_MAKE_HOME%;%PATH%
-
-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 cat tool to the path, if necessary.
-if defined OO_SDK_CAT_HOME set PATH=%OO_SDK_CAT_HOME%;%PATH%
-
-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 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 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%
-
-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%
-
-REM Set environment for C++ compiler tools, if necessary.
-if defined OO_SDK_CPP_HOME call "%OO_SDK_CPP_HOME%\VCVARS32.bat"
-
-REM Set tilte to identify the prepared shell.
-title Shell prepared for SDK
-
-REM Prepare shell with all necessary environment variables.
-echo.
-echo ******************************************************************
-echo *
-echo * SDK environment is prepared for Windows
-echo *
-echo * SDK = %OO_SDK_HOME%
-echo * Office = %OFFICE_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%
-echo * sed = %OO_SDK_SED_HOME%
-echo * C++ Compiler = %OO_SDK_CPP_HOME%
-echo * C# and VB.NET compilers = %OO_SDK_CLI_HOME%
-echo * Java = %OO_SDK_JAVA_HOME%
-echo * Special Output directory = %OO_SDK_OUT%
-echo * Auto deployment = %SDK_AUTO_DEPLOYMENT%
-echo *
-echo ******************************************************************
-echo.
-goto end
-
- :error
-Error: Please insert the necessary environment variables into the batch file.
-
- :end
diff --git a/odk/docs/install.html b/odk/docs/install.html
index 64e2017..2ac300f 100644
--- a/odk/docs/install.html
+++ b/odk/docs/install.html
@@ -217,11 +217,6 @@
problems with Windows Script, you can download a
newer version of
<a href="http://www.microsoft.com/downloads/details.aspx?FamilyId=C717D943-7E4B-4622-86EB-95A22B832CAA&displaylang=en" title="link to the download page for the Windows Script">Windows Script</a>.</p>
- <p>On other versions of Windows, use the batch file
- template
- <b><OO_SDK_HOME>\setsdkenv_windows.template</b>,
- rename it to *.bat, and adapt it to your local
- environment.</p>
<p>If you use the template batch file, edit and set
the following variables:</p>
<table class="table4">
diff --git a/odk/util/check.pl b/odk/util/check.pl
index 899b42c..b8f1074 100644
--- a/odk/util/check.pl
+++ b/odk/util/check.pl
@@ -115,10 +115,6 @@ if (-d "$SdkDir") {
print "\nERROR: \"setsdkenv_windows.bat\" is missing\n";
$return++;
}
- if (!check_file("setsdkenv_windows.template")) {
- print "\nERROR: \"setsdkenv_windows.template\" is missing\n";
- $return++;
- }
if (!check_file("cfgWin.js")) {
print "\nERROR: \"cfgWin.js\" is missing\n";
$return++;
More information about the Libreoffice-commits
mailing list