rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-11-29 07:24:13 +01:00
Code Issues Releases Activity

[OP-703] Add default string as a source origin when using build servers

Browse Source 
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.
This commit is contained in:
Oleg Semyonov 2012-12-14 02:20:54 +02:00
parent 52b720a2e1
commit 30d874e859
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
make/scripts/version-info.py
View File

@ -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(''),

2
package/winx86/openpilotgcs.nsi
View File

@ -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}"

2
package/winx86/openpilotgcs.tpl
View File

@ -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}"