diff --git a/version.json5 b/version.json5 index 0e95d49..35e0b28 100644 --- a/version.json5 +++ b/version.json5 @@ -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: "^(?\\s*static\\s*version\\s*=\\s*')\\d+\\.\\d+\\.\\d+(?'\\s*)$", + search: "^(?\\s*version:\\s*')\\d+\\.\\d+\\.\\d+(?',\\s*)$", replace: "${begin}${major}.${minor}.${patch}${end}" }, { - search: "^(?\\s*static\\s*fullVersion\\s*=\\s*')\\d+\\.\\d+\\.\\d+-\\d+\\.\\d+(?'\\s*)$", + search: "^(?\\s*fullVersion:\\s*')\\d+\\.\\d+\\.\\d+-\\d+\\.\\d+(?',\\s*)$", replace: "${begin}${major}.${minor}.${patch}-${build}.${revision}${end}" }, { - search: "^(?\\s*static\\s*startYear\\s*=\\s*')\\d+(?'\\s*)$", - replace: "${begin}${startYear}${end}" + search: "^(?\\s*title:\\s*')[^']*(?',\\s*)$", + replace: "${begin}${title}${end}" + }, + { + search: "^(?\\s*copyright:\\s*')[^']*(?',\\s*)$", + replace: "${begin}${copyright}${end}" + }, + { + search: "^(?\\s*supportEmail:\\s*')[^']*(?',\\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}" } ] } \ No newline at end of file diff --git a/website/.env b/website/.env new file mode 100644 index 0000000..ff5808a --- /dev/null +++ b/website/.env @@ -0,0 +1 @@ +REACT_APP_TITLE=Deighton AR System \ No newline at end of file diff --git a/website/public/index.html b/website/public/index.html index 9b716cb..d7e01cd 100644 --- a/website/public/index.html +++ b/website/public/index.html @@ -1,11 +1,11 @@ - Deighton AR + %REACT_APP_TITLE% - +
diff --git a/website/src/App.js b/website/src/App.js index 03b572a..213e3b2 100644 --- a/website/src/App.js +++ b/website/src/App.js @@ -42,7 +42,7 @@ export class App extends React.Component { - {versionInfo.fullVersion} © 2018, Kingston Software Solutions. + {versionInfo.fullVersion} {versionInfo.copyright} diff --git a/website/src/version.js b/website/src/version.js index 8556afb..6aa3dbd 100644 --- a/website/src/version.js +++ b/website/src/version.js @@ -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', }