[Libreoffice-commits] core.git: odk/config
odk/config/cfgWin.js |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 2a5105cd0f4025b8ee4cecbd8cef864f72b0f659 Author: Stephan Bergmann AuthorDate: Fri Feb 17 13:27:05 2023 +0100 Commit: Stephan Bergmann CommitDate: Fri Feb 17 15:18:07 2023 + Quote some Windows shell settings ...or else, at least with the Windows 11 cmd.exe, when setsdkenv_windows.bat has already been run before (and generated the %APPDATA%\libreofficeX.Y_sdk\setsdkenv_windows.bat script), and is run again (and thus reads that generated script), it failed with something like "\Microsoft was unexpected at this time." Change-Id: I1bfaf375e52a3ee2debe48a7dd736808790346ca Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147217 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/odk/config/cfgWin.js b/odk/config/cfgWin.js index f112e231b193..6cfdce68f36a 100644 --- a/odk/config/cfgWin.js +++ b/odk/config/cfgWin.js @@ -928,9 +928,9 @@ 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" +
[Libreoffice-commits] core.git: odk/config
odk/config/cfgWin.js|2 +-
odk/config/configure.pl |4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 31221c4f8fb1973d246fcf8f50886cf5811e8054
Author: Samuel Mehrbrodt
AuthorDate: Wed Feb 13 08:10:55 2019 +0100
Commit: Samuel Mehrbrodt
CommitDate: Fri Feb 15 14:36:38 2019 +0100
Adopt odk configure to new java 6 baseline
Change-Id: I015f439b04ddbc337a1c0b000fa708686d1f83bb
Reviewed-on: https://gerrit.libreoffice.org/67751
Reviewed-by: Stephan Bergmann
Tested-by: Jenkins
diff --git a/odk/config/cfgWin.js b/odk/config/cfgWin.js
index fa8961b460d1..1f001cc265e1 100644
--- a/odk/config/cfgWin.js
+++ b/odk/config/cfgWin.js
@@ -654,7 +654,7 @@ function getJavaHome()
var bSkip = false;
while(true)
{
-stdout.Write("\n Enter JAVA SDK (1.4.1_01 or higher) installation
directory (optional) [" + sSuggestedHome + "]:");
+stdout.Write("\n Enter JAVA SDK (1.6 or higher) installation directory
(optional) [" + sSuggestedHome + "]:");
var sHome = stdin.ReadLine();
if (sHome.length == 0)
{
diff --git a/odk/config/configure.pl b/odk/config/configure.pl
index bc56d8782944..f3d0e08b3440 100755
--- a/odk/config/configure.pl
+++ b/odk/config/configure.pl
@@ -75,7 +75,7 @@ $main::OO_SDK_CPP_HOME_SUGGESTION =
searchprog($main::cppName);
$main::OO_SDK_JAVA_HOME = "";
$main::OO_SDK_JAVA_HOME_SUGGESTION = searchprog("javac");
-$main::javaVersion = "1.5.0_01";
+$main::javaVersion = "1.6";
$main::SDK_AUTO_DEPLOYMENT = "";
$main::SDK_AUTO_DEPLOYMENT_SUGGESTION = "YES";
@@ -393,7 +393,7 @@ while ( (!$main::correctVersion) &&
((! -d "$main::OO_SDK_JAVA_HOME" ) ||
((-d "$main::OO_SDK_JAVA_HOME") && (! -e
"$main::OO_SDK_JAVA_HOME/bin/javac"))) )
{
-print " Enter Java SDK (1.5, recommendation is 1.6 or higher) installation
directory (optional) [$main::OO_SDK_JAVA_HOME_SUGGESTION]: ";
+print " Enter Java SDK (1.6 or higher) installation directory (optional)
[$main::OO_SDK_JAVA_HOME_SUGGESTION]: ";
$main::OO_SDK_JAVA_HOME = readStdIn();
chop($main::OO_SDK_JAVA_HOME);
if ( $main::OO_SDK_JAVA_HOME eq "" )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: odk/config
odk/config/setsdkenv_unix |3 --- odk/config/setsdkenv_unix.sh.in |2 -- 2 files changed, 5 deletions(-) New commits: commit afe76d1a4e0c37cf52b623a3b9b4e5d1a7b96094 Author: Stephan Bergmann Date: Tue Feb 7 20:34:13 2017 +0100 SDK, just stop tampering with my term's title Change-Id: If053466ed5f2e74ea4b73719f6e07789c055998d diff --git a/odk/config/setsdkenv_unix b/odk/config/setsdkenv_unix index 10db4da..cc5f06e 100755 --- a/odk/config/setsdkenv_unix +++ b/odk/config/setsdkenv_unix @@ -74,6 +74,3 @@ fi "$SHELL" "$@" echo Shell terminated. - -TERMHEAD=$HOSTNAME -echo "]2;$TERMHEAD" diff --git a/odk/config/setsdkenv_unix.sh.in b/odk/config/setsdkenv_unix.sh.in index 03644b5..61f5c5a 100644 --- a/odk/config/setsdkenv_unix.sh.in +++ b/odk/config/setsdkenv_unix.sh.in @@ -298,5 +298,3 @@ echo " * SDK Output directory = $OO_SDK_OUT" echo " * Auto deployment = $SDK_AUTO_DEPLOYMENT" echo " *" echo " " - -echo "]2;Shell prepared with the LibreOffice SDK environment" ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: odk/config
odk/config/setsdkenv_unix.sh.in |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 2d602db09da3f23ea03f25e5ed94701e25ba583c Author: Tor Lillqvist Date: Tue Mar 31 13:17:02 2015 +0300 Make it clear what "SDK" is meant Change-Id: Ia967be1755051d427d947018504aca7e8f265120 diff --git a/odk/config/setsdkenv_unix.sh.in b/odk/config/setsdkenv_unix.sh.in index 17afca3..4f9b879 100644 --- a/odk/config/setsdkenv_unix.sh.in +++ b/odk/config/setsdkenv_unix.sh.in @@ -301,4 +301,4 @@ echo " * Auto deployment = $SDK_AUTO_DEPLOYMENT" echo " *" echo " " -echo "]2;Shell prepared with the SDK environment" +echo "]2;Shell prepared with the LibreOffice SDK environment" ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: odk/config
odk/config/cfgWin.js |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 62969accf9c01b71b738424d4d643db8bfaed182 Author: Julien Nabet Date: Sun Feb 8 22:40:30 2015 +0100 Typo: tilte->title Change-Id: I906f8c29129ead3f18af8d3892648fc053113fde diff --git a/odk/config/cfgWin.js b/odk/config/cfgWin.js index 9c71c43..2267a0d 100644 --- a/odk/config/cfgWin.js +++ b/odk/config/cfgWin.js @@ -992,7 +992,7 @@ function writeBatFile(fdir, file) "REM Set environment for C++ compiler tools, if necessary.\n" + "if defined OO_SDK_CPP_HOME call \"%OO_SDK_CPP_HOME%\\VCVARS32.bat\"\n" + "\n" + -"REM Set tilte to identify the prepared shell.\n" + +"REM Set title to identify the prepared shell.\n" + "title Shell prepared for SDK\n" + "\nREM Prepare shell with all necessary environment variables.\n" + "echo.\n" + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: odk/config odk/docs odk/Package_config.mk odk/util
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 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..000 --- 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 - -@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 ( -REMecho Error: either of the variables OFFICE_HOME and -REMecho OO_SDK_URE_HOME is missing! -REMgoto :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. -s
[Libreoffice-commits] core.git: odk/config
odk/config/cfgWin.js | 13 - 1 file changed, 4 insertions(+), 9 deletions(-) New commits: commit bd1cba5158ec900bd9df9a651d1080d85ba7c50d Author: Stephan Bergmann Date: Mon Dec 1 18:17:37 2014 +0100 Some Windows Command Prompt don't like if ... ( set PATH=... ) ...it appears. At least with Version 6.3.9600 on Windows 8.1, it results in spurious \Windows was unexpected at this time. past the first such construct. Go figure. Change-Id: I21cdb4edce0e7b22f26ac8b2f8b884f18490879b diff --git a/odk/config/cfgWin.js b/odk/config/cfgWin.js index c6148eb..5157eba 100644 --- a/odk/config/cfgWin.js +++ b/odk/config/cfgWin.js @@ -973,11 +973,8 @@ function writeBatFile(fdir, file) "set PATH=%OO_SDK_HOME%\\bin;%OO_SDK_URE_BIN_DIR%;%OO_SDK_OFFICE_BIN_DIR%;%OO_SDK_HOME%\\WINexample.out\\bin;%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" + -" ) else (\n" + -" set PATH=%OO_SDK_HOME%\\WINexample.out\\bin;%PATH%\n" + -" )\n" + +"if defined OO_SDK_OUT set PATH=%OO_SDK_OUT%\\WINexample.out\\bin;%PATH%\n" + +"if not defined OO_SDK_OUT set PATH=%OO_SDK_HOME%\\WINexample.out\\bin;%PATH%\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" + @@ -995,10 +992,8 @@ function writeBatFile(fdir, file) "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" + -")\n" + +"if defined CPP_WINDOWS_SDK set PATH=%CPP_WINDOWS_SDK%\\bin;%PATH%\n" + +"if defined CPP_WINDOWS_SDK set INCLUDE=%CPP_WINDOWS_SDK%\\Include;%INCLUDE%\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" + "\n" + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: odk/config
odk/config/setsdkenv_unix.sh.in |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 34f8136cd0b6560de0ed82dd02bb432dc6affc50
Author: Stephan Bergmann
Date: Fri Nov 28 15:04:29 2014 +0100
Fold URE: Linux ure/lib/* -> program/: adapt OO_SDK_URE_LIB_DIR
Change-Id: I81b4eb422620fefba17fe1877ee91807be22df5c
diff --git a/odk/config/setsdkenv_unix.sh.in b/odk/config/setsdkenv_unix.sh.in
index 83e074e..2a9d566 100644
--- a/odk/config/setsdkenv_unix.sh.in
+++ b/odk/config/setsdkenv_unix.sh.in
@@ -113,7 +113,7 @@ case ${sdk_platform} in
;;
*)
OO_SDK_URE_BIN_DIR=${OFFICE_PROGRAM_PATH}
-OO_SDK_URE_LIB_DIR=${OO_SDK_URE_HOME}/lib
+OO_SDK_URE_LIB_DIR=${OFFICE_PROGRAM_PATH}
OO_SDK_URE_JAVA_DIR=${OO_SDK_URE_HOME}/share/java
;;
esac
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: odk/config
odk/config/setsdkenv_unix.sh.in | 63
1 file changed, 19 insertions(+), 44 deletions(-)
New commits:
commit 2052ea7439790d9bb5ae5b08fda3874f74700594
Author: Stephan Bergmann
Date: Mon Nov 24 16:37:37 2014 +0100
Both OFFICE_HOME and OO_SDK_URE_HOME are always set
...via setsdkenv_unix -> configure.pl
Change-Id: I5b5e8e99736ce6d12ad7796d73cb1cf6871ad7f4
diff --git a/odk/config/setsdkenv_unix.sh.in b/odk/config/setsdkenv_unix.sh.in
index 4dcd81d..c1b96fb 100644
--- a/odk/config/setsdkenv_unix.sh.in
+++ b/odk/config/setsdkenv_unix.sh.in
@@ -80,14 +80,6 @@ fi
export OO_SDK_HOME
-# Check installation path for the office.
-if [ -z "${OFFICE_HOME}" ] && [ -z "${OO_SDK_URE_HOME}" ]
-then
-echo 'Error: Please set either the environment variable OFFICE_HOME or the'
-echo 'environment variable OO_SDK_URE_HOME.'
-exit 0
-fi
-
# Get the operating system.
sdk_platform=`/bin/sh ${OO_SDK_HOME}/config.guess | cut -d"-" -f3,4`
@@ -104,41 +96,27 @@ case ${sdk_platform} in
esac
# Set office program path (only set when using an Office).
-if [ "${OFFICE_HOME}" ]
-then
-OFFICE_PROGRAM_PATH=${OFFICE_HOME}/${programdir}
-export OFFICE_PROGRAM_PATH
-fi
-
+OFFICE_PROGRAM_PATH=${OFFICE_HOME}/${programdir}
+export OFFICE_PROGRAM_PATH
# 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).
-if [ "${OFFICE_HOME}" ]
-then
-UNO_PATH=${OFFICE_PROGRAM_PATH}
-export UNO_PATH
-fi
+UNO_PATH=${OFFICE_PROGRAM_PATH}
+export UNO_PATH
-if [ "${OO_SDK_URE_HOME}" ]
-then
-case ${sdk_platform} in
- darwin*)
+case ${sdk_platform} in
+darwin*)
OO_SDK_URE_BIN_DIR=${OO_SDK_URE_HOME}/MacOS
OO_SDK_URE_LIB_DIR=${OO_SDK_URE_HOME}/Frameworks
OO_SDK_URE_JAVA_DIR=${OO_SDK_URE_HOME}/Resources/java
;;
- *)
+*)
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
;;
-esac
-else
-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
-fi
+esac
export OO_SDK_URE_BIN_DIR
export OO_SDK_URE_LIB_DIR
export OO_SDK_URE_JAVA_DIR
@@ -294,20 +272,17 @@ then
"${OO_SDK_OUT}/${directoryname}/lib/libuno_purpenvhelper${comid}.${soext}"
#prepare links
-if [ "${OO_SDK_URE_HOME}" ]
-then
- mkdir -p "${OO_SDK_OUT}/${directoryname}/lib"
- ln -s "${OO_SDK_URE_LIB_DIR}/libuno_cppu.${soext}.3" \
- "${OO_SDK_OUT}/${directoryname}/lib/libuno_cppu.${soext}"
- ln -s "${OO_SDK_URE_LIB_DIR}/libuno_cppuhelper${comid}.${soext}.3" \
-
"${OO_SDK_OUT}/${directoryname}/lib/libuno_cppuhelper${comid}.${soext}"
- ln -s "${OO_SDK_URE_LIB_DIR}/libuno_sal.${soext}.3" \
- "${OO_SDK_OUT}/${directoryname}/lib/libuno_sal.${soext}"
- ln -s "${OO_SDK_URE_LIB_DIR}/libuno_salhelper${comid}.${soext}.3" \
-
"${OO_SDK_OUT}/${directoryname}/lib/libuno_salhelper${comid}.${soext}"
- ln -s "${OO_SDK_URE_LIB_DIR}/libuno_purpenvhelper${comid}.${soext}.3" \
-
"${OO_SDK_OUT}/${directoryname}/lib/libuno_purpenvhelper${comid}.${soext}"
-fi
+mkdir -p "${OO_SDK_OUT}/${directoryname}/lib"
+ln -s "${OO_SDK_URE_LIB_DIR}/libuno_cppu.${soext}.3" \
+ "${OO_SDK_OUT}/${directoryname}/lib/libuno_cppu.${soext}"
+ln -s "${OO_SDK_URE_LIB_DIR}/libuno_cppuhelper${comid}.${soext}.3" \
+ "${OO_SDK_OUT}/${directoryname}/lib/libuno_cppuhelper${comid}.${soext}"
+ln -s "${OO_SDK_URE_LIB_DIR}/libuno_sal.${soext}.3" \
+ "${OO_SDK_OUT}/${directoryname}/lib/libuno_sal.${soext}"
+ln -s "${OO_SDK_URE_LIB_DIR}/libuno_salhelper${comid}.${soext}.3" \
+ "${OO_SDK_OUT}/${directoryname}/lib/libuno_salhelper${comid}.${soext}"
+ln -s "${OO_SDK_URE_LIB_DIR}/libuno_purpenvhelper${comid}.${soext}.3" \
+
"${OO_SDK_OUT}/${directoryname}/lib/libuno_purpenvhelper${comid}.${soext}"
fi
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: odk/config odk/settings
odk/config/setsdkenv_unix.sh.in |4 +++-
odk/settings/std.mk |9 +
2 files changed, 12 insertions(+), 1 deletion(-)
New commits:
commit bfeb4126108ab307d7843cf9f32acf95ae60d06a
Author: Stephan Bergmann
Date: Wed Sep 17 00:15:06 2014 +0200
Fix OFFICE_PROGRAM_PATH for new Mac OS X layout
Change-Id: Id8c6082b4b90c3020e1187dd311f0afd0320d155
diff --git a/odk/config/setsdkenv_unix.sh.in b/odk/config/setsdkenv_unix.sh.in
index 60032d3..4dcd81d 100644
--- a/odk/config/setsdkenv_unix.sh.in
+++ b/odk/config/setsdkenv_unix.sh.in
@@ -94,10 +94,12 @@ sdk_platform=`/bin/sh ${OO_SDK_HOME}/config.guess | cut
-d"-" -f3,4`
# Set the directory name.
programdir=program
javadir=bin
+sdk_lo_java_dir=program/classes
case ${sdk_platform} in
darwin*)
programdir="Contents/MacOS"
javadir=Commands
+sdk_lo_java_dir=Contents/Resources/java
;;
esac
@@ -226,7 +228,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_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:${OFFICE_HOME}/$sdk_lo_java_dir/unoil.jar:${CLASSPATH}
export CLASSPATH
diff --git a/odk/settings/std.mk b/odk/settings/std.mk
index 7d76d90..9fe1e79 100644
--- a/odk/settings/std.mk
+++ b/odk/settings/std.mk
@@ -37,7 +37,11 @@ IDL_DIR=$(PRJ)/idl
BIN_DIR=$(PRJ)/bin
CLASSES_DIR=$(PRJ)/classes
URE_CLASSES_DIR=$(subst \,/,$(OO_SDK_URE_JAVA_DIR))
+ifeq "$(PLATFORM)" "macosx"
+OFFICE_CLASSES_DIR=$(subst \,/,$(OFFICE_PROGRAM_PATH))/../Resources/java
+else
OFFICE_CLASSES_DIR=$(subst \,/,$(OFFICE_PROGRAM_PATH))/classes
+endif
COMP_PACKAGE_DIR=$(subst /,$(PS),$(OUT_BIN))
SDKTYPEFLAG=$(OUT_MISC)/oosdk_cpp_types.flag
@@ -45,8 +49,13 @@ SDKTYPEFLAG=$(OUT_MISC)/oosdk_cpp_types.flag
URE_TYPES="$(subst \,/,$(URE_MISC)$(PS)types.rdb)"
URE_SERVICES="$(subst \\,\,$(URE_MISC)$(PS)services.rdb)"
+ifeq "$(PLATFORM)" "macosx"
+OFFICE_TYPES="$(subst
\,/,$(OFFICE_PROGRAM_PATH)$(PS)..$(PS)Resources$(PS)types$(PS)offapi.rdb)"
+OFFICE_SERVICES="$(subst
\\,\,$(OFFICE_PROGRAM_PATH)$(PS)..$(PS)Resources$(PS)services$(PS)services.rdb)"
+else
OFFICE_TYPES="$(subst \,/,$(OFFICE_PROGRAM_PATH)$(PS)types$(PS)offapi.rdb)"
OFFICE_SERVICES="$(subst
\\,\,$(OFFICE_PROGRAM_PATH)$(PS)services$(PS)services.rdb)"
+endif
OFFICE_TYPE_LIBRARY="$(OFFICE_TYPES)"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: odk/config
odk/config/setsdkenv_unix.sh.in |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 7907783fdbd07279ff31024b1f4d23ea5e60840c
Author: Stephan Bergmann
Date: Tue Sep 16 23:44:41 2014 +0200
typo
Change-Id: Ie883b12392ae5361d29fa0991edf42d13027891f
diff --git a/odk/config/setsdkenv_unix.sh.in b/odk/config/setsdkenv_unix.sh.in
index d749553..60032d3 100644
--- a/odk/config/setsdkenv_unix.sh.in
+++ b/odk/config/setsdkenv_unix.sh.in
@@ -97,7 +97,7 @@ javadir=bin
case ${sdk_platform} in
darwin*)
programdir="Contents/MacOS"
-javacdir=Commands
+javadir=Commands
;;
esac
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: odk/config
odk/config/configure.pl |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit aa7852d5aa0dece9febf874ec3ed7e8cc80810d4
Author: Stephan Bergmann
Date: Tue Sep 16 23:19:13 2014 +0200
Move the non-Darwin way to determine OO_SDK_URE_HOME to where it belongs
Change-Id: Iedd35be577835a24c8d593859b1c1086d1e1ae92
diff --git a/odk/config/configure.pl b/odk/config/configure.pl
index 19f8f21..83842e8 100755
--- a/odk/config/configure.pl
+++ b/odk/config/configure.pl
@@ -43,9 +43,6 @@ $main::OO_SDK_HOME_SUGGESTION = $main::sdkpath;
$main::OFFICE_HOME = "";
-$main::OO_SDK_URE_HOME = `cd $main::sdkpath/../ure-link && pwd`;
-chomp($main::OO_SDK_URE_HOME);
-
$main::OO_SDK_MAKE_HOME = "";
$main::makeName = "make";
if ( $main::operatingSystem =~ m/solaris/ ||
@@ -131,6 +128,9 @@ if ( $main::operatingSystem =~ m/darwin/ )
}
} else
{
+$main::OO_SDK_URE_HOME = `cd $main::sdkpath/../ure-link && pwd`;
+chomp($main::OO_SDK_URE_HOME);
+
$main::OFFICE_HOME_SUGGESTION = searchoffice();
if ( $main::OFFICE_HOME_SUGGESTION eq "" ) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: odk/config
odk/config/configure.pl | 194
1 file changed, 81 insertions(+), 113 deletions(-)
New commits:
commit b346371f7b5cb9476a41f377ce1b914de8ac077e
Author: Stephan Bergmann
Date: Tue Sep 16 23:17:27 2014 +0200
Remove unused OFFICE_OR_URE[_SUGGESTION] variables
Change-Id: Ifc90af4e536f860eb4bea5420a5e233471c4b291
diff --git a/odk/config/configure.pl b/odk/config/configure.pl
index f86a4f0..19f8f21 100755
--- a/odk/config/configure.pl
+++ b/odk/config/configure.pl
@@ -41,9 +41,6 @@ $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::OO_SDK_URE_HOME = `cd $main::sdkpath/../ure-link && pwd`;
@@ -97,133 +94,111 @@ $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";
+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")) )
+$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 "" )
{
-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;
-}
+$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";
-}
+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/ure-link" ) {
-$main::OO_SDK_URE_HOME =
"$main::OFFICE_HOME/Contents/ure-link";
-} else {
-$main::OFFICE_HOME = "";
-$main::OO_SDK_URE_HOME = "";
-print " Error: no URE found in office installation, please
specify the path to a valid installation.\n";
-}
+# check more details
+if ( -d "$main::OFFICE_HOME/Contents/ure-link" ) {
+$main::OO_SDK_URE_HOME = "$main::OFFICE_HOME/Contents/ure-link";
+} else {
+$main::OFFICE_HOME = "";
+$main::OO_SDK_URE_HOME = "";
+print " Error: no URE found in office installation, please specify
the path to a valid installation.\n";
}
-} else
+}
+} 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 "" )
{
-$main::OFFICE_HOME_SUGGESTION = searchoffice();
+my $tmpOffice = readlink "$main::OFFICE_HOME_SUGGESTION/soffice";
-if ( $main::OFFICE_HOME_SUGGESTION eq "" ) {
-# prepare Office path
-$main::OFFICE_HOME_SUGGESTION = searchprog("soffice");
+if ( $tmpOffice eq "" )
+{
+$tmpOffice = "$main::OFFICE_HOME_SUGGESTION/soffice";
}
-if ( ! $main::OFFICE_HOME_SUGGESTION eq "" )
+my $offset = rindex($tmpOffice, "/program/soffice");
+if ( $offset != -1 )
{
-my $tmpOffice = readlink "$main::OFFICE_HOME_SUGGESTION/soffice";
-
-if ( $tmpOffice eq "" )
-{
-$tmpOffice = "$main::OFFICE_HOME_SUGGESTION/soffice";
-}
-
-my $offset = rindex($tmpOffice, "/program/soffice");
+$main::OFFICE_HOME_SUGGESTION = substr($tmpOffice, 0, $offset);
+} else
+{
+$offset = rindex($tmpOffice, "/soffice")
[Libreoffice-commits] core.git: odk/config
odk/config/configure.pl |7 +++
1 file changed, 7 insertions(+)
New commits:
commit 475587e31821d9b8d89698ec5b0e5a6160ec3b5f
Author: Miklos Vajna
Date: Thu Jul 25 10:53:12 2013 +0200
odk: let configure find the office path by default on dev-install
Change-Id: I50a698a16b8487945b4928d2c0e1c33c00c7641d
diff --git a/odk/config/configure.pl b/odk/config/configure.pl
index 04bfb4b..588f80b 100755
--- a/odk/config/configure.pl
+++ b/odk/config/configure.pl
@@ -734,6 +734,13 @@ sub searchoffice
return $officepath;
}
+# Before trying versioned directories, check if the sdk is directly under
+# the office path.
+$officepath = $main::sdkpath . "/..";
+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";
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: odk/config
odk/config/setsdkenv_unix |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 0d61e5dcdbe2cec9df33ac22e3f0e4fbd6a07517 Author: Ariel Constenla-Haile Date: Thu Dec 6 12:31:21 2012 + odk - Fix reading OOVERSION from settings/dk.mk (cherry picked from commit decff1733c9cdeca40fc0438a1333de236c954cd) Conflicts: odk/setsdkenv_unix Change-Id: I4d78ebbb9f7b6d188dcba2140f26a17a8c17732f diff --git a/odk/config/setsdkenv_unix b/odk/config/setsdkenv_unix index 85925fe..10db4da 100755 --- a/odk/config/setsdkenv_unix +++ b/odk/config/setsdkenv_unix @@ -22,7 +22,7 @@ HOSTNAME=`hostname` CURRENTDIR=`/bin/pwd` SDKTMPDIR=`dirname $0` OO_SDK_HOME=`(cd $SDKTMPDIR && pwd && cd $CURRENTDIR) | head -n 1` -OOVERSION=`cat $OO_SDK_HOME/settings/dk.mk | tail -2 | head -n 1 | cut -d"=" -f2 | cut -d"." -f1,2` +OOVERSION=`cat $OO_SDK_HOME/settings/dk.mk | tail -3 | head -n 1 | cut -d"=" -f2 | cut -d"." -f1,2` if [ "$OSTYPE" = "Darwin" ] then OO_SDK_NAME=`basename $OO_SDK_HOME` ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: odk/config
odk/config/setsdkenv_unix|2 +- odk/config/setsdkenv_windows.bat |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit ae6a7df73b6e279b315417e2a15a8d9a2117e9f3 Author: Stephan Bergmann Date: Mon May 27 11:22:50 2013 +0200 Typo (and don't shout at me) Change-Id: Id5ad3af1fd70de6b0e9d2640d12011362e7c34ef diff --git a/odk/config/setsdkenv_unix b/odk/config/setsdkenv_unix index 38ab222..85925fe 100755 --- a/odk/config/setsdkenv_unix +++ b/odk/config/setsdkenv_unix @@ -62,7 +62,7 @@ else echo " " echo " *" echo " * You have to configure your SDK environment first before you can" -echo " * can use it! The configuration has to be done only once." +echo " * use it. The configuration has to be done only once." echo " *" echo " " echo diff --git a/odk/config/setsdkenv_windows.bat b/odk/config/setsdkenv_windows.bat index ac1a559..a7b0079 100755 --- a/odk/config/setsdkenv_windows.bat +++ b/odk/config/setsdkenv_windows.bat @@ -52,7 +52,7 @@ if not exist "%OO_USER_SDKENV_SCRIPT%". ( echo ** echo * echo * You have to configure your SDK environment first before you can - echo * can use it! The configuration has to be done only once. + echo * use it. The configuration has to be done only once. echo * echo ** echo. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
