[Libreoffice-commits] core.git: Branch 'feature/instdirlinktargets' - 2 commits - solenv/gbuild sw/Module_sw.mk unotest/source

[Michael Stahl]

Rebased ref, commits from common ancestor:
commit e88bfee12219d8f5ccfd500f06dc2d4eb92730f6
Author: Michael Stahl <mstahl at redhat.com>
Date:   Sat Sep 21 14:25:39 2013 +0200

    make the PythonTest run on WNT
    
    - fix the PATH
    - file url needs to start with file:///X:/ (three slashes, literal :)
    
    Change-Id: I0d16d1e946fd06ba5523961c23c3b46872c0c050

diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk
index 73f4a23..187bc31 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -440,7 +440,7 @@ endef
 
 # PythonTest class
 
-gb_PythonTest_PRECOMMAND := $(gb_Helper_LIBRARY_PATH_VAR)=$${$(gb_Helper_LIBRARY_PATH_VAR):+$$$(gb_Helper_LIBRARY_PATH_VAR):}$(gb_DEVINSTALLROOT)/URE/bin:$(gb_DEVINSTALLROOT)/program:$(OUTDIR)/bin
+gb_PythonTest_PRECOMMAND := $(gb_Helper_set_ld_path)
 
 # SrsPartTarget class
 
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index 202c67c..7048d8e 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -72,11 +72,9 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sw,\
 endif
 
 ifneq ($(DISABLE_PYTHON),TRUE)
-ifneq ($(OS),WNT)
 $(eval $(call gb_Module_add_subsequentcheck_targets,sw,\
 	PythonTest_sw_python \
 ))
 endif
-endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/unotest/source/python/org/libreoffice/unotest.py b/unotest/source/python/org/libreoffice/unotest.py
index 883d3a4..3da77ff 100644
--- a/unotest/source/python/org/libreoffice/unotest.py
+++ b/unotest/source/python/org/libreoffice/unotest.py
@@ -193,7 +193,11 @@ class UnoInProcess:
         props = [("Hidden", True), ("ReadOnly", False), ("AsTemplate", True)]
         loadProps = tuple([mkPropertyValue(name, value) for (name, value) in props])
         path = os.getenv("TDOC")
-        url = "file://" + quote(path) + "/" + quote(file)
+        if os.name == "nt":
+            # do not quote drive letter - it must be "X:"
+            url = "file:///" + path + "/" + quote(file)
+        else:
+            url = "file://" + quote(path) + "/" + quote(file)
         self.xDoc = desktop.loadComponentFromURL(url, "_blank", 0, loadProps)
         assert(self.xDoc)
         return self.xDoc
commit 48e7fbe828562cfd0a6b27a044a2ddaf6355756b
Author: Michael Stahl <mstahl at redhat.com>
Date:   Sat Sep 21 11:55:51 2013 +0200

    gbuild: clean up naming of PDB files for MSVC
    
    There are 2 of these, one is written to by cl.exe and read by link.exe
    and the second one written by link.exe.  Name the second one as the
    linktargetname with .pdb appended, no need to substitue 5 different
    crazy suffixes.
    
    Change-Id: I2decad898ed1292b069bdda3124ce6f6c3667108

diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk
index fda55f6..73f4a23 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -136,13 +136,12 @@ gb_LinkTarget_INCLUDE :=\
 	$(foreach inc,$(subst ;, ,$(JDKINC)),-I$(inc)) \
 	-I$(BUILDDIR)/config_$(gb_Side) \
 
-gb_LinkTarget_get_pdbfile = \
- $(WORKDIR)/LinkTarget/pdb/$(call gb_LinkTarget__get_workdir_linktargetname,$(1)).pdb
-# substitute .pyd here because pyuno has to follow python's crazy conventions
-gb_LinkTarget_get_pdbfile2 = \
- $(WORKDIR)/LinkTarget/$(patsubst %.dll,%.pdb,$(patsubst %.pyd,%.dll,$(call gb_LinkTarget__get_workdir_linktargetname,$(1))))
+gb_LinkTarget_get_pdbfile_in = \
+ $(WORKDIR)/LinkTarget/$(call gb_LinkTarget__get_workdir_linktargetname,$(1)).objects.pdb
+gb_LinkTarget_get_pdbfile_out = \
+ $(WORKDIR)/LinkTarget/$(call gb_LinkTarget__get_workdir_linktargetname,$(1)).pdb
 gb_LinkTarget_get_ilkfile = \
