Some small changes
This commit is contained in:
WolverinDEV
parent
9f9a2874ba
commit
ab7eab5f51
|
|
@ -31,7 +31,7 @@ if(!pkg.dependencies['electron']) {
|
|||
|
||||
options["version-string"] = {
|
||||
'CompanyName': 'TeaSpeak',
|
||||
'LegalCopyright': '© 2018-2019 Markus Hadenfeldt All Rights Reserved',
|
||||
'LegalCopyright': '© 2018-2020 Markus Hadenfeldt All Rights Reserved',
|
||||
'FileDescription' : 'TeaSpeak-Client',
|
||||
'OriginalFilename' : 'TeaClient.exe',
|
||||
'FileVersion' : pkg.version,
|
||||
|
|
@ -284,7 +284,7 @@ interface UIVersion {
|
|||
}
|
||||
|
||||
async function create_default_ui_pack(target_directory: string) {
|
||||
const remote_url = "https://clientapi.teaspeak.de/";
|
||||
const remote_url = "http://clientapi.teaspeak.dev/";
|
||||
const channel = "release";
|
||||
|
||||
const file = path_helper.join(target_directory, "default_ui.tar.gz");
|
||||
|
|
|
|||
|
|
@ -72,7 +72,7 @@ export async function pack_info(src: string) : Promise<any> {
|
|||
const appPackageJSONPath = path.join(src, 'resources/app/package.json');
|
||||
|
||||
if(await fs.pathExists(appAsarPath))
|
||||
return JSON.parse(asar.extractFile(appAsarPath, "package.json"));
|
||||
return JSON.parse(asar.extractFile(appAsarPath, "package.json").toString());
|
||||
else
|
||||
return await fs.readJson(appPackageJSONPath);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ let options = {
|
|||
description: "TeaClient by TeaSpeak",
|
||||
version: undefined,
|
||||
homepage: "https://teaspeak.de",
|
||||
maintainer: "WolverinDEV <client@teaspeak.de>",
|
||||
maintainer: "WolverinDEV <client.support@teaspeak.de>",
|
||||
|
||||
icon: 'resources/logo.svg',
|
||||
categories: [
|
||||
|
|
|
|||
|
|
@ -19,8 +19,8 @@ function install_npm() {
|
|||
|
||||
function compile_scripts() {
|
||||
begin_task "${project_name}_tsc_sass" "Compiling TypeScript & SASS"
|
||||
./build_declarations.sh
|
||||
check_err_exit ${project_name} "Failed to build shared ui import declarations!"
|
||||
#./build_declarations.sh
|
||||
#check_err_exit ${project_name} "Failed to build shared ui import declarations!"
|
||||
|
||||
npm run compile-tsc -- -p modules/tsconfig_main.json
|
||||
check_err_exit ${project_name} "Failed to compile typescript main files!"
|
||||
|
|
@ -54,9 +54,9 @@ function compile_native() {
|
|||
check_err_exit ${project_name} "Failed to enter build directory!"
|
||||
|
||||
local _arguments=""
|
||||
[[ ! -z "$tearoot_cmake_module" ]] && _arguments="${_arguments} -DCMAKE_MODULE_PATH=\"$tearoot_cmake_module\""
|
||||
[[ ! -z "$tearoot_cmake_config" ]] && _arguments="${_arguments} -DCMAKE_PLATFORM_INCLUDE=\"$tearoot_cmake_config\""
|
||||
[[ ! -z "$traroot_library" ]] && _arguments="${_arguments} -DLIBRARY_PATH=\"$traroot_library\""
|
||||
[[ -n "$tearoot_cmake_module" ]] && _arguments="${_arguments} -DCMAKE_MODULE_PATH=\"$tearoot_cmake_module\""
|
||||
[[ -n "$tearoot_cmake_config" ]] && _arguments="${_arguments} -DCMAKE_PLATFORM_INCLUDE=\"$tearoot_cmake_config\""
|
||||
[[ -n "$traroot_library" ]] && _arguments="${_arguments} -DLIBRARY_PATH=\"$traroot_library\""
|
||||
|
||||
local _cmake_generator=""
|
||||
[[ -n "${build_cmake_generator}" ]] && _cmake_generator="${build_cmake_generator}"
|
||||
|
|
@ -121,6 +121,6 @@ function deploy_client() {
|
|||
|
||||
#install_npm
|
||||
#compile_scripts
|
||||
compile_native
|
||||
package_client
|
||||
#compile_native
|
||||
#package_client
|
||||
deploy_client
|
||||
|
|
|
|||
|
|
@ -104,7 +104,7 @@ function spawn_main_window(entry_point: string) {
|
|||
});
|
||||
}
|
||||
|
||||
function handle_uo_load_error(message: string) {
|
||||
function handle_ui_load_error(message: string) {
|
||||
console.log("Caught loading error: %s", message);
|
||||
//"A critical error happened while loading TeaClient!", "A critical error happened while loading TeaClient!<br>" + message
|
||||
reference_app();
|
||||
|
|
@ -195,8 +195,8 @@ export function execute() {
|
|||
if(entry_point) //has not been canceled
|
||||
spawn_main_window(entry_point);
|
||||
else {
|
||||
console.warn("Missing entry point!");
|
||||
handle_ui_load_error("Missing UI entry point");
|
||||
}
|
||||
unreference_app();
|
||||
}).catch(handle_uo_load_error);
|
||||
}).catch(handle_ui_load_error);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -776,4 +776,4 @@ Navigation.prototype.goToTabByWebviewId = function(id){
|
|||
/**
|
||||
* MODULE EXPORTS
|
||||
*/
|
||||
module.exports = Navigation;
|
||||
export = Navigation;
|
||||
|
|
@ -3,7 +3,13 @@
|
|||
"module": "commonjs",
|
||||
"target": "es6",
|
||||
"sourceMap": true,
|
||||
"moduleResolution": "node"
|
||||
"moduleResolution": "node",
|
||||
|
||||
"baseUrl": "..",
|
||||
"paths": {
|
||||
"tc-shared/*": ["imports/shared-app/*"],
|
||||
"tc-loader": ["imports/loader"]
|
||||
}
|
||||
},
|
||||
"include": [
|
||||
"./renderer",
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
36
package.json
36
package.json
|
|
@ -30,48 +30,49 @@
|
|||
"devDependencies": {
|
||||
"@types/ejs": "^2.6.3",
|
||||
"@types/electron-packager": "8.7.2",
|
||||
"@types/fs-extra": "^8.0.1",
|
||||
"@types/jquery": "^3.3.31",
|
||||
"@types/fs-extra": "^8.1.0",
|
||||
"@types/jquery": "^3.3.34",
|
||||
"@types/node": "12.12.6",
|
||||
"@types/request": "^2.48.3",
|
||||
"@types/request-promise": "^4.1.44",
|
||||
"@types/tar-stream": "^1.6.1",
|
||||
"asar": "^2.0.1",
|
||||
"@types/request-promise": "^4.1.46",
|
||||
"@types/tar-stream": "^1.6.2",
|
||||
"asar": "^2.1.0",
|
||||
"cmake-js": "^4.0.1",
|
||||
"ejs": "^2.7.1",
|
||||
"electron-installer-windows": "^1.1.0",
|
||||
"electron-installer-windows": "^1.1.1",
|
||||
"electron-packager": "8.7.2",
|
||||
"electron-winstaller": "^2.7.0",
|
||||
"electron-wix-msi": "^2.1.1",
|
||||
"electron-wix-msi": "^2.2.0",
|
||||
"nodemon": "^1.19.4",
|
||||
"platform-dependent-modules": "0.0.14",
|
||||
"rc": "^1.2.8",
|
||||
"rcedit": "^1.1.1",
|
||||
"sass": "^1.23.2",
|
||||
"typescript": "^3.7.2"
|
||||
"rcedit": "^1.1.2",
|
||||
"sass": "^1.26.3",
|
||||
"typescript": "^3.8.3"
|
||||
},
|
||||
"dependencies": {
|
||||
"@types/minimist": "^1.2.0",
|
||||
"@types/ssh2": "^0.5.40",
|
||||
"@types/ssh2": "^0.5.42",
|
||||
"argparse": "^1.0.10",
|
||||
"asn1": "^0.2.4",
|
||||
"assert-plus": "^1.0.0",
|
||||
"aws-sign2": "^0.7.0",
|
||||
"aws4": "^1.8.0",
|
||||
"electron": "8.0.0",
|
||||
"electron-rebuild": "^1.8.6",
|
||||
"electron-rebuild": "^1.10.1",
|
||||
"extend": "^3.0.2",
|
||||
"extsprintf": "^1.4.0",
|
||||
"fs-extra": "^9.0.0",
|
||||
"http-signature": "^1.3.1",
|
||||
"http-signature": "^1.3.4",
|
||||
"jquery": "^3.4.1",
|
||||
"json-stringify-safe": "^5.0.1",
|
||||
"jsprim": "^2.0.0",
|
||||
"jsrender": "^1.0.5",
|
||||
"jsrender": "^1.0.6",
|
||||
"moment": "latest",
|
||||
"nan": "^2.14.0",
|
||||
"node-ssh": "^6.0.0",
|
||||
"only": "0.0.2",
|
||||
"psl": "^1.4.0",
|
||||
"psl": "^1.8.0",
|
||||
"pure-uuid": "^1.5.7",
|
||||
"request": "^2.88.2",
|
||||
"request-progress": "^3.0.0",
|
||||
|
|
@ -79,10 +80,9 @@
|
|||
"safe-buffer": "^5.2.0",
|
||||
"safer-buffer": "^2.1.2",
|
||||
"sshpk": "^1.16.1",
|
||||
"tar-stream": "^2.1.0",
|
||||
"tar-stream": "^2.1.2",
|
||||
"tough-cookie": "^3.0.1",
|
||||
"v8-callsites": "latest",
|
||||
"moment": "latest"
|
||||
"v8-callsites": "latest"
|
||||
},
|
||||
"config": {
|
||||
"platformDependentModules": {
|
||||
|
|
|
|||
Loading…
Reference in New Issue