Skip to content

C
core
Kaydet (Commit) 851b5a97 authored tarafından Stephan Bergmann's avatar Stephan Bergmann
Dosyalara gözat
Seçenekler

Wrong UNO_TYPES value for MACOSX 

Change-Id: I3d3a373a86f766ce517cbb85bb4b5651d91313d8
üst 3dd3e964
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 4 deletions
instsetoo_native/CustomTarget_setup.mk
Dosyayı görüntüle @ 851b5a97
...@@ -158,7 +158,7 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_ ...@@ -158,7 +158,7 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_
&& echo 'URE_INTERNAL_LIB_DIR=$${ORIGIN}$(if $(filter MACOSX,$(OS)),/../../Frameworks)' \ && echo 'URE_INTERNAL_LIB_DIR=$${ORIGIN}$(if $(filter MACOSX,$(OS)),/../../Frameworks)' \
&& echo 'URE_INTERNAL_JAVA_DIR=$${ORIGIN}/..$(if $(filter-out MACOSX WNT,$(OS)),/share)/java' \ && echo 'URE_INTERNAL_JAVA_DIR=$${ORIGIN}/..$(if $(filter-out MACOSX WNT,$(OS)),/share)/java' \
&& echo 'URE_INTERNAL_JAVA_CLASSPATH=$${URE_MORE_JAVA_TYPES}' \ && echo 'URE_INTERNAL_JAVA_CLASSPATH=$${URE_MORE_JAVA_TYPES}' \
&& echo 'UNO_TYPES=$${ORIGIN}/$(if $(filter-out MACOSX,$(OS)),$(if $(filter-out WNT,$(OS)),../share/)misc/)types.rdb $${URE_MORE_TYPES}' \ && echo 'UNO_TYPES=$${ORIGIN}/../$(if $(filter-out WNT,$(OS)),share/)misc/types.rdb $${URE_MORE_TYPES}' \
&& echo 'UNO_SERVICES=$${ORIGIN}/../$(if $(filter-out WNT,$(OS)),share/)misc/services.rdb $${URE_MORE_SERVICES}' \ && echo 'UNO_SERVICES=$${ORIGIN}/../$(if $(filter-out WNT,$(OS)),share/)misc/services.rdb $${URE_MORE_SERVICES}' \
) > $@ ) > $@
......
scp2/source/ooo/ure.scp
Dosyayı görüntüle @ 851b5a97
...@@ -206,9 +206,7 @@ ProfileItem gid_Profileitem_Dl_Uno_Uno_Types ...@@ -206,9 +206,7 @@ ProfileItem gid_Profileitem_Dl_Uno_Uno_Types
ProfileID = gid_Profile_Dl_Uno_Ini; ProfileID = gid_Profile_Dl_Uno_Ini;
Section = "Bootstrap"; Section = "Bootstrap";
Key = "UNO_TYPES"; Key = "UNO_TYPES";
#if defined MACOSX #if defined WNT
Value = "${ORIGIN}/types.rdb ${URE_MORE_TYPES}";
#elif defined WNT
Value = "${ORIGIN}/../misc/types.rdb ${URE_MORE_TYPES}"; Value = "${ORIGIN}/../misc/types.rdb ${URE_MORE_TYPES}";
#else #else
Value = "${ORIGIN}/../share/misc/types.rdb ${URE_MORE_TYPES}"; Value = "${ORIGIN}/../share/misc/types.rdb ${URE_MORE_TYPES}";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment