[Libreoffice-commits] core.git: ure/source

[Stephan Bergmann (via logerrit)]

 ure/source/uretest/Makefile     |    4 ++--
 ure/source/uretest/Makefile.pln |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit d87acc9fed5fd42588f593ac5e1bfca8308499dd
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Mon Aug 30 15:54:45 2021 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Tue Aug 31 07:44:09 2021 +0200

    Adapt to cppu-/javamaker's idiosyncratic relative URL notation
    
    ...which considers an argument containing SEPARATOR characters only as a
    relative URL (which it then makes absolute relative to osl_getProcessWorkingDir)
    if it starts with a dot (see convertToFileUrl in
    codemaker/source/codemaker/global.cxx).  (Which isn't an issue for now, as
    convertToFileUrl leaves the relative path unchanged, which is passed to the
    unoidl::detail::LegacyProvider ctor in unoidl/source/legacyprovider.cxx and on
    to store::FileHandle::initialize in store/source/lockbyte.cxx, which makes a
    relative pFilename absolute relative to osl_getProcessWorkingDir.  But it would
    become an issue when the given type RDBs are changed to the new UNOIDL binary
    format, as the unoidl::detail::UnoidlProvider ctor in
    unoidl/source/unoidlprovider.hxx expects an absolute file URL.)
    
    Change-Id: If9f66f3e9c20a8416d25989099e6c921520e6a94
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121312
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/ure/source/uretest/Makefile b/ure/source/uretest/Makefile
index 5f17a099d04d..ebfcd4bb96cf 100644
--- a/ure/source/uretest/Makefile
+++ b/ure/source/uretest/Makefile
@@ -145,7 +145,7 @@ out.sdk/cpputypes.cppumaker.flag: | out.sdk
 	touch $@
 
 out.sdk/types.cppumaker.flag: out.sdk/types.rdb | out.sdk
-	$(CPPUMAKER) -O./out.sdk/include/types $< "-X$(URE_TYPES)"
+	$(CPPUMAKER) -O./out.sdk/include/types ./$< "-X$(URE_TYPES)"
 	touch $@
 
 
@@ -262,7 +262,7 @@ out.sdk/types.mf: types.mf.template | out.sdk
 
 out.sdk/types.javamaker.flag: out.sdk/types.rdb | out.sdk out.sdk/class
 	- $(DELRECURSIVE) $(subst /,$(PS),out.sdk/class/types)
-	$(JAVAMAKER) -O./out.sdk/class/types $< "-X$(URE_TYPES)"
+	$(JAVAMAKER) -O./out.sdk/class/types ./$< "-X$(URE_TYPES)"
 	touch $@
 
 
diff --git a/ure/source/uretest/Makefile.pln b/ure/source/uretest/Makefile.pln
index 3ea8c34827cc..990c32bf5771 100644
--- a/ure/source/uretest/Makefile.pln
+++ b/ure/source/uretest/Makefile.pln
@@ -125,7 +125,7 @@ out.pln/cpputypes.cppumaker.flag: | out.pln
 
 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)/program/types.rdb
+            -O./out.pln/include/types ./$< -X$(URE_HOME)/program/types.rdb
 	touch $@
 
 
@@ -243,7 +243,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)/program/types.rdb
+            -O./out.pln/class/types ./$< -X$(URE_HOME)/program/types.rdb
 	touch $@