Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1591
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/91/1591/1
Use MSBuild from .NET Framework 4.0
Otherwise building these external projects fails, at least for me.
Change-Id: I20ea889537badf2713101b3296604a855451ae2f
---
M lcms2/ExternalProject_lcms2.mk
M libcdr/ExternalProject_libcdr.mk
M liborcus/ExternalProject_liborcus.mk
M libvisio/ExternalProject_libvisio.mk
M libwpd/ExternalProject_libwpd.mk
M python3/ExternalProject_python3.mk
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/lcms2/ExternalProject_lcms2.mk b/lcms2/ExternalProject_lcms2.mk
index c8d93eb..80a98e1 100644
--- a/lcms2/ExternalProject_lcms2.mk
+++ b/lcms2/ExternalProject_lcms2.mk
@@ -20,7 +20,7 @@
ifeq ($(filter-out 14 13,$(COMEX)),)
$(call gb_ExternalProject_get_state_target,lcms2,build):
cd $(EXTERNAL_WORKDIR)/Projects/VC2010/lcms2_DLL \
- && MSBuild.exe lcms2_DLL.vcxproj /p:Configuration=Release
/p:Platform=Win32 /p:TargetName=lcms2 \
+ && '/cygdrive/c/Windows/Microsoft.NET/Framework/v4.0.30319/MSBuild.exe'
lcms2_DLL.vcxproj /p:Configuration=Release /p:Platform=Win32
/p:TargetName=lcms2 \
$(if $(filter 14,$(COMEX)),/p:PlatformToolset=v110) \
&& touch $@
else
diff --git a/libcdr/ExternalProject_libcdr.mk b/libcdr/ExternalProject_libcdr.mk
index f4dcab5..9d46d56 100644
--- a/libcdr/ExternalProject_libcdr.mk
+++ b/libcdr/ExternalProject_libcdr.mk
@@ -39,7 +39,7 @@
&& export LIBWPG_INCLUDE_DIR=$(OUTDIR)/inc/external \
&& export LCMS2_INCLUDE_DIR=$(call
gb_UnpackedTarball_get_dir,lcms2/include) \
&& export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \
- && msbuild.exe libcdr.vcxproj /p:Configuration=Release \
+ && '/cygdrive/c/Windows/Microsoft.NET/Framework/v4.0.30319/msbuild.exe'
libcdr.vcxproj /p:Configuration=Release \
&& touch $@
else
$(call gb_ExternalProject_get_state_target,libcdr,build) :
diff --git a/liborcus/ExternalProject_liborcus.mk
b/liborcus/ExternalProject_liborcus.mk
index 0c64d86..ebdfd4d 100644
--- a/liborcus/ExternalProject_liborcus.mk
+++ b/liborcus/ExternalProject_liborcus.mk
@@ -34,7 +34,7 @@
&& export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \
&& export BOOST_LIB_DIR=$(OUTDIR)/lib \
&& $(COMPATH)/../Common7/Tools/vcupgrade.exe
liborcus-static-nozip.vcproj \
- && MSBuild.exe liborcus-static-nozip.vcxproj /p:Configuration=Release
/p:OutDir=Release/ /p:TargetName=orcus /p:WholeProgramOptimization=no \
+ && '/cygdrive/c/Windows/Microsoft.NET/Framework/v4.0.30319/MSBuild.exe'
liborcus-static-nozip.vcxproj /p:Configuration=Release /p:OutDir=Release/
/p:TargetName=orcus /p:WholeProgramOptimization=no \
&& touch $@
endif
diff --git a/libvisio/ExternalProject_libvisio.mk
b/libvisio/ExternalProject_libvisio.mk
index 191a712..48aaf8a 100644
--- a/libvisio/ExternalProject_libvisio.mk
+++ b/libvisio/ExternalProject_libvisio.mk
@@ -39,7 +39,7 @@
&& export LIBWPG_INCLUDE_DIR=$(OUTDIR)/inc/external \
&& export LIBXML_INCLUDE_DIR=$(OUTDIR)/inc/extrenal \
&& export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \
- && msbuild.exe libvisio.vcxproj /p:Configuration=Release \
+ && '/cygdrive/c/Windows/Microsoft.NET/Framework/v4.0.30319/msbuild.exe'
libvisio.vcxproj /p:Configuration=Release \
&& touch $@
else
$(call gb_ExternalProject_get_state_target,libvisio,build) :
diff --git a/libwpd/ExternalProject_libwpd.mk b/libwpd/ExternalProject_libwpd.mk
index 08d506c..4d11ff1 100644
--- a/libwpd/ExternalProject_libwpd.mk
+++ b/libwpd/ExternalProject_libwpd.mk
@@ -25,7 +25,7 @@
else ifeq ($(VCVER),100)
$(call gb_ExternalProject_get_state_target,libwpd,build) :
cd $(EXTERNAL_WORKDIR)/build/win32 \
- && msbuild.exe libwpd.vcxproj /p:Configuration=Release \
+ && '/cygdrive/c/Windows/Microsoft.NET/Framework/v4.0.30319/msbuild.exe'
libwpd.vcxproj /p:Configuration=Release \
&& touch $@
else
$(call gb_ExternalProject_get_state_target,libwpd,build) :
diff --git a/python3/ExternalProject_python3.mk
b/python3/ExternalProject_python3.mk
index 2bde4cf..e4ba16d 100644
--- a/python3/ExternalProject_python3.mk
+++ b/python3/ExternalProject_python3.mk
@@ -32,7 +32,7 @@
&& touch $@
else ifeq ($(VCVER),100)
cd $(EXTERNAL_WORKDIR)/PCbuild \
- && MAKEFLAGS= MSBuild.exe pcbuild.sln /t:Build /p:Configuration=Release
/ToolsVersion:4.0 \
+ && MAKEFLAGS=
'/cygdrive/c/Windows/Microsoft.NET/Framework/v4.0.30319/MSBuild.exe'
pcbuild.sln /t:Build /p:Configuration=Release /ToolsVersion:4.0 \
&& cd $(EXTERNAL_WORKDIR) \
&& ln -s PCbuild LO_lib \
&& touch $@
--
To view, visit https://gerrit.libreoffice.org/1591
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I20ea889537badf2713101b3296604a855451ae2f
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Tor Lillqvist <[email protected]>
_______________________________________________
LibreOffice mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/libreoffice
