diff --git a/build/.qmake.stash b/build/.qmake.stash deleted file mode 100644 index 6cab99c..0000000 --- a/build/.qmake.stash +++ /dev/null @@ -1,24 +0,0 @@ -QMAKE_CXX.QT_COMPILER_STDCXX = 201402L -QMAKE_CXX.QMAKE_GCC_MAJOR_VERSION = 8 -QMAKE_CXX.QMAKE_GCC_MINOR_VERSION = 3 -QMAKE_CXX.QMAKE_GCC_PATCH_VERSION = 0 -QMAKE_CXX.COMPILER_MACROS = \ - QT_COMPILER_STDCXX \ - QMAKE_GCC_MAJOR_VERSION \ - QMAKE_GCC_MINOR_VERSION \ - QMAKE_GCC_PATCH_VERSION -QMAKE_CXX.INCDIRS = \ - /usr/include/c++/8 \ - /usr/include/x86_64-linux-gnu/c++/8 \ - /usr/include/c++/8/backward \ - /usr/lib/gcc/x86_64-linux-gnu/8/include \ - /usr/local/include \ - /usr/lib/gcc/x86_64-linux-gnu/8/include-fixed \ - /usr/include/x86_64-linux-gnu \ - /usr/include -QMAKE_CXX.LIBDIRS = \ - /usr/lib/gcc/x86_64-linux-gnu/8 \ - /usr/lib/x86_64-linux-gnu \ - /usr/lib \ - /lib/x86_64-linux-gnu \ - /lib diff --git a/build/information.json b/build/information.json deleted file mode 100644 index dc494ab..0000000 --- a/build/information.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "Version": "1.1.0", - "UpdateThings": "※1、程序全部重构,语言从 Python 转 C++、GUI 从 Tkinter 转 DTK、布局大改,参考了 sgb76 大佬的 Wine 运行器设计图、zty79的桌面快捷方式编辑器的参考布局\n※2、程序新增打包功能", - "Thank": "感谢 @星火应用商店 提供的 spark-webapp-runtime 运行环境\n感谢之前 @sgb76 制作的 Wine 运行器设计图以供参考,同时也参考了 @zty79 大佬的桌面快捷方式编辑器的界面布局" -} diff --git a/build/launch.sh b/build/launch.sh deleted file mode 100755 index 674905e..0000000 --- a/build/launch.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -XDG_CURRENT_DESKTOP="Deepin" -$1 -platformtheme deepin "$@" diff --git a/build/moc_predefs.h b/build/moc_predefs.h deleted file mode 100644 index 868c52f..0000000 --- a/build/moc_predefs.h +++ /dev/null @@ -1,375 +0,0 @@ -#define __DBL_MIN_EXP__ (-1021) -#define __FLT32X_MAX_EXP__ 1024 -#define __cpp_attributes 200809 -#define __UINT_LEAST16_MAX__ 0xffff -#define __ATOMIC_ACQUIRE 2 -#define __FLT128_MAX_10_EXP__ 4932 -#define __FLT_MIN__ 1.17549435082228750796873653722224568e-38F -#define __GCC_IEC_559_COMPLEX 2 -#define __UINT_LEAST8_TYPE__ unsigned char -#define __SIZEOF_FLOAT80__ 16 -#define __INTMAX_C(c) c ## L -#define __CHAR_BIT__ 8 -#define __UINT8_MAX__ 0xff -#define __WINT_MAX__ 0xffffffffU -#define __FLT32_MIN_EXP__ (-125) -#define __cpp_static_assert 200410 -#define __ORDER_LITTLE_ENDIAN__ 1234 -#define __SIZE_MAX__ 0xffffffffffffffffUL -#define __WCHAR_MAX__ 0x7fffffff -#define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_1 1 -#define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_2 1 -#define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 1 -#define __DBL_DENORM_MIN__ double(4.94065645841246544176568792868221372e-324L) -#define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8 1 -#define __GCC_ATOMIC_CHAR_LOCK_FREE 2 -#define __GCC_IEC_559 2 -#define __FLT32X_DECIMAL_DIG__ 17 -#define __FLT_EVAL_METHOD__ 0 -#define __unix__ 1 -#define __cpp_binary_literals 201304 -#define __FLT64_DECIMAL_DIG__ 17 -#define __GCC_ATOMIC_CHAR32_T_LOCK_FREE 2 -#define __x86_64 1 -#define __cpp_variadic_templates 200704 -#define __UINT_FAST64_MAX__ 0xffffffffffffffffUL -#define __SIG_ATOMIC_TYPE__ int -#define __DBL_MIN_10_EXP__ (-307) -#define __FINITE_MATH_ONLY__ 0 -#define __GNUC_PATCHLEVEL__ 0 -#define __FLT32_HAS_DENORM__ 1 -#define __UINT_FAST8_MAX__ 0xff -#define __has_include(STR) __has_include__(STR) -#define __DEC64_MAX_EXP__ 385 -#define __INT8_C(c) c -#define __INT_LEAST8_WIDTH__ 8 -#define __UINT_LEAST64_MAX__ 0xffffffffffffffffUL -#define __SHRT_MAX__ 0x7fff -#define __LDBL_MAX__ 1.18973149535723176502126385303097021e+4932L -#define __FLT64X_MAX_10_EXP__ 4932 -#define __UINT_LEAST8_MAX__ 0xff -#define __GCC_ATOMIC_BOOL_LOCK_FREE 2 -#define __FLT128_DENORM_MIN__ 6.47517511943802511092443895822764655e-4966F128 -#define __UINTMAX_TYPE__ long unsigned int -#define __linux 1 -#define __DEC32_EPSILON__ 1E-6DF -#define __FLT_EVAL_METHOD_TS_18661_3__ 0 -#define __OPTIMIZE__ 1 -#define __unix 1 -#define __UINT32_MAX__ 0xffffffffU -#define __GXX_EXPERIMENTAL_CXX0X__ 1 -#define __LDBL_MAX_EXP__ 16384 -#define __FLT128_MIN_EXP__ (-16381) -#define __WINT_MIN__ 0U -#define __linux__ 1 -#define __FLT128_MIN_10_EXP__ (-4931) -#define __INT_LEAST16_WIDTH__ 16 -#define __SCHAR_MAX__ 0x7f -#define __FLT128_MANT_DIG__ 113 -#define __WCHAR_MIN__ (-__WCHAR_MAX__ - 1) -#define __INT64_C(c) c ## L -#define __DBL_DIG__ 15 -#define __GCC_ATOMIC_POINTER_LOCK_FREE 2 -#define __FLT64X_MANT_DIG__ 64 -#define __SIZEOF_INT__ 4 -#define __SIZEOF_POINTER__ 8 -#define __GCC_ATOMIC_CHAR16_T_LOCK_FREE 2 -#define __USER_LABEL_PREFIX__ -#define __FLT64X_EPSILON__ 1.08420217248550443400745280086994171e-19F64x -#define __STDC_HOSTED__ 1 -#define __LDBL_HAS_INFINITY__ 1 -#define __FLT32_DIG__ 6 -#define __FLT_EPSILON__ 1.19209289550781250000000000000000000e-7F -#define __GXX_WEAK__ 1 -#define __SHRT_WIDTH__ 16 -#define __LDBL_MIN__ 3.36210314311209350626267781732175260e-4932L -#define __DEC32_MAX__ 9.999999E96DF -#define __cpp_threadsafe_static_init 200806 -#define __FLT64X_DENORM_MIN__ 3.64519953188247460252840593361941982e-4951F64x -#define __FLT32X_HAS_INFINITY__ 1 -#define __INT32_MAX__ 0x7fffffff -#define __INT_WIDTH__ 32 -#define __SIZEOF_LONG__ 8 -#define __STDC_IEC_559__ 1 -#define __STDC_ISO_10646__ 201706L -#define __UINT16_C(c) c -#define __PTRDIFF_WIDTH__ 64 -#define __DECIMAL_DIG__ 21 -#define __FLT64_EPSILON__ 2.22044604925031308084726333618164062e-16F64 -#define __gnu_linux__ 1 -#define __INTMAX_WIDTH__ 64 -#define __FLT64_MIN_EXP__ (-1021) -#define __has_include_next(STR) __has_include_next__(STR) -#define __FLT64X_MIN_10_EXP__ (-4931) -#define __LDBL_HAS_QUIET_NAN__ 1 -#define __FLT64_MANT_DIG__ 53 -#define __GNUC__ 8 -#define __GXX_RTTI 1 -#define __MMX__ 1 -#define __cpp_delegating_constructors 200604 -#define __FLT_HAS_DENORM__ 1 -#define __SIZEOF_LONG_DOUBLE__ 16 -#define __BIGGEST_ALIGNMENT__ 16 -#define __STDC_UTF_16__ 1 -#define __FLT64_MAX_10_EXP__ 308 -#define __FLT32_HAS_INFINITY__ 1 -#define __DBL_MAX__ double(1.79769313486231570814527423731704357e+308L) -#define __cpp_raw_strings 200710 -#define __INT_FAST32_MAX__ 0x7fffffffffffffffL -#define __DBL_HAS_INFINITY__ 1 -#define __DEC32_MIN_EXP__ (-94) -#define __INTPTR_WIDTH__ 64 -#define __FLT32X_HAS_DENORM__ 1 -#define __INT_FAST16_TYPE__ long int -#define __LDBL_HAS_DENORM__ 1 -#define __cplusplus 201103L -#define __cpp_ref_qualifiers 200710 -#define __DEC128_MAX__ 9.999999999999999999999999999999999E6144DL -#define __INT_LEAST32_MAX__ 0x7fffffff -#define __DEC32_MIN__ 1E-95DF -#define __DEPRECATED 1 -#define __cpp_rvalue_references 200610 -#define __DBL_MAX_EXP__ 1024 -#define __WCHAR_WIDTH__ 32 -#define __FLT32_MAX__ 3.40282346638528859811704183484516925e+38F32 -#define __DEC128_EPSILON__ 1E-33DL -#define __SSE2_MATH__ 1 -#define __ATOMIC_HLE_RELEASE 131072 -#define __PTRDIFF_MAX__ 0x7fffffffffffffffL -#define __amd64 1 -#define __ATOMIC_HLE_ACQUIRE 65536 -#define __FLT32_HAS_QUIET_NAN__ 1 -#define __GNUG__ 8 -#define __LONG_LONG_MAX__ 0x7fffffffffffffffLL -#define __SIZEOF_SIZE_T__ 8 -#define __cpp_rvalue_reference 200610 -#define __cpp_nsdmi 200809 -#define __FLT64X_MIN_EXP__ (-16381) -#define __SIZEOF_WINT_T__ 4 -#define __LONG_LONG_WIDTH__ 64 -#define __cpp_initializer_lists 200806 -#define __FLT32_MAX_EXP__ 128 -#define __cpp_hex_float 201603 -#define __GCC_HAVE_DWARF2_CFI_ASM 1 -#define __GXX_ABI_VERSION 1013 -#define __FLT128_HAS_INFINITY__ 1 -#define __FLT_MIN_EXP__ (-125) -#define __cpp_lambdas 200907 -#define __FLT64X_HAS_QUIET_NAN__ 1 -#define __INT_FAST64_TYPE__ long int -#define __FLT64_DENORM_MIN__ 4.94065645841246544176568792868221372e-324F64 -#define __DBL_MIN__ double(2.22507385850720138309023271733240406e-308L) -#define __LP64__ 1 -#define __FLT32X_EPSILON__ 2.22044604925031308084726333618164062e-16F32x -#define __DECIMAL_BID_FORMAT__ 1 -#define __FLT64_MIN_10_EXP__ (-307) -#define __FLT64X_DECIMAL_DIG__ 21 -#define __DEC128_MIN__ 1E-6143DL -#define __REGISTER_PREFIX__ -#define __UINT16_MAX__ 0xffff -#define __DBL_HAS_DENORM__ 1 -#define __FLT32_MIN__ 1.17549435082228750796873653722224568e-38F32 -#define __UINT8_TYPE__ unsigned char -#define __FLT_MANT_DIG__ 24 -#define __LDBL_DECIMAL_DIG__ 21 -#define __VERSION__ "8.3.0" -#define __UINT64_C(c) c ## UL -#define __cpp_unicode_characters 200704 -#define _STDC_PREDEF_H 1 -#define __GCC_ATOMIC_INT_LOCK_FREE 2 -#define __FLT128_MAX_EXP__ 16384 -#define __FLT32_MANT_DIG__ 24 -#define __FLOAT_WORD_ORDER__ __ORDER_LITTLE_ENDIAN__ -#define __STDC_IEC_559_COMPLEX__ 1 -#define __FLT128_HAS_DENORM__ 1 -#define __FLT128_DIG__ 33 -#define __SCHAR_WIDTH__ 8 -#define __INT32_C(c) c -#define __DEC64_EPSILON__ 1E-15DD -#define __ORDER_PDP_ENDIAN__ 3412 -#define __DEC128_MIN_EXP__ (-6142) -#define __FLT32_MAX_10_EXP__ 38 -#define __INT_FAST32_TYPE__ long int -#define __UINT_LEAST16_TYPE__ short unsigned int -#define __FLT64X_HAS_INFINITY__ 1 -#define unix 1 -#define __INT16_MAX__ 0x7fff -#define __cpp_rtti 199711 -#define __SIZE_TYPE__ long unsigned int -#define __UINT64_MAX__ 0xffffffffffffffffUL -#define __FLT64X_DIG__ 18 -#define __INT8_TYPE__ signed char -#define __ELF__ 1 -#define __GCC_ASM_FLAG_OUTPUTS__ 1 -#define __FLT_RADIX__ 2 -#define __INT_LEAST16_TYPE__ short int -#define __LDBL_EPSILON__ 1.08420217248550443400745280086994171e-19L -#define __UINTMAX_C(c) c ## UL -#define __GLIBCXX_BITSIZE_INT_N_0 128 -#define __k8 1 -#define __SIG_ATOMIC_MAX__ 0x7fffffff -#define __GCC_ATOMIC_WCHAR_T_LOCK_FREE 2 -#define __SIZEOF_PTRDIFF_T__ 8 -#define __FLT32X_MANT_DIG__ 53 -#define __x86_64__ 1 -#define __FLT32X_MIN_EXP__ (-1021) -#define __DEC32_SUBNORMAL_MIN__ 0.000001E-95DF -#define __INT_FAST16_MAX__ 0x7fffffffffffffffL -#define __FLT64_DIG__ 15 -#define __UINT_FAST32_MAX__ 0xffffffffffffffffUL -#define __UINT_LEAST64_TYPE__ long unsigned int -#define __FLT_HAS_QUIET_NAN__ 1 -#define __FLT_MAX_10_EXP__ 38 -#define __LONG_MAX__ 0x7fffffffffffffffL -#define __FLT64X_HAS_DENORM__ 1 -#define __DEC128_SUBNORMAL_MIN__ 0.000000000000000000000000000000001E-6143DL -#define __FLT_HAS_INFINITY__ 1 -#define __cpp_unicode_literals 200710 -#define __UINT_FAST16_TYPE__ long unsigned int -#define __DEC64_MAX__ 9.999999999999999E384DD -#define __INT_FAST32_WIDTH__ 64 -#define __CHAR16_TYPE__ short unsigned int -#define __PRAGMA_REDEFINE_EXTNAME 1 -#define __SIZE_WIDTH__ 64 -#define __SEG_FS 1 -#define __INT_LEAST16_MAX__ 0x7fff -#define __DEC64_MANT_DIG__ 16 -#define __INT64_MAX__ 0x7fffffffffffffffL -#define __UINT_LEAST32_MAX__ 0xffffffffU -#define __SEG_GS 1 -#define __FLT32_DENORM_MIN__ 1.40129846432481707092372958328991613e-45F32 -#define __GCC_ATOMIC_LONG_LOCK_FREE 2 -#define __SIG_ATOMIC_WIDTH__ 32 -#define __INT_LEAST64_TYPE__ long int -#define __INT16_TYPE__ short int -#define __INT_LEAST8_TYPE__ signed char -#define __DEC32_MAX_EXP__ 97 -#define __INT_FAST8_MAX__ 0x7f -#define __FLT128_MAX__ 1.18973149535723176508575932662800702e+4932F128 -#define __INTPTR_MAX__ 0x7fffffffffffffffL -#define linux 1 -#define __cpp_range_based_for 200907 -#define __FLT64_HAS_QUIET_NAN__ 1 -#define __FLT32_MIN_10_EXP__ (-37) -#define __SSE2__ 1 -#define __EXCEPTIONS 1 -#define __LDBL_MANT_DIG__ 64 -#define __DBL_HAS_QUIET_NAN__ 1 -#define __FLT64_HAS_INFINITY__ 1 -#define __FLT64X_MAX__ 1.18973149535723176502126385303097021e+4932F64x -#define __SIG_ATOMIC_MIN__ (-__SIG_ATOMIC_MAX__ - 1) -#define __code_model_small__ 1 -#define __k8__ 1 -#define __INTPTR_TYPE__ long int -#define __UINT16_TYPE__ short unsigned int -#define __WCHAR_TYPE__ int -#define __SIZEOF_FLOAT__ 4 -#define __UINTPTR_MAX__ 0xffffffffffffffffUL -#define __INT_FAST64_WIDTH__ 64 -#define __DEC64_MIN_EXP__ (-382) -#define __cpp_decltype 200707 -#define __FLT32_DECIMAL_DIG__ 9 -#define __INT_FAST64_MAX__ 0x7fffffffffffffffL -#define __GCC_ATOMIC_TEST_AND_SET_TRUEVAL 1 -#define __FLT_DIG__ 6 -#define __FLT64X_MAX_EXP__ 16384 -#define __UINT_FAST64_TYPE__ long unsigned int -#define __INT_MAX__ 0x7fffffff -#define __amd64__ 1 -#define __INT64_TYPE__ long int -#define __FLT_MAX_EXP__ 128 -#define __ORDER_BIG_ENDIAN__ 4321 -#define __DBL_MANT_DIG__ 53 -#define __cpp_inheriting_constructors 201511 -#define __SIZEOF_FLOAT128__ 16 -#define __INT_LEAST64_MAX__ 0x7fffffffffffffffL -#define __DEC64_MIN__ 1E-383DD -#define __WINT_TYPE__ unsigned int -#define __UINT_LEAST32_TYPE__ unsigned int -#define __SIZEOF_SHORT__ 2 -#define __SSE__ 1 -#define __LDBL_MIN_EXP__ (-16381) -#define __FLT64_MAX__ 1.79769313486231570814527423731704357e+308F64 -#define __WINT_WIDTH__ 32 -#define __INT_LEAST8_MAX__ 0x7f -#define __FLT32X_MAX_10_EXP__ 308 -#define __SIZEOF_INT128__ 16 -#define __LDBL_MAX_10_EXP__ 4932 -#define __ATOMIC_RELAXED 0 -#define __DBL_EPSILON__ double(2.22044604925031308084726333618164062e-16L) -#define __FLT128_MIN__ 3.36210314311209350626267781732175260e-4932F128 -#define _LP64 1 -#define __UINT8_C(c) c -#define __FLT64_MAX_EXP__ 1024 -#define __INT_LEAST32_TYPE__ int -#define __SIZEOF_WCHAR_T__ 4 -#define __FLT128_HAS_QUIET_NAN__ 1 -#define __INT_FAST8_TYPE__ signed char -#define __FLT64X_MIN__ 3.36210314311209350626267781732175260e-4932F64x -#define __GNUC_STDC_INLINE__ 1 -#define __FLT64_HAS_DENORM__ 1 -#define __FLT32_EPSILON__ 1.19209289550781250000000000000000000e-7F32 -#define __DBL_DECIMAL_DIG__ 17 -#define __STDC_UTF_32__ 1 -#define __INT_FAST8_WIDTH__ 8 -#define __FXSR__ 1 -#define __DEC_EVAL_METHOD__ 2 -#define __FLT32X_MAX__ 1.79769313486231570814527423731704357e+308F32x -#define __cpp_runtime_arrays 198712 -#define __UINT64_TYPE__ long unsigned int -#define __UINT32_C(c) c ## U -#define __INTMAX_MAX__ 0x7fffffffffffffffL -#define __cpp_alias_templates 200704 -#define __BYTE_ORDER__ __ORDER_LITTLE_ENDIAN__ -#define __FLT_DENORM_MIN__ 1.40129846432481707092372958328991613e-45F -#define __INT8_MAX__ 0x7f -#define __LONG_WIDTH__ 64 -#define __UINT_FAST32_TYPE__ long unsigned int -#define __CHAR32_TYPE__ unsigned int -#define __FLT_MAX__ 3.40282346638528859811704183484516925e+38F -#define __cpp_constexpr 200704 -#define __INT32_TYPE__ int -#define __SIZEOF_DOUBLE__ 8 -#define __cpp_exceptions 199711 -#define __FLT_MIN_10_EXP__ (-37) -#define __FLT64_MIN__ 2.22507385850720138309023271733240406e-308F64 -#define __INT_LEAST32_WIDTH__ 32 -#define __INTMAX_TYPE__ long int -#define __DEC128_MAX_EXP__ 6145 -#define __FLT32X_HAS_QUIET_NAN__ 1 -#define __ATOMIC_CONSUME 1 -#define __GNUC_MINOR__ 3 -#define __GLIBCXX_TYPE_INT_N_0 __int128 -#define __INT_FAST16_WIDTH__ 64 -#define __UINTMAX_MAX__ 0xffffffffffffffffUL -#define __DEC32_MANT_DIG__ 7 -#define __FLT32X_DENORM_MIN__ 4.94065645841246544176568792868221372e-324F32x -#define __DBL_MAX_10_EXP__ 308 -#define __LDBL_DENORM_MIN__ 3.64519953188247460252840593361941982e-4951L -#define __INT16_C(c) c -#define __STDC__ 1 -#define __FLT32X_DIG__ 15 -#define __PTRDIFF_TYPE__ long int -#define __ATOMIC_SEQ_CST 5 -#define __UINT32_TYPE__ unsigned int -#define __FLT32X_MIN_10_EXP__ (-307) -#define __UINTPTR_TYPE__ long unsigned int -#define __DEC64_SUBNORMAL_MIN__ 0.000000000000001E-383DD -#define __DEC128_MANT_DIG__ 34 -#define __LDBL_MIN_10_EXP__ (-4931) -#define __FLT128_EPSILON__ 1.92592994438723585305597794258492732e-34F128 -#define __SSE_MATH__ 1 -#define __SIZEOF_LONG_LONG__ 8 -#define __cpp_user_defined_literals 200809 -#define __FLT128_DECIMAL_DIG__ 36 -#define __GCC_ATOMIC_LLONG_LOCK_FREE 2 -#define __FLT32X_MIN__ 2.22507385850720138309023271733240406e-308F32x -#define __LDBL_DIG__ 18 -#define __FLT_DECIMAL_DIG__ 9 -#define __UINT_FAST16_MAX__ 0xffffffffffffffffUL -#define __GCC_ATOMIC_SHORT_LOCK_FREE 2 -#define __INT_LEAST64_WIDTH__ 64 -#define __UINT_FAST8_TYPE__ unsigned char -#define _GNU_SOURCE 1 -#define __ATOMIC_ACQ_REL 4 -#define __ATOMIC_RELEASE 3 diff --git a/build/spark-web-packer b/build/spark-web-packer deleted file mode 100755 index 5df95c6..0000000 --- a/build/spark-web-packer +++ /dev/null @@ -1,237 +0,0 @@ -#!/bin/bash -if [ "${1}" == "-h" -o "$1" == "--help" ] -then -echo "Copyright (c) 2019-2021 The Spark Project" -echo "本工具可以快速打包依赖于spark-webapp-runtime(在非UOS/deepin上是swrt-lite)web app应用" -echo -echo "This tool can pack web apps quickly with spark-webapp-runtime(swrt-lite on other distros instead of UOS/deepin)" -echo -echo 用法 -echo web-packer 链接 标题 图标路径 软件描述 软件包名 维护者 版本号 -echo 如果没有任何参数,将以交互式模式运行 -echo -echo Usage: -echo web-packer url title icon_path desciption pkgname maintainer version -echo If there are no parameters, it will run in interactive mode -exit 0 -fi - -if [ "${1}" == "-v" -o "${1}" == "--version" ];then -echo "Copyright (c) 2019-2021 The Spark Project" -echo -echo "0.1.2" -exit 0 -fi - - - -#reset -echo "Copyright (c) 2019-2021 The Spark Project" -echo 本工具可以快速打包依赖于spark-webapp-runtime(在非UOS上是swrt-lite)web app应用 -echo 本工具只能打包在线网页或本地网页,离线服务器网页等高级操作参考以下链接 -echo -echo https://gitee.com/deepin-community-store/spark-web-app-runtime/ - -cd /tmp -mkdir swrt-app-maker -cd swrt-app-maker -#工作目录应当为/tmp/swrt-maker - -while [ ! $url ] -do -if [ ! $1 ] - then - echo "没有检测任何参数,以交互式模式运行" - echo "请输入你要打包的网址(需要填写协议,比如https://spark-app.store的https://也是需要的)" - read url -else - echo "检测到url,跳过获取" - url="$1" - echo "读取到的url为:$url" -fi - -if [ ! $url ] - then - echo "没有检测到网址,请重新输入!" - sleep 3 - clear -else - echo "网址读取成功,检测是否为http/file开头" -fi - -urlstring=${url} -urlstr=${urlstring:0:4} -if [ "http" == ${urlstr} -o "file" == ${urlstr} ] -then -echo "检测到http/https/file协议,继续" -echo -else -echo "没有检测到http/https/file类型协议,请确认你填写了" -sleep 3 -unset url -clear -fi - -done - -while [ ! $title ] -do -if [ ! $2 ] - then - echo "请输入你要打包的应用标题" - echo - read title -else - echo "检测到标题,跳过获取" - title="$2" - echo "读取到的标题为:$title" -fi - -done - -while [ ! $icon ] -do -if [ ! $3 ] - then - echo "请输入你要打包的应用图标绝对路径,可以拖动图标文件到终端,只支持png" - read icon - echo -else - echo "检测到图标,跳过获取" - icon="$3" - echo "读取到的图标路径为:$icon" -fi -iconpath=`echo "$icon" | sed $'s/\'//g'` -icon=$iconpath -echo "去除可能的单引号后得到:$icon" -echo - - -#' - -done - -while [ ! $des ] -do -if [ ! $4 ] - then - echo "请输入你要打包的应用描述" - read des - echo -else - echo "检测到描述,跳过获取" - des="$4" - echo "读取到的描述为:$des" -fi - -done - -while [ ! $pkgname ] -do -if [ ! $5 ] - then - echo "请输入你要打包的应用包名(一般为web-xxxxxx,比如web-baidu.com,不能有中文或特殊符号或空格,空格用-代替)" - read pkgname - echo -else - echo "检测到包名,跳过获取" - pkgname="$5" - echo "读取到的包名为:$pkgname" -fi - -done - -while [ ! $maintainer ] -do -if [ ! $6 ] - then - echo "请输入你的昵称(这会出现在deb中)" - read maintainer - echo -else - echo "检测到维护者名,跳过获取" - maintainer="$6" - echo "读取到的维护者为:$maintainer" -fi - -done - -while [ ! $version ] -do -if [ ! "$7" -a ! "$6" ] - then - echo "请输入文件版本号,这不是必须的。如果你想要更新一个已有的应用那么请输入比1.0大的版本" - echo "如果不是,请直接输入回车,会默认填写1.0" - read version - echo - if [ ! $version ];then - version="1.0" - fi - -elif [ ! $7 -a $6 ];then -echo "在参数模式,但未检测到版本号" -echo "默认版本号为1.0" -version="1.0" - -else - echo "检测到版本号,跳过获取" - version="$7" - echo "读取到的版本号为:$version" -fi - -done - - -echo "开始生成deb包" -echo "输出的control文件为" -echo "" -echo "Package: $pkgname" -echo "Version: $version" -echo "Depends: spark-webapp-runtime(>1.5)" -echo "Maintainer: $maintainer" -echo "Description: A webapp of $url packed by $maintainer using spark webapp runtime" -echo "Architecture: amd64" -echo "-----------------------开始生成-----------------------" -mkdir DEBIAN -cd DEBIAN -touch control -echo "Package: $pkgname" >> ./control -echo "Version: $version" >> ./control -echo "Depends: spark-webapp-runtime(>=1.5)" >> ./control -echo "Maintainer: $maintainer" >> ./control -echo "Description: A webapp of $url packed by $maintainer using spark webapp runtime" >> ./control -echo "Architecture: amd64" >> ./control -cd .. -echo "-----------------------开始生成desktop-----------------------" -mkdir -p usr/share/applications -cd usr/share/applications -touch $pkgname.desktop -echo [Desktop Entry] >> $pkgname.desktop -echo Name=$title >> $pkgname.desktop -echo Exec=spark-webapp-runtime -u "$url" -i "/opt/durapps/$pkgname/icon.png" -t "$title" -d "$des" $8 >> $pkgname.desktop -echo Type=Application >> $pkgname.desktop -echo Terminal=false >> $pkgname.desktop -echo StartupNotify=true >> $pkgname.desktop -echo Encoding=UTF-8 >> $pkgname.desktop -echo Comment=$title >> $pkgname.desktop -echo Icon=/opt/durapps/$pkgname/icon.png >> $pkgname.desktop - -cat $pkgname.desktop - -echo "-----------------------开始复制icon-----------------------" -cd ../../../ -mkdir -p opt/durapps/$pkgname -cd opt/durapps/$pkgname -cp $icon ./icon.png -cd ../../ -echo "-----------------------开始打包-----------------------" -cd .. -workdir=`pwd` -echo "回退到工作目录,当前目录位于$workdir" -fakeroot dpkg -b . ../ -mv ../${pkgname}_${version}_amd64.deb ~/${pkgname}_${version}_amd64.deb -echo "-----------------------打包结束,软件包在您的用户目录-----------------------" -rm -rf /tmp/swrt-app-maker -xdg-open ~ & -echo 按下回车键退出 -exit diff --git a/build/spark-webapp-runtime-runner b/build/spark-webapp-runtime-runner deleted file mode 100755 index 7ad0818..0000000 Binary files a/build/spark-webapp-runtime-runner and /dev/null differ diff --git a/deb/opt/apps/spark-webapp-runtime-runner/entries/applications/spark-webapp-runtime_运行器.desktop b/deb/opt/apps/spark-webapp-runtime-runner/entries/applications/spark-webapp-runtime_运行器.desktop new file mode 100644 index 0000000..209cdd9 --- /dev/null +++ b/deb/opt/apps/spark-webapp-runtime-runner/entries/applications/spark-webapp-runtime_运行器.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=spark-webapp-runtime 运行器 +Version=1.0.2 +Exec=/usr/bin/spark-webapp-runtime-runner +Icon=/usr/share/icons/hicolor/256x256/apps/spark-webapp-runtime-runner.png +Type=Application +Terminal=false +StartupNotify=true +Encoding=UTF-8 +Categories=Network; diff --git a/deb/opt/apps/spark-webapp-runtime-runner/spark-web-packer b/deb/opt/apps/spark-webapp-runtime-runner/spark-web-packer index 5df95c6..9a5d868 100755 --- a/deb/opt/apps/spark-webapp-runtime-runner/spark-web-packer +++ b/deb/opt/apps/spark-webapp-runtime-runner/spark-web-packer @@ -190,7 +190,7 @@ echo "Version: $version" echo "Depends: spark-webapp-runtime(>1.5)" echo "Maintainer: $maintainer" echo "Description: A webapp of $url packed by $maintainer using spark webapp runtime" -echo "Architecture: amd64" +echo "Architecture: all" echo "-----------------------开始生成-----------------------" mkdir DEBIAN cd DEBIAN @@ -234,4 +234,5 @@ echo "-----------------------打包结束,软件包在您的用户目录------ rm -rf /tmp/swrt-app-maker xdg-open ~ & echo 按下回车键退出 +read exit diff --git a/deb/opt/apps/spark-webapp-runtime-runner/spark-webapp-runtime-runner b/deb/opt/apps/spark-webapp-runtime-runner/spark-webapp-runtime-runner index 7ad0818..1d44963 100755 Binary files a/deb/opt/apps/spark-webapp-runtime-runner/spark-webapp-runtime-runner and b/deb/opt/apps/spark-webapp-runtime-runner/spark-webapp-runtime-runner differ diff --git a/information.json b/information.json index dc494ab..b7754b6 100644 --- a/information.json +++ b/information.json @@ -1,5 +1,5 @@ { - "Version": "1.1.0", + "Version": "1.1.1", "UpdateThings": "※1、程序全部重构,语言从 Python 转 C++、GUI 从 Tkinter 转 DTK、布局大改,参考了 sgb76 大佬的 Wine 运行器设计图、zty79的桌面快捷方式编辑器的参考布局\n※2、程序新增打包功能", "Thank": "感谢 @星火应用商店 提供的 spark-webapp-runtime 运行环境\n感谢之前 @sgb76 制作的 Wine 运行器设计图以供参考,同时也参考了 @zty79 大佬的桌面快捷方式编辑器的界面布局" } diff --git a/spark-web-packer b/spark-web-packer index 5df95c6..9a5d868 100755 --- a/spark-web-packer +++ b/spark-web-packer @@ -190,7 +190,7 @@ echo "Version: $version" echo "Depends: spark-webapp-runtime(>1.5)" echo "Maintainer: $maintainer" echo "Description: A webapp of $url packed by $maintainer using spark webapp runtime" -echo "Architecture: amd64" +echo "Architecture: all" echo "-----------------------开始生成-----------------------" mkdir DEBIAN cd DEBIAN @@ -234,4 +234,5 @@ echo "-----------------------打包结束,软件包在您的用户目录------ rm -rf /tmp/swrt-app-maker xdg-open ~ & echo 按下回车键退出 +read exit diff --git a/spark-webapp-runtime-runner.deb b/spark-webapp-runtime-runner.deb deleted file mode 100644 index 764a914..0000000 Binary files a/spark-webapp-runtime-runner.deb and /dev/null differ diff --git a/widget.cpp b/widget.cpp index ef3a10a..60fa298 100644 --- a/widget.cpp +++ b/widget.cpp @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include #include #include @@ -141,9 +141,13 @@ void Widget::on_pushButton_5_clicked() void Widget::on_moreBuild_clicked() { - QString package = DInputDialog::getText(this, "输入信息", "请输入要打包的包名:"); - QString maker = DInputDialog::getText(this, "输入信息", "请输入要打包的维护者:"); - QString version = DInputDialog::getText(this, "输入信息", "请输入要打包的版本号:"); + if(!QFile::exists(QCoreApplication::applicationDirPath() + "/spark-web-packer") | !QFile::exists(QCoreApplication::applicationDirPath() + "/launch.sh")){ + QMessageBox::critical(this, "错误", "无法读取脚本文件"); + return; + } + QString package = QInputDialog::getText(this, "输入信息", "请输入要打包的包名:"); + QString maker = QInputDialog::getText(this, "输入信息", "请输入要打包的维护者:"); + QString version = QInputDialog::getText(this, "输入信息", "请输入要打包的版本号:"); QString informationList[3] = {package, maker, version}; for (int i = 0; i < 3; i++) { if(informationList[i] == "") { @@ -153,6 +157,7 @@ void Widget::on_moreBuild_clicked() } QProcess process; QStringList command; - command << "deepin-terminal" << "-e" << QCoreApplication::applicationDirPath() + "/spark-web-packer" << ui->openUrl->text() << ui->openTitle->text() << iconPath << ui->openShowThings->text() << package << maker << version << ui->openOtherOption->text(); + //command << "deepin-terminal" << "--keep-open" << "-C" << "\"" + QCoreApplication::applicationDirPath() + "/spark-web-packer\" \"" + ui->openUrl->text() + "\" \"" + ui->openTitle->text() + "\" \"" + iconPath + "\" \"" + ui->openShowThings->text() + "\" \"" + package + "\" \"" + maker + "\" \"" + version + "\" \"" + ui->openOtherOption->text() + "\""; + command << "deepin-terminal" << "--keep-open" << "-e" << QCoreApplication::applicationDirPath() + "/spark-web-packer" << ui->openUrl->text() << ui->openTitle->text() << iconPath << ui->openShowThings->text() << package << maker << version << ui->openOtherOption->text(); process.startDetached(QCoreApplication::applicationDirPath() + "/launch.sh", command); }