From 30d874e8598ef8218aa66efee6cf0b37fa3ed287 Mon Sep 17 00:00:00 2001
From: Oleg Semyonov <os@openpilot.org>
Date: Fri, 14 Dec 2012 02:20:54 +0200
Subject: [PATCH] [OP-703] Add default string as a source origin when using
 build servers

Bamboo does not preserve git repository origin when making builds, and
it is shown later in About dialog as "Built from None". This patch fixes
that providing more accurate source description.
---
 make/scripts/version-info.py    | 2 +-
 package/winx86/openpilotgcs.nsi | 2 +-
 package/winx86/openpilotgcs.tpl | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/make/scripts/version-info.py b/make/scripts/version-info.py
index 924cf18fb..2dc0d4381 100644
--- a/make/scripts/version-info.py
+++ b/make/scripts/version-info.py
@@ -390,7 +390,7 @@ string given.
     dictionary = dict(
         TEMPLATE = args.template,
         OUTFILENAME = args.outfile,
-        ORIGIN = r.origin(),
+        ORIGIN = r.origin("local repository or using build servers"),
         HASH = r.hash(),
         HASH8 = r.hash(8),
         TAG = r.tag(''),
diff --git a/package/winx86/openpilotgcs.nsi b/package/winx86/openpilotgcs.nsi
index bd6496c1b..657f39df0 100644
--- a/package/winx86/openpilotgcs.nsi
+++ b/package/winx86/openpilotgcs.nsi
@@ -60,7 +60,7 @@
 ; !define FIRMWARE_DIR "firmware-$${PACKAGE_LBL}"
 ; !define PRODUCT_VERSION "0.0.0.0"
 ; !define FILE_VERSION "${TAG_OR_BRANCH}:${HASH8} ${DATETIME}"
-; !define BUILD_DESCRIPTION "${TAG_OR_BRANCH}:${HASH8} built using ${ORIGIN} as origin, committed ${DATETIME} as ${HASH}"
+; !define BUILD_DESCRIPTION "${TAG_OR_BRANCH}:${HASH8} built from ${ORIGIN}, committed ${DATETIME} as ${HASH}"
   !include "${GCS_BUILD_TREE}\openpilotgcs.nsh"
 
   Name "${PRODUCT_NAME}"
diff --git a/package/winx86/openpilotgcs.tpl b/package/winx86/openpilotgcs.tpl
index f33a318d9..3669096c0 100644
--- a/package/winx86/openpilotgcs.tpl
+++ b/package/winx86/openpilotgcs.tpl
@@ -22,4 +22,4 @@
 ; Installer version info
 !define PRODUCT_VERSION "0.0.0.0"
 !define FILE_VERSION "${TAG_OR_BRANCH}:${HASH8}${DIRTY} ${DATETIME}"
-!define BUILD_DESCRIPTION "${PACKAGE_LBL} built using ${ORIGIN} as origin, committed ${DATETIME} as ${HASH}"
+!define BUILD_DESCRIPTION "${PACKAGE_LBL} built from ${ORIGIN}, committed ${DATETIME} as ${HASH}"