mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix OFFICE_PROGRAM_PATH for new Mac OS X layout

Browse Source 
Change-Id: Id8c6082b4b90c3020e1187dd311f0afd0320d155
This commit is contained in:
Stephan Bergmann
2014-09-17 00:15:06 +02:00
parent 4845fd13cb
commit bfeb412610
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
odk/config/setsdkenv_unix.sh.in
View File

@@ -94,10 +94,12 @@ sdk_platform=`/bin/sh ${OO_SDK_HOME}/config.guess | cut -d"-" -f3,4`
# Set the directory name. # Set the directory name.
programdir=program programdir=program
javadir=bin javadir=bin
sdk_lo_java_dir=program/classes
case ${sdk_platform} in case ${sdk_platform} in
darwin*) darwin*)
programdir="Contents/MacOS" programdir="Contents/MacOS"
javadir=Commands javadir=Commands
sdk_lo_java_dir=Contents/Resources/java
;; ;;
esac 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} PATH=${OO_SDK_HOME}/bin:${OO_SDK_OUT}/${exampleout}/bin:${OO_SDK_URE_BIN_DIR}:${OFFICE_PROGRAM_PATH}:${PATH}
# Set the classpath # 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 export CLASSPATH

9
odk/settings/std.mk
View File

@@ -37,7 +37,11 @@ IDL_DIR=$(PRJ)/idl
BIN_DIR=$(PRJ)/bin BIN_DIR=$(PRJ)/bin
CLASSES_DIR=$(PRJ)/classes CLASSES_DIR=$(PRJ)/classes
URE_CLASSES_DIR=$(subst \,/,$(OO_SDK_URE_JAVA_DIR)) 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 OFFICE_CLASSES_DIR=$(subst \,/,$(OFFICE_PROGRAM_PATH))/classes
endif
COMP_PACKAGE_DIR=$(subst /,$(PS),$(OUT_BIN)) COMP_PACKAGE_DIR=$(subst /,$(PS),$(OUT_BIN))
SDKTYPEFLAG=$(OUT_MISC)/oosdk_cpp_types.flag 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_TYPES="$(subst \,/,$(URE_MISC)$(PS)types.rdb)"
URE_SERVICES="$(subst \\,\,$(URE_MISC)$(PS)services.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_TYPES="$(subst \,/,$(OFFICE_PROGRAM_PATH)$(PS)types$(PS)offapi.rdb)"
OFFICE_SERVICES="$(subst \\,\,$(OFFICE_PROGRAM_PATH)$(PS)services$(PS)services.rdb)" OFFICE_SERVICES="$(subst \\,\,$(OFFICE_PROGRAM_PATH)$(PS)services$(PS)services.rdb)"
endif
OFFICE_TYPE_LIBRARY="$(OFFICE_TYPES)" OFFICE_TYPE_LIBRARY="$(OFFICE_TYPES)"