- $(WORKDIR)/LinkTarget/$(patsubst %.dll,%.ilk,$(patsubst %.pyd,%.dll,$(call gb_LinkTarget__get_workdir_linktargetname,$(1))))
+ $(WORKDIR)/LinkTarget/$(call gb_LinkTarget__get_workdir_linktargetname,$(1)).ilk
 gb_LinkTarget_get_manifestfile = \
  $(WORKDIR)/LinkTarget/$(call gb_LinkTarget__get_workdir_linktargetname,$(1)).manifest
 
@@ -299,8 +298,8 @@ $(call gb_LinkTarget_set_ilibtarget,$(2),$(3))
 $(call gb_LinkTarget_add_auxtargets,$(2),\
 	$(patsubst %.lib,%.exp,$(3)) \
 	$(call gb_LinkTarget_get_manifestfile,$(2)) \
-	$(call gb_LinkTarget_get_pdbfile,$(2)) \
-	$(call gb_LinkTarget_get_pdbfile2,$(2)) \
+	$(call gb_LinkTarget_get_pdbfile_in,$(2)) \
+	$(call gb_LinkTarget_get_pdbfile_out,$(2)) \
 	$(call gb_LinkTarget_get_ilkfile,$(2)) \
 )
 
@@ -309,7 +308,7 @@ $(call gb_Library_add_default_nativeres,$(1),$(1)/default)
 $(call gb_Deliver_add_deliverable,$(OUTDIR)/lib/$(notdir $(3)),$(3),$(1))
 
 $(call gb_LinkTarget_get_target,$(2)) \
-$(call gb_LinkTarget_get_headers_target,$(2)) : PDBFILE = $(call gb_LinkTarget_get_pdbfile,$(2))
+$(call gb_LinkTarget_get_headers_target,$(2)) : PDBFILE = $(call gb_LinkTarget_get_pdbfile_in,$(2))
 
 endef
 
@@ -354,10 +353,10 @@ gb_StaticLibrary_PLAINEXT := .lib
 
 define gb_StaticLibrary_StaticLibrary_platform
 $(call gb_LinkTarget_get_target,$(2)) \
-$(call gb_LinkTarget_get_headers_target,$(2)) : PDBFILE = $(call gb_LinkTarget_get_pdbfile,$(2))
+$(call gb_LinkTarget_get_headers_target,$(2)) : PDBFILE = $(call gb_LinkTarget_get_pdbfile_in,$(2))
 
 $(call gb_LinkTarget_add_auxtargets,$(2),\
-	$(call gb_LinkTarget_get_pdbfile,$(2)) \
+	$(call gb_LinkTarget_get_pdbfile_in,$(2)) \
 )
 
 endef
@@ -376,13 +375,13 @@ $(call gb_LinkTarget_set_ilibtarget,$(2),$(3))
 
 $(call gb_LinkTarget_add_auxtargets,$(2),\
 	$(patsubst %.lib,%.exp,$(3)) \
-	$(call gb_LinkTarget_get_pdbfile2,$(2)).pdb \
-	$(call gb_LinkTarget_get_pdbfile,$(2)) \
+	$(call gb_LinkTarget_get_pdbfile_out,$(2)) \
+	$(call gb_LinkTarget_get_pdbfile_in,$(2)) \
 	$(call gb_LinkTarget_get_manifestfile,$(2)) \
 )
 
 $(call gb_LinkTarget_get_target,$(2)) \
-$(call gb_LinkTarget_get_headers_target,$(2)) : PDBFILE := $(call gb_LinkTarget_get_pdbfile,$(2))
+$(call gb_LinkTarget_get_headers_target,$(2)) : PDBFILE := $(call gb_LinkTarget_get_pdbfile_in,$(2))
 $(call gb_LinkTarget_get_target,$(2)) : TARGETGUI :=
 
 endef
@@ -405,13 +404,13 @@ $(call gb_LinkTarget_add_auxtargets,$(2),\
 	$(patsubst %.lib,%.exp,$(3)) \
 	$(3) \
 	$(call gb_LinkTarget_get_manifestfile,$(2)) \
-	$(call gb_LinkTarget_get_pdbfile2,$(2)) \
-	$(call gb_LinkTarget_get_pdbfile,$(2)) \
+	$(call gb_LinkTarget_get_pdbfile_out,$(2)) \
+	$(call gb_LinkTarget_get_pdbfile_in,$(2)) \
 	$(call gb_LinkTarget_get_ilkfile,$(2)) \
 )
 
 $(call gb_LinkTarget_get_target,$(2)) \
-$(call gb_LinkTarget_get_headers_target,$(2)) : PDBFILE = $(call gb_LinkTarget_get_pdbfile,$(2))
+$(call gb_LinkTarget_get_headers_target,$(2)) : PDBFILE = $(call gb_LinkTarget_get_pdbfile_in,$(2))
 
 endef