diff --git a/build.conf b/bin/build.conf similarity index 100% rename from build.conf rename to bin/build.conf diff --git a/bin/pack.sh b/bin/pack.sh new file mode 100755 index 000000000..aae68c4f5 --- /dev/null +++ b/bin/pack.sh @@ -0,0 +1,41 @@ +#! /bin/sh +# tar wechat-dev-tools + +cd `dirname $0`/.. + +cur_dir=$(pwd) + +. "$cur_dir/bin/build.conf" + +tmp_dir="$cur_dir/.tmp" +dist_dir="$cur_dir/dist" + +nwjs_file="$tmp_dir/nwjs-v$nwjs_v.tar.gz" +nwjs_dir="$tmp_dir/nwjs-sdk-v${nwjs_v}-linux-x64" +nwjs_download="https://dl.nwjs.io/v$nwjs_v/nwjs-sdk-v${nwjs_v}-linux-x64.tar.gz" + +dist_wechat_dir="wechat-dev-tools-xsp" +dist_wechat_package="wechat-v${wechat_v}-nwjs-v${nwjs_v}.tar.gz" + + +mkdir -p $tmp_dir +if [ ! -d "$nwjs_dir" ]; then + if [ ! -f "$nwjs_file" ]; then + wget "$nwjs_download" -O $nwjs_file + $? -ne 0 && exit "$?" + fi + + tar -xf $nwjs_file -C $tmp_dir + $? -ne 0 && exit "$?" + cd "$nwjs_dir/locales" || exit "$?" + rm $(ls -I "zh*" -I "en*" ) + cd "$cur_dir" +fi + +rm -rf $cur_dir/dist +mkdir -p $cur_dir/dist +cp -r "$nwjs_dir"/* "$cur_dir/package.nw" "$cur_dir/scripts" "$cur_dir/dist" + +mkdir -p $tmp_dir/build + +tar -zcvf "$tmp_dir/build/$dist_wechat_package" -C "$cur_dir" dist diff --git a/pack.sh b/pack.sh deleted file mode 100755 index 76d503d16..000000000 --- a/pack.sh +++ /dev/null @@ -1,44 +0,0 @@ -#! /bin/sh -# tar wechat-dev-tools - -cd `dirname $0` -cur_dir=$(pwd) -. "$cur_dir/build.conf" - -package_dir="$cur_dir/package.nw" -tmp_dir="$cur_dir/.tmp" -build_dir="$cur_dir/dist" - -nwjs_file="$tmp_dir/nwjs-v$nwjs_v.tar.gz" -nwjs_dir="$tmp_dir/nwjs-sdk-v${nwjs_v}-linux-x64" -nwjs_download="https://dl.nwjs.io/v$nwjs_v/nwjs-sdk-v${nwjs_v}-linux-x64.tar.gz" - -dist_wechat_dir="wechat-dev-tools-xsp" -dist_wechat_package="$tmp_dir/wechat-v${wechat_v}-nwjs-v${nwjs_v}.tar.gz" - - -mkdir -p $tmp_dir -if [ ! -d "$nwjs_dir" ]; then - if [ ! -f "$nwjs_file" ]; then - wget "$nwjs_download" -O $nwjs_file - $? -ne 0 && exit "$?" - fi - - tar -xf $nwjs_file -C $tmp_dir - $? -ne 0 && exit "$?" - cd "$nwjs_dir/locales" || exit "$?" - rm $(ls -I "zh*" -I "en*" ) - cd "$cur_dir" -fi - -rm -rf $tmp_dir/$dist_wechat_dir -mkdir -p $tmp_dir/$dist_wechat_dir -cp -rl "$nwjs_dir"/* "$tmp_dir/$dist_wechat_dir" && -cp -rl "$package_dir" "$tmp_dir/$dist_wechat_dir" && -cp -rl "$cur_dir/WeappVendor" "$tmp_dir/$dist_wechat_dir" && -cp -rl "$cur_dir/bin/install.sh" "$tmp_dir/$dist_wechat_dir" && -tar -zcvf "$dist_wechat_package" -C "$tmp_dir" "$dist_wechat_dir" - -mkdir -p $build_dir -mv -f "$dist_wechat_package" "$build_dir" - diff --git a/WeappVendor/wcc.exe b/scripts/WeappVendor/wcc.exe similarity index 100% rename from WeappVendor/wcc.exe rename to scripts/WeappVendor/wcc.exe diff --git a/WeappVendor/wcsc.exe b/scripts/WeappVendor/wcsc.exe similarity index 100% rename from WeappVendor/wcsc.exe rename to scripts/WeappVendor/wcsc.exe diff --git a/bin/install.sh b/scripts/install.sh similarity index 100% rename from bin/install.sh rename to scripts/install.sh diff --git a/wechat-web-devtools.desktop b/scripts/wechat-web-devtools.desktop similarity index 100% rename from wechat-web-devtools.desktop rename to scripts/wechat-web-devtools.desktop