Adding app info to version information

This commit is contained in:
John Lyon-Smith
2018-02-26 12:56:41 -08:00
parent f8e930d59e
commit 37e989fa51
5 changed files with 30 additions and 11 deletions

View File

@@ -1,6 +1,7 @@
{
filenames: [
"package.json",
"website/.env",
"website/src/version.js",
"scratch/version.tag.txt",
"scratch/version.desc.txt"
@@ -10,10 +11,12 @@
major: 0,
minor: 1,
patch: 0,
build: 20180225,
build: 20180226,
revision: 0,
tz: "America/Los_Angeles",
startYear: "2017"
title: "Deighton AR System",
copyright: "© 2018, Kingston Software Solutions.",
supportEmail: "support@kss.us.com"
},
fileTypes: [
{
@@ -29,16 +32,24 @@
glob: "**/version.js",
updates: [
{
search: "^(?<begin>\\s*static\\s*version\\s*=\\s*')\\d+\\.\\d+\\.\\d+(?<end>'\\s*)$",
search: "^(?<begin>\\s*version:\\s*')\\d+\\.\\d+\\.\\d+(?<end>',\\s*)$",
replace: "${begin}${major}.${minor}.${patch}${end}"
},
{
search: "^(?<begin>\\s*static\\s*fullVersion\\s*=\\s*')\\d+\\.\\d+\\.\\d+-\\d+\\.\\d+(?<end>'\\s*)$",
search: "^(?<begin>\\s*fullVersion:\\s*')\\d+\\.\\d+\\.\\d+-\\d+\\.\\d+(?<end>',\\s*)$",
replace: "${begin}${major}.${minor}.${patch}-${build}.${revision}${end}"
},
{
search: "^(?<begin>\\s*static\\s*startYear\\s*=\\s*')\\d+(?<end>'\\s*)$",
replace: "${begin}${startYear}${end}"
search: "^(?<begin>\\s*title:\\s*')[^']*(?<end>',\\s*)$",
replace: "${begin}${title}${end}"
},
{
search: "^(?<begin>\\s*copyright:\\s*')[^']*(?<end>',\\s*)$",
replace: "${begin}${copyright}${end}"
},
{
search: "^(?<begin>\\s*supportEmail:\\s*')[^']*(?<end>',\\s*)$",
replace: "${begin}${supportEmail}${end}"
}
]
},
@@ -51,6 +62,11 @@
name: "Commit tag description file",
glob: "**/*.desc.txt",
write: "Version ${major}.${minor}.${patch}-${build}.${revision}"
},
{
name: "Website environment file",
glob: "website/.env",
write: "REACT_APP_TITLE=${title}"
}
]
}

1
website/.env Normal file
View File

@@ -0,0 +1 @@
REACT_APP_TITLE=Deighton AR System

View File

@@ -1,11 +1,11 @@
<!doctype html>
<html lang="en">
<head>
<title>Deighton AR</title>
<title>%REACT_APP_TITLE%</title>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link href="https://fonts.googleapis.com/css?family=Hind" rel="stylesheet">
<link rel="shortcut icon" href="%PUBLIC_URL%/favicon.png">
<link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico">
</head>
<body style="margin: 0;">
<div id="root"></div>

View File

@@ -42,7 +42,7 @@ export class App extends React.Component {
</Column.Item>
<Column.Item>
<Box color='#FAFAFA' borderTop='1px solid #B2B2B2'>
<Text tone='dimmed' margin={10}>{versionInfo.fullVersion} &copy; 2018, Kingston Software Solutions.</Text>
<Text tone='dimmed' margin={10}>{versionInfo.fullVersion} {versionInfo.copyright}</Text>
</Box>
</Column.Item>
</Column>

View File

@@ -1,5 +1,7 @@
export const versionInfo = {
version: '0.1.0',
fullVersion: '0.1.0-20180225.0',
startYear: '2017',
fullVersion: '0.1.0-20180226.0',
title: 'Deighton AR System',
copyright: '© 2018, Kingston Software Solutions.',
supportEmail: 'support@kss.us.com',
}