bridges/Jar_java_uno.mk | 2 +- configure.ac | 2 +- desktop/scripts/unoinfo.sh | 6 ++---- instsetoo_native/CustomTarget_setup.mk | 2 +- javaunohelper/Jar_juh.mk | 2 +- jurt/Jar_jurt.mk | 2 +- odk/config/setsdkenv_unix.sh.in | 2 +- scp2/inc/macros.inc | 3 ++- scp2/source/ooo/ure.scp | 2 +- ure/source/uretest/Makefile.pln | 19 +++++++++---------- 10 files changed, 20 insertions(+), 22 deletions(-)
New commits: commit 8fdb23973521125892d4a99dc4e33463680a0047 Author: Stephan Bergmann <[email protected]> Date: Fri Nov 28 15:24:10 2014 +0100 Fold URE: Linux ure/share/java/* -> program/classes/ Change-Id: I86864f832c0377d307cfa0b2c137f452e43797eb diff --git a/bridges/Jar_java_uno.mk b/bridges/Jar_java_uno.mk index a924375..da80f84 100644 --- a/bridges/Jar_java_uno.mk +++ b/bridges/Jar_java_uno.mk @@ -22,7 +22,7 @@ $(eval $(call gb_Jar_add_manifest_classpath,java_uno,\ ridl.jar \ jurt.jar \ $(if $(filter MACOSX,$(OS)),../../Frameworks/, \ - $(if $(filter WNT,$(OS)),../bin/,../../../program/)) \ + $(if $(filter WNT,$(OS)),../bin/,../)) \ )) $(eval $(call gb_Jar_add_sourcefiles,java_uno,\ diff --git a/configure.ac b/configure.ac index 2f9dcdf..3eddaf4 100644 --- a/configure.ac +++ b/configure.ac @@ -3060,7 +3060,7 @@ else LIBO_URE_ETC_FOLDER=program LIBO_URE_LIB_FOLDER=program LIBO_URE_SHARE_FOLDER=ure/share - LIBO_URE_SHARE_JAVA_FOLDER=ure/share/java + LIBO_URE_SHARE_JAVA_FOLDER=program/classes fi AC_DEFINE_UNQUOTED(LIBO_BIN_FOLDER,"$LIBO_BIN_FOLDER") AC_DEFINE_UNQUOTED(LIBO_ETC_FOLDER,"$LIBO_ETC_FOLDER") diff --git a/desktop/scripts/unoinfo.sh b/desktop/scripts/unoinfo.sh index edadbc0..464d1b8 100755 --- a/desktop/scripts/unoinfo.sh +++ b/desktop/scripts/unoinfo.sh @@ -35,10 +35,8 @@ c++) ;; java) printf '0%s\0%s\0%s\0%s\0%s' \ - "$sd_prog/../ure-link/share/java/ridl.jar" \ - "$sd_prog/../ure-link/share/java/jurt.jar" \ - "$sd_prog/../ure-link/share/java/juh.jar" \ - "$sd_prog/../program/classes/unoil.jar" "$sd_prog" + "$sd_prog/classes/ridl.jar" "$sd_prog/classes/jurt.jar" \ + "$sd_prog/classes/juh.jar" "$sd_prog/classes/unoil.jar" "$sd_prog" ;; *) exit 1 diff --git a/instsetoo_native/CustomTarget_setup.mk b/instsetoo_native/CustomTarget_setup.mk index 052a51e..b2bd939 100644 --- a/instsetoo_native/CustomTarget_setup.mk +++ b/instsetoo_native/CustomTarget_setup.mk @@ -120,7 +120,7 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_ ( \ echo '[Bootstrap]' \ && echo 'URE_INTERNAL_LIB_DIR=$${ORIGIN}$(if $(filter MACOSX,$(OS)),/../../../Frameworks)' \ - && echo 'URE_INTERNAL_JAVA_DIR=$${ORIGIN}/..$(if $(filter-out MACOSX WNT,$(OS)),/ure-link)$(if $(filter-out WNT,$(OS)),/$(if $(filter MACOSX,$(OS)),..,share))/java' \ + && 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}' \ diff --git a/javaunohelper/Jar_juh.mk b/javaunohelper/Jar_juh.mk index 7405ac7..cfd0ec8 100644 --- a/javaunohelper/Jar_juh.mk +++ b/javaunohelper/Jar_juh.mk @@ -20,7 +20,7 @@ $(eval $(call gb_Jar_add_manifest_classpath,juh, \ jurt.jar \ ridl.jar \ $(if $(filter MACOSX,$(OS)),../../Frameworks/, \ - $(if $(filter WNT,$(OS)),../bin/,../../../program/)) \ + $(if $(filter WNT,$(OS)),../bin/,../)) \ )) $(eval $(call gb_Jar_set_manifest,juh,$(SRCDIR)/javaunohelper/util/manifest)) diff --git a/jurt/Jar_jurt.mk b/jurt/Jar_jurt.mk index c67eeb7..710e818 100644 --- a/jurt/Jar_jurt.mk +++ b/jurt/Jar_jurt.mk @@ -22,7 +22,7 @@ $(eval $(call gb_Jar_add_manifest_classpath,jurt, \ ridl.jar \ unoloader.jar \ $(if $(filter MACOSX,$(OS)),../../Frameworks/, \ - $(if $(filter WNT,$(OS)),../bin/,../../../program/)) \ + $(if $(filter WNT,$(OS)),../bin/,../)) \ )) $(eval $(call gb_Jar_add_sourcefiles,jurt,\ diff --git a/odk/config/setsdkenv_unix.sh.in b/odk/config/setsdkenv_unix.sh.in index 2a9d566..fc18d30 100644 --- a/odk/config/setsdkenv_unix.sh.in +++ b/odk/config/setsdkenv_unix.sh.in @@ -114,7 +114,7 @@ case ${sdk_platform} in *) OO_SDK_URE_BIN_DIR=${OFFICE_PROGRAM_PATH} OO_SDK_URE_LIB_DIR=${OFFICE_PROGRAM_PATH} - OO_SDK_URE_JAVA_DIR=${OO_SDK_URE_HOME}/share/java + OO_SDK_URE_JAVA_DIR=${OFFICE_PROGRAM_PATH}/classes ;; esac export OO_SDK_URE_BIN_DIR diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index 514c315..50fd2de 100644 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -76,10 +76,11 @@ #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 #else #define GID_DIR_URE_BIN gid_Dir_Ure_Bin -#endif #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 diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp index 819ac0f..238728b 100644 --- a/scp2/source/ooo/ure.scp +++ b/scp2/source/ooo/ure.scp @@ -47,7 +47,7 @@ Directory gid_Dir_Ure_Share End #endif -#if defined ENABLE_JAVA +#if defined WNT && defined ENABLE_JAVA Directory gid_Dir_Ure_Java ParentID = SCP2_URE_SHARE_DIR; DosName = "java"; diff --git a/ure/source/uretest/Makefile.pln b/ure/source/uretest/Makefile.pln index a5b8ae9..7c5887c 100644 --- a/ure/source/uretest/Makefile.pln +++ b/ure/source/uretest/Makefile.pln @@ -56,7 +56,7 @@ test-javanative: out.pln/runner.jar out.pln/javanative.jar \ URE_MORE_TYPES=file://$(PWD)/out.pln/types.rdb \ URE_MORE_SERVICES=file://$(PWD)/out.pln/services.rdb \ $(GCCS_COMPAT) LD_LIBRARY_PATH=$(URE_HOME)/program java \ - -jar out.pln/runner.jar file://$(URE_HOME)/ure-link/share/java/ \ + -jar out.pln/runner.jar file://$(URE_HOME)/program/classes/ \ file://$(PWD)/out.pln/javanative.jar .PHONY: test-clientserver @@ -68,8 +68,7 @@ test-clientserver: out.pln/cppserver.uno.so out.pln/types.rdb \ -env:URE_MORE_SERVICES=file://$(PWD)/out.pln/services.rdb \ -u 'uno:pipe,name=ure_test;urp;server' --singleaccept & sleep 5 && \ - java -jar out.pln/runner.jar \ - file://$(URE_HOME)/ure-link/share/java/ \ + java -jar out.pln/runner.jar file://$(URE_HOME)/program/classes/ \ file://$(PWD)/out.pln/javaclient.jar \ 'uno:pipe,name=ure_test;urp;server' @@ -148,7 +147,7 @@ out.pln/class/javamain/test/java/javamain/JavaMain.class: JavaMain.java \ rm -rf out.pln/class/javamain mkdir out.pln/class/javamain javac -classpath \ - $(URE_HOME)/ure-link/share/java/jurt.jar:$(URE_HOME)/ure-link/share/java/ridl.jar:out.pln/tester.jar \ + $(URE_HOME)/program/classes/jurt.jar:$(URE_HOME)/program/classes/ridl.jar:out.pln/tester.jar \ -sourcepath . -d out.pln/class/javamain $< @@ -158,13 +157,13 @@ out.pln/runner.jar: out.pln/class/runner/test/java/runner/Runner.class \ out.pln/runner.mf: runner.mf.template | out.pln sed -e \ - 's~^Class-Path:$$~& file://$(URE_HOME)/ure-link/share/java/unoloader.jar~' \ + 's~^Class-Path:$$~& file://$(URE_HOME)/program/classes/unoloader.jar~' \ -e 's~^UNO-Type-Path:$$~& ~' $< > $@ out.pln/class/runner/test/java/runner/Runner.class: Runner.java | out.pln/class rm -rf out.pln/class/runner mkdir out.pln/class/runner - javac -classpath $(URE_HOME)/ure-link/share/java/unoloader.jar \ + javac -classpath $(URE_HOME)/program/classes/unoloader.jar \ -sourcepath . -d out.pln/class/runner $< @@ -181,7 +180,7 @@ out.pln/class/tester/test/java/tester/Tester.class: Tester.java \ rm -rf out.pln/class/tester mkdir out.pln/class/tester javac -classpath \ - $(URE_HOME)/ure-link/share/java/ridl.jar:out.pln/types.jar \ + $(URE_HOME)/program/classes/ridl.jar:out.pln/types.jar \ -sourcepath . -d out.pln/class/tester $< @@ -199,7 +198,7 @@ out.pln/class/javatest/test/java/javatest/JavaTest.class: JavaTest.java \ rm -rf out.pln/class/javatest mkdir out.pln/class/javatest javac -classpath \ - $(URE_HOME)/ure-link/share/java/jurt.jar:$(URE_HOME)/ure-link/share/java/ridl.jar:out.pln/types.jar \ + $(URE_HOME)/program/classes/jurt.jar:$(URE_HOME)/program/classes/ridl.jar:out.pln/types.jar \ -sourcepath . -d out.pln/class/javatest $< @@ -217,7 +216,7 @@ out.pln/class/javanative/test/java/javanative/JavaNative.class: \ rm -rf out.pln/class/javanative mkdir out.pln/class/javanative javac -classpath \ - $(URE_HOME)/ure-link/share/java/juh.jar:$(URE_HOME)/ure-link/share/java/ridl.jar:out.pln/tester.jar \ + $(URE_HOME)/program/classes/juh.jar:$(URE_HOME)/program/classes/ridl.jar:out.pln/tester.jar \ -sourcepath . -d out.pln/class/javanative $< @@ -235,7 +234,7 @@ out.pln/class/javaclient/test/java/javaclient/JavaClient.class: \ rm -rf out.pln/class/javaclient mkdir out.pln/class/javaclient javac -classpath \ - $(URE_HOME)/ure-link/share/java/juh.jar:$(URE_HOME)/ure-link/share/java/ridl.jar:out.pln/types.jar \ + $(URE_HOME)/program/classes/juh.jar:$(URE_HOME)/program/classes/ridl.jar:out.pln/types.jar \ -sourcepath . -d out.pln/class/javaclient $< _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
