diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-12-01 15:10:19 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-12-01 15:10:32 +0100 |
commit | 982f199a98a7d82e0109077882a645f1a442049e (patch) | |
tree | 733bef575b66d224fc4c03cfecf69f86b1fbed27 | |
parent | 8fc14413d9dadede63743ec76603d95eb587f580 (diff) |
Fold URE: Linux ure/share/misc/* -> program/
...and remove now unused ure-link symlink
Change-Id: Ic958432c1dad4fae213982d0af072187f151620b
-rw-r--r-- | RepositoryExternal.mk | 8 | ||||
-rw-r--r-- | android/Bootstrap/Makefile.shared | 2 | ||||
-rw-r--r-- | config_host.mk.in | 2 | ||||
-rw-r--r-- | config_host/config_folders.h.in | 2 | ||||
-rw-r--r-- | configure.ac | 10 | ||||
-rw-r--r-- | desktop/Pagein_common.mk | 2 | ||||
-rw-r--r-- | instsetoo_native/CustomTarget_setup.mk | 4 | ||||
-rw-r--r-- | jvmfwk/CustomTarget_jvmfwk_jvmfwk3_ini.mk | 2 | ||||
-rw-r--r-- | jvmfwk/Package_rcfiles.mk | 12 | ||||
-rwxr-xr-x | odk/config/configure.pl | 12 | ||||
-rw-r--r-- | odk/settings/settings.mk | 12 | ||||
-rw-r--r-- | scp2/inc/macros.inc | 6 | ||||
-rw-r--r-- | scp2/source/ooo/ure.scp | 33 | ||||
-rw-r--r-- | solenv/gbuild/TargetLocations.mk | 2 | ||||
-rw-r--r-- | ure/Package_install.mk | 2 | ||||
-rw-r--r-- | ure/Rdb_ure.mk | 2 | ||||
-rw-r--r-- | ure/source/uretest/Makefile.pln | 8 |
17 files changed, 44 insertions, 77 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index fb3a1a41b50e..f2af5fc4f09b 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -3726,7 +3726,7 @@ define gb_Executable__register_climaker $(call gb_Executable_add_runtime_dependencies,climaker,\ $(call gb_Library_get_target,$(gb_CPPU_ENV)_uno) \ $(call gb_Rdb_get_target_for_build,ure/services) \ - $(INSTROOT)/$(LIBO_URE_SHARE_FOLDER)/misc/services.rdb \ + $(INSTROOT)/$(LIBO_URE_MISC_FOLDER)/services.rdb \ $(call gb_UnoApi_get_target,udkapi) \ ) endef @@ -3767,7 +3767,7 @@ $(call gb_Executable_add_runtime_dependencies,gengal,\ $(call gb_Package_get_target_for_build,postprocess_images) \ $(call gb_Package_get_target_for_build,postprocess_registry) \ $(call gb_Rdb_get_target_for_build,ure/services) \ - $(INSTROOT)/$(LIBO_URE_SHARE_FOLDER)/misc/services.rdb \ + $(INSTROOT)/$(LIBO_URE_MISC_FOLDER)/services.rdb \ $(call gb_UnoApi_get_target,offapi) \ $(call gb_UnoApi_get_target,udkapi) \ ) @@ -3807,7 +3807,7 @@ $(call gb_Executable_add_runtime_dependencies,saxparser,\ $(call gb_Package_get_target_for_build,instsetoo_native_setup_ure) \ $(call gb_Rdb_get_target_for_build,saxparser) \ $(call gb_Rdb_get_target_for_build,ure/services) \ - $(INSTROOT)/$(LIBO_URE_SHARE_FOLDER)/misc/services.rdb \ + $(INSTROOT)/$(LIBO_URE_MISC_FOLDER)/services.rdb \ $(call gb_UnoApi_get_target,udkapi) \ ) endef @@ -3820,7 +3820,7 @@ define gb_Executable__register_uno $(call gb_Executable_add_runtime_dependencies,uno,\ $(call gb_Library_get_target,$(gb_CPPU_ENV)_uno) \ $(call gb_Rdb_get_target_for_build,ure/services) \ - $(INSTROOT)/$(LIBO_URE_SHARE_FOLDER)/misc/services.rdb \ + $(INSTROOT)/$(LIBO_URE_MISC_FOLDER)/services.rdb \ $(call gb_UnoApi_get_target,udkapi) \ ) endef diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared index 8169f209bef0..8a1a0f12eaae 100644 --- a/android/Bootstrap/Makefile.shared +++ b/android/Bootstrap/Makefile.shared @@ -125,7 +125,7 @@ copy-stuff: mkdir -p assets/gz.unpack/program/ure assets/lib assets/program/services assets/ure/share/misc assets/ComponentTarget/i18npool/util gzip -9 <$(INSTDIR)/$(LIBO_ETC_FOLDER)/types/offapi.rdb >assets/gz.unpack/program/offapi.rdb gzip -9 <$(INSTDIR)/$(LIBO_ETC_FOLDER)/types/oovbaapi.rdb >assets/gz.unpack/program/oovbaapi.rdb - gzip -9 <$(INSTDIR)/$(LIBO_URE_SHARE_FOLDER)/misc/types.rdb >assets/gz.unpack/program/udkapi.rdb + gzip -9 <$(INSTDIR)/$(LIBO_URE_MISC_FOLDER)/types.rdb >assets/gz.unpack/program/udkapi.rdb # For some reason the vnd.sun.star.expand:$LO_LIB_DIR doesn't seem to work, it expands to empty!? for F in program/services/services ure/share/misc/services; do \ sed -e 's!uri="vnd.sun.star.expand:$$LO_LIB_DIR/!uri="file://$$APP_DATA_DIR/lib/!g' <$(INSTDIR)/$$F.rdb >assets/$$F.rdb; \ diff --git a/config_host.mk.in b/config_host.mk.in index 58e8899dfb71..648705a4a8c8 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -343,7 +343,7 @@ export LIBO_URE_BIN_FOLDER=@LIBO_URE_BIN_FOLDER@ export LIBO_URE_ETC_FOLDER=@LIBO_URE_ETC_FOLDER@ export LIBO_URE_LIB_FOLDER=@LIBO_URE_LIB_FOLDER@ export LIBO_URE_LIB_FOLDER_FOR_BUILD=@LIBO_URE_LIB_FOLDER_FOR_BUILD@ -export LIBO_URE_SHARE_FOLDER=@LIBO_URE_SHARE_FOLDER@ +export LIBO_URE_MISC_FOLDER=@LIBO_URE_MISC_FOLDER@ export LIBO_URE_SHARE_JAVA_FOLDER=@LIBO_URE_SHARE_JAVA_FOLDER@ export LIBO_VERSION_MAJOR=@LIBO_VERSION_MAJOR@ export LIBO_VERSION_MICRO=@LIBO_VERSION_MICRO@ diff --git a/config_host/config_folders.h.in b/config_host/config_folders.h.in index 7f6fe2d225db..51d0e2444de6 100644 --- a/config_host/config_folders.h.in +++ b/config_host/config_folders.h.in @@ -42,7 +42,7 @@ #undef LIBO_URE_BIN_FOLDER #undef LIBO_URE_ETC_FOLDER #undef LIBO_URE_LIB_FOLDER -#undef LIBO_URE_SHARE_FOLDER +#undef LIBO_URE_MISC_FOLDER #undef LIBO_URE_SHARE_JAVA_FOLDER #endif diff --git a/configure.ac b/configure.ac index 3193342e6cae..ae82b5647d17 100644 --- a/configure.ac +++ b/configure.ac @@ -3025,7 +3025,7 @@ if test $_os = Darwin; then LIBO_URE_BIN_FOLDER=MacOS LIBO_URE_ETC_FOLDER=Resources/ure/etc LIBO_URE_LIB_FOLDER=Frameworks - LIBO_URE_SHARE_FOLDER=Resources/ure/share + LIBO_URE_MISC_FOLDER=Resources/ure/share/misc LIBO_URE_SHARE_JAVA_FOLDER=Resources/java elif test $_os = WINNT; then LIBO_BIN_FOLDER=program @@ -3042,7 +3042,7 @@ elif test $_os = WINNT; then LIBO_URE_BIN_FOLDER=URE/bin LIBO_URE_ETC_FOLDER=URE/bin LIBO_URE_LIB_FOLDER=URE/bin - LIBO_URE_SHARE_FOLDER=URE + LIBO_URE_MISC_FOLDER=URE/misc LIBO_URE_SHARE_JAVA_FOLDER=URE/java else LIBO_BIN_FOLDER=program @@ -3059,7 +3059,7 @@ else LIBO_URE_BIN_FOLDER=program LIBO_URE_ETC_FOLDER=program LIBO_URE_LIB_FOLDER=program - LIBO_URE_SHARE_FOLDER=ure/share + LIBO_URE_MISC_FOLDER=program LIBO_URE_SHARE_JAVA_FOLDER=program/classes fi AC_DEFINE_UNQUOTED(LIBO_BIN_FOLDER,"$LIBO_BIN_FOLDER") @@ -3076,7 +3076,7 @@ AC_DEFINE_UNQUOTED(LIBO_SHARE_SHELL_FOLDER,"$LIBO_SHARE_SHELL_FOLDER") AC_DEFINE_UNQUOTED(LIBO_URE_BIN_FOLDER,"$LIBO_URE_BIN_FOLDER") AC_DEFINE_UNQUOTED(LIBO_URE_ETC_FOLDER,"$LIBO_URE_ETC_FOLDER") AC_DEFINE_UNQUOTED(LIBO_URE_LIB_FOLDER,"$LIBO_URE_LIB_FOLDER") -AC_DEFINE_UNQUOTED(LIBO_URE_SHARE_FOLDER,"$LIBO_URE_SHARE_FOLDER") +AC_DEFINE_UNQUOTED(LIBO_URE_MISC_FOLDER,"$LIBO_URE_MISC_FOLDER") AC_DEFINE_UNQUOTED(LIBO_URE_SHARE_JAVA_FOLDER,"$LIBO_URE_SHARE_JAVA_FOLDER") # Not all of them needed in config_host.mk, add more if need arises @@ -3092,7 +3092,7 @@ AC_SUBST(LIBO_SHARE_RESOURCE_FOLDER) AC_SUBST(LIBO_URE_BIN_FOLDER) AC_SUBST(LIBO_URE_ETC_FOLDER) AC_SUBST(LIBO_URE_LIB_FOLDER) -AC_SUBST(LIBO_URE_SHARE_FOLDER) +AC_SUBST(LIBO_URE_MISC_FOLDER) AC_SUBST(LIBO_URE_SHARE_JAVA_FOLDER) dnl =================================================================== diff --git a/desktop/Pagein_common.mk b/desktop/Pagein_common.mk index 6314c4dea37e..2609530bae50 100644 --- a/desktop/Pagein_common.mk +++ b/desktop/Pagein_common.mk @@ -51,7 +51,7 @@ $(eval $(call gb_Pagein_add_objects,common,\ svl \ vcl \ tk \ - ../ure-link/share/misc/types.rdb \ + types.rdb \ services/services.rdb \ types/oovbaapi.rdb \ deployment \ diff --git a/instsetoo_native/CustomTarget_setup.mk b/instsetoo_native/CustomTarget_setup.mk index b2bd939789c2..3ed8cc79852d 100644 --- a/instsetoo_native/CustomTarget_setup.mk +++ b/instsetoo_native/CustomTarget_setup.mk @@ -122,8 +122,8 @@ $(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_JAVA_DIR=$(if $(filter MACOSX,$(OS)),$${ORIGIN}/../../java,$(if $(filter WNT,$(OS)),$${ORIGIN}/../java,$${ORIGIN}/classes))' \ && echo 'URE_INTERNAL_JAVA_CLASSPATH=$${URE_MORE_JAVA_TYPES}' \ - && echo 'UNO_TYPES=$${ORIGIN}/../$(if $(filter-out MACOSX WNT,$(OS)),ure-link/)$(if $(filter-out WNT,$(OS)),share/)misc/types.rdb $${URE_MORE_TYPES}' \ - && echo 'UNO_SERVICES=$${ORIGIN}/../$(if $(filter-out MACOSX WNT,$(OS)),ure-link/)$(if $(filter-out WNT,$(OS)),share/)misc/services.rdb $${URE_MORE_SERVICES}' \ + && echo 'UNO_TYPES=$(if $(filter MACOSX,$(OS)),$${ORIGIN}/../share/misc/,$(if $(filter WNT,$(OS)),$${ORIGIN}/../share/misc/,$${ORIGIN}/))types.rdb $${URE_MORE_TYPES}' \ + && echo 'UNO_SERVICES=$(if $(filter MACOSX,$(OS)),$${ORIGIN}/../share/misc/,$(if $(filter WNT,$(OS)),$${ORIGIN}/../share/misc/,$${ORIGIN}/))services.rdb $${URE_MORE_SERVICES}' \ ) > $@ .PHONY: $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,version) diff --git a/jvmfwk/CustomTarget_jvmfwk_jvmfwk3_ini.mk b/jvmfwk/CustomTarget_jvmfwk_jvmfwk3_ini.mk index 739112a67623..bda983d0f49d 100644 --- a/jvmfwk/CustomTarget_jvmfwk_jvmfwk3_ini.mk +++ b/jvmfwk/CustomTarget_jvmfwk_jvmfwk3_ini.mk @@ -27,7 +27,7 @@ $(call gb_CustomTarget_get_workdir,jvmfwk/jvmfwk3_ini)/$(call gb_Helper_get_rcfi $(SRCDIR)/jvmfwk/CustomTarget_jvmfwk_jvmfwk3_ini.mk $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) ( printf '[Bootstrap]\n' && \ - printf 'UNO_JAVA_JFW_VENDOR_SETTINGS=$${ORIGIN}/../$(if $(filter-out MACOSX WNT,$(OS)),ure-link/)$(if $(filter-out WNT,$(OS)),share/)misc/javavendors.xml\n' && \ + printf 'UNO_JAVA_JFW_VENDOR_SETTINGS=$(if $(filter MACOSX,$(OS)),$${ORIGIN}/../share/misc/,$(if $(filter WNT,$(OS)),$${ORIGIN}/../misc/,$${ORIGIN}/))javavendors.xml\n' && \ printf 'UNO_JAVA_JFW_SHARED_DATA=$${URE_OVERRIDE_JAVA_JFW_SHARED_DATA}\n' && \ printf 'UNO_JAVA_JFW_USER_DATA=$${URE_OVERRIDE_JAVA_JFW_USER_DATA}\n' && \ printf 'UNO_JAVA_JFW_CLASSPATH_URLS=$${URE_MORE_JAVA_CLASSPATH_URLS}\n' \ diff --git a/jvmfwk/Package_rcfiles.mk b/jvmfwk/Package_rcfiles.mk index 4500404e67ac..7864d628b276 100644 --- a/jvmfwk/Package_rcfiles.mk +++ b/jvmfwk/Package_rcfiles.mk @@ -10,17 +10,17 @@ $(eval $(call gb_Package_Package,jvmfwk_javavendors,$(SRCDIR)/jvmfwk)) ifeq ($(OS),WNT) -$(eval $(call gb_Package_add_file,jvmfwk_javavendors,$(LIBO_URE_SHARE_FOLDER)/misc/javavendors.xml,distributions/OpenOfficeorg/javavendors_wnt.xml)) +$(eval $(call gb_Package_add_file,jvmfwk_javavendors,$(LIBO_URE_MISC_FOLDER)/javavendors.xml,distributions/OpenOfficeorg/javavendors_wnt.xml)) else ifeq ($(OS),FREEBSD) -$(eval $(call gb_Package_add_file,jvmfwk_javavendors,$(LIBO_URE_SHARE_FOLDER)/misc/javavendors.xml,distributions/OpenOfficeorg/javavendors_freebsd.xml)) +$(eval $(call gb_Package_add_file,jvmfwk_javavendors,$(LIBO_URE_MISC_FOLDER)/javavendors.xml,distributions/OpenOfficeorg/javavendors_freebsd.xml)) else ifeq ($(OS),MACOSX) -$(eval $(call gb_Package_add_file,jvmfwk_javavendors,$(LIBO_URE_SHARE_FOLDER)/misc/javavendors.xml,distributions/OpenOfficeorg/javavendors_macosx.xml)) +$(eval $(call gb_Package_add_file,jvmfwk_javavendors,$(LIBO_URE_MISC_FOLDER)/javavendors.xml,distributions/OpenOfficeorg/javavendors_macosx.xml)) else ifeq ($(OS),LINUX) -$(eval $(call gb_Package_add_file,jvmfwk_javavendors,$(LIBO_URE_SHARE_FOLDER)/misc/javavendors.xml,distributions/OpenOfficeorg/javavendors_linux.xml)) +$(eval $(call gb_Package_add_file,jvmfwk_javavendors,$(LIBO_URE_MISC_FOLDER)/javavendors.xml,distributions/OpenOfficeorg/javavendors_linux.xml)) else ifeq ($(OS),AIX) -$(eval $(call gb_Package_add_file,jvmfwk_javavendors,$(LIBO_URE_SHARE_FOLDER)/misc/javavendors.xml,distributions/OpenOfficeorg/javavendors_linux.xml)) +$(eval $(call gb_Package_add_file,jvmfwk_javavendors,$(LIBO_URE_MISC_FOLDER)/javavendors.xml,distributions/OpenOfficeorg/javavendors_linux.xml)) else -$(eval $(call gb_Package_add_file,jvmfwk_javavendors,$(LIBO_URE_SHARE_FOLDER)/misc/javavendors.xml,distributions/OpenOfficeorg/javavendors_unx.xml)) +$(eval $(call gb_Package_add_file,jvmfwk_javavendors,$(LIBO_URE_MISC_FOLDER)/javavendors.xml,distributions/OpenOfficeorg/javavendors_unx.xml)) endif # vim:set noet sw=4 ts=4: diff --git a/odk/config/configure.pl b/odk/config/configure.pl index 9f96a270cd26..70807273adaa 100755 --- a/odk/config/configure.pl +++ b/odk/config/configure.pl @@ -93,10 +93,6 @@ $main::return = 0; 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"; $main::OFFICE_HOME_SUGGESTION = searchMacOffice(); @@ -117,14 +113,10 @@ if ( $main::operatingSystem =~ m/darwin/ ) print " Error: An office installation is required, please specify the path to a valid installation.\n"; } - # check more details - $main::OO_SDK_URE_HOME = "$main::OFFICE_HOME/Contents"; } + $main::OO_SDK_URE_HOME = "$main::OFFICE_HOME/Contents"; } 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 "" ) { @@ -192,6 +184,8 @@ if ( $main::operatingSystem =~ m/darwin/ ) } } } + + $main::OO_SDK_URE_HOME = "$main::OFFICE_HOME"; } # prepare GNU make path diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk index 0075142d33f8..c7bf3e3a7a89 100644 --- a/odk/settings/settings.mk +++ b/odk/settings/settings.mk @@ -235,9 +235,7 @@ LIBRARY_LINK_FLAGS+=-m64 EXE_LINK_FLAGS+=-m64 endif -ifneq "$(OO_SDK_URE_HOME)" "" -URE_MISC=$(OO_SDK_URE_HOME)/share/misc -endif +URE_MISC=${OFFICE_PROGRAM_PATH} endif @@ -349,9 +347,7 @@ EXE_LINK_FLAGS=-Wl,--allow-shlib-undefined -Wl,-export-dynamic -Wl,-z,defs -Wl,- LINK_LIBS=-L"$(OUT)/lib" -L"$(OO_SDK_HOME)/lib" -L"$(OO_SDK_URE_LIB_DIR)" LINK_JAVA_LIBS=-L"$(OO_SDK_JAVA_HOME)/jre/lib/$(JAVA_PROC_TYPE)" -ifneq "$(OO_SDK_URE_HOME)" "" -URE_MISC=$(OO_SDK_URE_HOME)/share/misc -endif +URE_MISC=${OFFICE_PROGRAM_PATH} endif @@ -561,8 +557,6 @@ EXE_LINK_FLAGS=-Wl,--allow-shlib-undefined LINK_LIBS=-L"$(OUT)/lib" -L"$(OO_SDK_HOME)/lib" -L"$(OO_SDK_URE_LIB_DIR)" $(PTHREAD_LIBS) LINK_JAVA_LIBS=-L"$(OO_SDK_JAVA_HOME)/jre/lib/$(JAVA_PROC_TYPE)" -ifneq "$(OO_SDK_URE_HOME)" "" -URE_MISC=$(OO_SDK_URE_HOME)/share/misc -endif +URE_MISC=${OFFICE_PROGRAM_PATH} endif diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index 50fd2de23b63..cccf0d495be5 100644 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -65,15 +65,12 @@ #ifdef MACOSX #define GID_BRAND_DIR_ETC gid_Brand_Dir_Share #define GID_DIR_PY gid_Brand_Dir_Share - #define GID_DIR_URE gid_Dir_Bundle_Contents #define GID_DIR_URE_BIN gid_Brand_Dir_Program #define GID_DIR_URE_JAVA gid_Dir_Classes #define GID_DIR_URE_LIB gid_Dir_Frameworks - #define GID_DIR_URE_SHARE gid_Brand_Dir_Share_Ure #else #define GID_BRAND_DIR_ETC gid_Brand_Dir_Program #define GID_DIR_PY gid_Brand_Dir_Program - #define GID_DIR_URE gid_Dir_Common_Ure #if defined UNX #define GID_DIR_URE_BIN gid_Brand_Dir_Program #define GID_DIR_URE_JAVA gid_Dir_Classes @@ -82,7 +79,6 @@ #define GID_DIR_URE_JAVA gid_Dir_Ure_Java #endif #define GID_DIR_URE_LIB gid_Brand_Dir_Program - #define GID_DIR_URE_SHARE gid_Dir_Ure_Share #endif #define RESFILENAME(name,lang) STRING(CONCAT3(name,lang,.res)) @@ -477,7 +473,6 @@ End #define SCP2_URE_DL_COMID_NORMAL(n) n STRING(COMID) ".dll" #define SCP2_URE_DL_UNO_VER(n, v) n v ".dll" #define SCP2_URE_DL_UNO_COMID_VER(n, v) n v STRING(COMID) ".dll" -#define SCP2_URE_SHARE_DIR gid_Dir_Common_Ure #else #define SCP2_URE_DL_DIR GID_DIR_URE_LIB #define SCP2_URE_DL_NORMAL(n) "lib" n STRING(UNXSUFFIX) @@ -493,7 +488,6 @@ End "libuno_" n STRING(COMID) STRING(UNXSUFFIX) "." v #define SCP2_URE_DL_UNO_COMID_NORMAL(n) \ "libuno_" n STRING(COMID) STRING(UNXSUFFIX) -#define SCP2_URE_SHARE_DIR GID_DIR_URE_SHARE #endif #if defined MACOSX #define SCP2_URE_JDL_NORMAL(n) "lib" n ".jnilib" diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp index 238728b86307..9bb8ebea2b2c 100644 --- a/scp2/source/ooo/ure.scp +++ b/scp2/source/ooo/ure.scp @@ -22,16 +22,13 @@ #if !defined MACOSX +#if defined WNT Directory gid_Dir_Common_Ure - #ifdef WNT ParentID = gid_Dir_Brand_Root; HostName = "URE"; - #else - ParentID = PREDEFINED_PROGDIR; - HostName = "ure"; - #endif Styles = (UREDIRECTORY); End +#endif #if defined WNT Directory gid_Dir_Ure_Bin @@ -40,36 +37,25 @@ Directory gid_Dir_Ure_Bin End #endif -#if !defined WNT -Directory gid_Dir_Ure_Share - ParentID = gid_Dir_Common_Ure; - DosName = "share"; -End -#endif - #if defined WNT && defined ENABLE_JAVA Directory gid_Dir_Ure_Java - ParentID = SCP2_URE_SHARE_DIR; + ParentID = gid_Dir_Common_Ure; DosName = "java"; End #endif #endif // !MACOSX -#if !defined WNT -Directory gid_Dir_Ure_Share_Misc #if defined MACOSX +Directory gid_Dir_Ure_Share_Misc ParentID = gid_Brand_Dir_Share_Ure_Share; -#else - ParentID = gid_Dir_Ure_Share; -#endif DosName = "misc"; End #endif #ifdef WNT Directory gid_Dir_Ure_Misc - ParentID = SCP2_URE_SHARE_DIR; + ParentID = gid_Dir_Common_Ure; DosName = "misc"; End #endif @@ -309,8 +295,10 @@ File gid_File_Misc_TypesRdb TXT_FILE_BODY; #ifdef WNT Dir = gid_Dir_Ure_Misc; -#else +#elif defined MACOSX Dir = gid_Dir_Ure_Share_Misc; +#else + Dir = gid_Brand_Dir_Program; #endif Name = "types.rdb"; Styles = (PACKED); @@ -320,8 +308,10 @@ File gid_File_Misc_ServicesRdb TXT_FILE_BODY; #ifdef WNT Dir = gid_Dir_Ure_Misc; -#else +#elif defined MACOSX Dir = gid_Dir_Ure_Share_Misc; +#else + Dir = gid_Brand_Dir_Program; #endif Name = "services.rdb"; Styles = (PACKED); @@ -340,7 +330,6 @@ Module gid_Module_Root_Ure_Hidden Styles = (HIDDEN_ROOT); Dirs = (gid_Dir_Ure_Bin, gid_Dir_Ure_Misc, - gid_Dir_Ure_Share, gid_Dir_Ure_Java, gid_Dir_Ure_Share_Misc); Files = (auto_ure_ALL, diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk index 8a7c9adf9d72..82857a9d737d 100644 --- a/solenv/gbuild/TargetLocations.mk +++ b/solenv/gbuild/TargetLocations.mk @@ -28,7 +28,7 @@ gb_PackagePart_get_destinations = \ $(WORKDIR)/unittest \ # kind of lame but with just 3 of these why bother with registration etc. -gb_UnoApi_get_target = $(INSTROOT)/$(if $(filter udkapi,$(1)),$(LIBO_URE_SHARE_FOLDER)/misc/types,$(LIBO_ETC_FOLDER)/types/$(1)).rdb +gb_UnoApi_get_target = $(INSTROOT)/$(if $(filter udkapi,$(1)),$(LIBO_URE_MISC_FOLDER)/types,$(LIBO_ETC_FOLDER)/types/$(1)).rdb # workdir target patterns diff --git a/ure/Package_install.mk b/ure/Package_install.mk index 7571e5684ac0..c02cf299e5f8 100644 --- a/ure/Package_install.mk +++ b/ure/Package_install.mk @@ -17,8 +17,6 @@ ifeq (MACOSX,$(OS)) $(eval $(call gb_Package_add_symbolic_link,ure_install,MacOS/urelibs,../Frameworks)) else ifeq (WNT,$(OS)) $(eval $(call gb_Package_add_file,ure_install,ure-link,ure-link)) -else -$(eval $(call gb_Package_add_symbolic_link,ure_install,ure-link,ure)) endif # vim:set noet sw=4 ts=4: diff --git a/ure/Rdb_ure.mk b/ure/Rdb_ure.mk index e31651434f35..7a64cfb225fc 100644 --- a/ure/Rdb_ure.mk +++ b/ure/Rdb_ure.mk @@ -7,7 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Rdb_Rdb_install,ure/services,$(LIBO_URE_SHARE_FOLDER)/misc/services.rdb)) +$(eval $(call gb_Rdb_Rdb_install,ure/services,$(LIBO_URE_MISC_FOLDER)/services.rdb)) $(eval $(call gb_Rdb_add_components,ure/services,\ binaryurp/source/binaryurp \ diff --git a/ure/source/uretest/Makefile.pln b/ure/source/uretest/Makefile.pln index 7c5887ced9d9..ad0d42dd4bba 100644 --- a/ure/source/uretest/Makefile.pln +++ b/ure/source/uretest/Makefile.pln @@ -123,13 +123,12 @@ out.pln/cpputypes.cppumaker.flag: | out.pln LD_LIBRARY_PATH=$(URE_HOME)/program $(SDK_HOME)/bin/cppumaker \ -O./out.pln/include/cpputypes \ '-Tcom.sun.star.beans.Introspection;com.sun.star.beans.theIntrospection;com.sun.star.bridge.BridgeFactory;com.sun.star.bridge.UnoUrlResolver;com.sun.star.connection.Acceptor;com.sun.star.connection.Connector;com.sun.star.io.Pipe;com.sun.star.io.TextInputStream;com.sun.star.io.TextOutputStream;com.sun.star.java.JavaVirtualMachine;com.sun.star.lang.DisposedException;com.sun.star.lang.EventObject;com.sun.star.lang.XMain;com.sun.star.lang.XMultiComponentFactory;com.sun.star.lang.XMultiServiceFactory;com.sun.star.lang.XSingleComponentFactory;com.sun.star.lang.XSingleServiceFactory;com.sun.star.lang.XTypeProvider;com.sun.star.loader.Java;com.sun.star.loader.SharedLibrary;com.sun.star.reflection.ProxyFactory;com.sun.star.registry.ImplementationRegistration;com.sun.star.registry.SimpleRegistry;com.sun.star.registry.XRegistryKey;com.sun.star.script.Converter;com.sun.star.script.Invocation;com.sun.star.security.AccessController;com.sun.star.security.Policy;com.sun.star.uno.DeploymentException;com.sun.star.uno.Exception;com.sun.star.uno.NamingService;com.sun.star.uno.RuntimeException;com.sun.star.uno.XAggregation;com.sun.star.uno.XComponentContext;com.sun.star.uno.XCurrentContext;com.sun.star.uno.XInterface;com.sun.star.uno.XWeak;com.sun.star.uri.ExternalUriReferenceTranslator;com.sun.star.uri.UriReferenceFactory;com.sun.star.uri.VndSunStarPkgUrlReferenceFactory;com.sun.star.util.theMacroExpander' \ - $(URE_HOME)/ure-link/share/misc/types.rdb + $(URE_HOME)/program/types.rdb touch $@ out.pln/types.cppumaker.flag: out.pln/types.rdb | out.pln LD_LIBRARY_PATH=$(URE_HOME)/program $(SDK_HOME)/bin/cppumaker \ - -O./out.pln/include/types $< \ - -X$(URE_HOME)/ure-link/share/misc/types.rdb + -O./out.pln/include/types $< -X$(URE_HOME)/program/types.rdb touch $@ @@ -247,8 +246,7 @@ out.pln/types.mf: types.mf.template | out.pln out.pln/types.javamaker.flag: out.pln/types.rdb | out.pln out.pln/class rm -rf out.pln/class/types LD_LIBRARY_PATH=$(URE_HOME)/program $(SDK_HOME)/bin/javamaker \ - -O./out.pln/class/types $< \ - -X$(URE_HOME)/ure-link/share/misc/types.rdb + -O./out.pln/class/types $< -X$(URE_HOME)/program/types.rdb touch $@ |