From da18ee67b1a8bed18f4ec1cdf76eb67e65d651d1 Mon Sep 17 00:00:00 2001 From: osnwt Date: Wed, 23 Feb 2011 20:26:50 +0000 Subject: [PATCH] Windows Installer: Ignored SubWCRev error (if, for instance, built not from an SVN working copy). git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2863 ebee16cc-31ac-478f-84a7-5cbb03baadba --- ground/openpilotgcs/packaging/winx86/winx86.pro | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/ground/openpilotgcs/packaging/winx86/winx86.pro b/ground/openpilotgcs/packaging/winx86/winx86.pro index 077b37ba7..001d36e3e 100644 --- a/ground/openpilotgcs/packaging/winx86/winx86.pro +++ b/ground/openpilotgcs/packaging/winx86/winx86.pro @@ -24,13 +24,22 @@ equals(copydata, 1):win32:CONFIG(release, debug|release) { exists($$SUBWCREV_EXE) { message("SubWCRev found: $${SUBWCREV_EXE}") + svninfo.commands += @echo Copying stubs... $$addNewline() + svninfo.commands += $(COPY_FILE) + svninfo.commands += $$targetPath($$GCS_SOURCE_TREE/$$WINX86_PATH/$$SVN_INFO_MAKEFILE) + svninfo.commands += $$targetPath($$GCS_BUILD_TREE/$$WINX86_PATH/$$SVN_INFO_MAKEFILE) + svninfo.commands += $$addNewline() + svninfo.commands += $(COPY_FILE) + svninfo.commands += $$targetPath($$GCS_SOURCE_TREE/$$WINX86_PATH/$$NSIS_HEADER) + svninfo.commands += $$targetPath($$GCS_BUILD_TREE/$$WINX86_PATH/$$NSIS_HEADER) + svninfo.commands += $$addNewline() svninfo.commands += @echo Executing $${SUBWCREV_EXE} $$SVN_INFO_TEMPLATE $$SVN_INFO_MAKEFILE $$addNewline() - svninfo.commands += @$$SUBWCREV_EXE $$targetPath($$GCS_SOURCE_TREE) + svninfo.commands += -@$$SUBWCREV_EXE $$targetPath($$GCS_SOURCE_TREE) svninfo.commands += $$targetPath($$GCS_SOURCE_TREE/$$WINX86_PATH/$$SVN_INFO_TEMPLATE) svninfo.commands += $$targetPath($$GCS_BUILD_TREE/$$WINX86_PATH/$$SVN_INFO_MAKEFILE) svninfo.commands += $$addNewline() svninfo.commands += @echo Executing $${SUBWCREV_EXE} $$NSIS_TEMPLATE $$NSIS_HEADER $$addNewline() - svninfo.commands += @$$SUBWCREV_EXE $$targetPath($$GCS_SOURCE_TREE) + svninfo.commands += -@$$SUBWCREV_EXE $$targetPath($$GCS_SOURCE_TREE) svninfo.commands += $$targetPath($$GCS_SOURCE_TREE/$$WINX86_PATH/$$NSIS_TEMPLATE) svninfo.commands += $$targetPath($$GCS_BUILD_TREE/$$WINX86_PATH/$$NSIS_HEADER) svninfo.commands += $$addNewline()