diff --git a/jenkins/create_build.sh b/jenkins/create_build.sh index 3dd53a4..e50c692 100755 --- a/jenkins/create_build.sh +++ b/jenkins/create_build.sh @@ -58,7 +58,7 @@ function compile_native() { [[ ! -z "$traroot_library" ]] && _arguments="${_arguments} -DLIBRARY_PATH=\"$traroot_library\"" local _generator="" - [[ ${build_oy_type} ]] && _generator='-G"Visual Studio 15 2017 Win64"' + [[ ${build_oy_type} == "win32" ]] && _generator='-G"Visual Studio 15 2017 Win64"' _command="cmake ../../ ${_generator} -DCMAKE_BUILD_TYPE=RelWithDebInfo ${_arguments}" echo "Executing cmake command $_command" diff --git a/modules/crash_handler/ui/index.css b/modules/crash_handler/ui/index.css index 7aa00b5..6558a75 100644 --- a/modules/crash_handler/ui/index.css +++ b/modules/crash_handler/ui/index.css @@ -3,32 +3,40 @@ body { min-width: 750px; display: flex; flex-direction: row; - justify-content: center; } + justify-content: center; +} .container .container-header { display: flex; flex-direction: row; justify-content: center; - width: fit-content; } - .container .container-header > * { - flex-shrink: 0; } - .container .container-header img { - vertical-align: middle; - display: inline-block; - width: 128px; - height: 128px; } - .container .container-header .text { - margin-left: 20px; - display: inline-block; - text-align: left; - align-self: center; } - .container .container-header .text h1 { - color: darkred; - margin-bottom: 0; } - .container .container-header .text h2 { - font-size: 1.25em; - margin-top: .2em; } + width: fit-content; +} +.container .container-header > * { + flex-shrink: 0; +} +.container .container-header img { + vertical-align: middle; + display: inline-block; + width: 128px; + height: 128px; +} +.container .container-header .text { + margin-left: 20px; + display: inline-block; + text-align: left; + align-self: center; +} +.container .container-header .text h1 { + color: darkred; + margin-bottom: 0; +} +.container .container-header .text h2 { + font-size: 1.25em; + margin-top: 0.2em; +} .container .error-dump { - color: red; } + color: red; +} /*# sourceMappingURL=index.css.map */ diff --git a/modules/crash_handler/ui/index.css.map b/modules/crash_handler/ui/index.css.map index ae91ccd..fd28355 100644 --- a/modules/crash_handler/ui/index.css.map +++ b/modules/crash_handler/ui/index.css.map @@ -1,7 +1 @@ -{ -"version": 3, -"mappings": "AAAA,IAAK;EACJ,gBAAgB,EAAE,IAAI;EACtB,SAAS,EAAE,KAAK;EAEhB,OAAO,EAAE,IAAI;EACb,cAAc,EAAE,GAAG;EACnB,eAAe,EAAE,MAAM;;AAIvB,4BAAkB;EACjB,OAAO,EAAE,IAAI;EACb,cAAc,EAAE,GAAG;EACnB,eAAe,EAAE,MAAM;EACvB,KAAK,EAAE,WAAW;EAElB,gCAAI;IACH,WAAW,EAAE,CAAC;EAGf,gCAAI;IACH,cAAc,EAAE,MAAM;IACtB,OAAO,EAAE,YAAY;IAErB,KAAK,EAAE,KAAK;IACZ,MAAM,EAAE,KAAK;EAGd,kCAAM;IACL,WAAW,EAAE,IAAI;IAEjB,OAAO,EAAE,YAAY;IACrB,UAAU,EAAE,IAAI;IAChB,UAAU,EAAE,MAAM;IAElB,qCAAG;MACF,KAAK,EAAE,OAAO;MACd,aAAa,EAAE,CAAC;IAGjB,qCAAG;MACF,SAAS,EAAE,MAAM;MACjB,UAAU,EAAE,IAAI;AAKnB,sBAAY;EACX,KAAK,EAAE,GAAG", -"sources": ["index.scss"], -"names": [], -"file": "index.css" -} \ No newline at end of file +{"version":3,"sourceRoot":"","sources":["index.scss"],"names":[],"mappings":"AAAA;EACC;EACA;EAEA;EACA;EACA;;;AAIA;EACC;EACA;EACA;EACA;;AAEA;EACC;;AAGD;EACC;EACA;EAEA;EACA;;AAGD;EACC;EAEA;EACA;EACA;;AAEA;EACC;EACA;;AAGD;EACC;EACA;;AAKH;EACC","file":"index.css"} \ No newline at end of file diff --git a/package.json b/package.json index d925a8c..b581b23 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,10 @@ "aws-sign2": "^0.7.0", "aws4": "^1.8.0", "electron": "5.0.6", + "electron-installer-windows": "^1.1.1", "electron-rebuild": "^1.8.5", + "electron-winstaller": "^2.7.0", + "electron-wix-msi": "^2.1.1", "extend": "^3.0.2", "extsprintf": "^1.4.0", "fs-extra": "^8.1.0", @@ -60,6 +63,8 @@ "only": "0.0.2", "psl": "^1.2.0", "pure-uuid": "^1.5.7", + "rc": "^1.2.8", + "rcedit": "^1.1.2", "request": "^2.47.1", "request-progress": "^3.0.0", "request-promise": "^4.2.4",