v3.4
-added the conf open option to the file menu. -added /installers to the git ignore file so the large installer files don't get included in the git repo. -the build script will no longer include libc because it doesn't need it and having it was causing seg faults on the deployed app. -releasing to main.
This commit is contained in:
parent
553585e275
commit
33519acf7a
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -30,6 +30,7 @@ Makefile*
|
||||||
*build-*
|
*build-*
|
||||||
/build
|
/build
|
||||||
/app_dir
|
/app_dir
|
||||||
|
/installers
|
||||||
/release
|
/release
|
||||||
/debug
|
/debug
|
||||||
|
|
||||||
|
|
2
build.py
2
build.py
|
@ -108,7 +108,7 @@ def linux_build_app_dir(app_ver, app_name, app_target, qt_bin):
|
||||||
os.remove("/tmp/" + app_target)
|
os.remove("/tmp/" + app_target)
|
||||||
|
|
||||||
for line in lines:
|
for line in lines:
|
||||||
if " => " in line:
|
if " => " in line and "libc" not in line:
|
||||||
#if ("libQt" in line) or ("libicu" in line) or ("libGL.so" in line) or ("libpcre16.so" in line) or ("libpcre.so" in line):
|
#if ("libQt" in line) or ("libicu" in line) or ("libGL.so" in line) or ("libpcre16.so" in line) or ("libpcre.so" in line):
|
||||||
if " (0x0" in line:
|
if " (0x0" in line:
|
||||||
start_index = line.index("> ") + 2
|
start_index = line.index("> ") + 2
|
||||||
|
|
|
@ -158,7 +158,7 @@ def make_install(app_ver, app_name):
|
||||||
print("adding file: " + file)
|
print("adding file: " + file)
|
||||||
zip_file.write(file)
|
zip_file.write(file)
|
||||||
|
|
||||||
text_sub_copy_file(__file__, path, "main(is_sfx=False)", "main(is_sfx=True)\n\n\n", 10728)
|
text_sub_copy_file(__file__, path, "main(is_sfx=False)", "main(is_sfx=True)\n\n\n", 10322)
|
||||||
|
|
||||||
with open(path, "a") as dst_file, open("app_dir.zip", "rb") as src_file:
|
with open(path, "a") as dst_file, open("app_dir.zip", "rb") as src_file:
|
||||||
print("Packing the compressed app_dir into the sfx script file --")
|
print("Packing the compressed app_dir into the sfx script file --")
|
||||||
|
|
File diff suppressed because one or more lines are too long
|
@ -30,7 +30,7 @@
|
||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
|
|
||||||
#define APP_VERSION "3.4.t4"
|
#define APP_VERSION "3.4"
|
||||||
#define APP_NAME "JustMotion"
|
#define APP_NAME "JustMotion"
|
||||||
#define APP_TARGET "jmotion"
|
#define APP_TARGET "jmotion"
|
||||||
#define DATETIME_FMT "yyyyMMddhhmmss"
|
#define DATETIME_FMT "yyyyMMddhhmmss"
|
||||||
|
|
Loading…
Reference in New Issue
Block a user