Update build scripts

Make compiler happy.
This commit is contained in:
Tindy X 2020-05-29 19:36:18 +08:00
parent f30b3c7cbf
commit 09e13adaeb
No known key found for this signature in database
GPG Key ID: C6AD413169968D58
5 changed files with 12 additions and 12 deletions

View File

@ -8,7 +8,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Build
run: docker run --rm -v $GITHUB_WORKSPACE:/root/workdir multiarch/alpine:x86-edge /bin/sh -c "apk add bash git && cd /root/workdir && chmod +x scripts/build.alpine.release.sh && bash scripts/build.alpine.release.sh"
run: docker run --rm -v $GITHUB_WORKSPACE:/root/workdir multiarch/alpine:x86-v3.11 /bin/sh -c "apk add bash git && cd /root/workdir && chmod +x scripts/build.alpine.release.sh && bash scripts/build.alpine.release.sh"
- name: Upload
uses: actions/upload-artifact@v1
with:
@ -21,7 +21,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Build
run: docker run -v $GITHUB_WORKSPACE:/root/workdir multiarch/alpine:amd64-edge /bin/sh -c "apk add bash git && cd /root/workdir && chmod +x scripts/build.alpine.release.sh && bash scripts/build.alpine.release.sh"
run: docker run -v $GITHUB_WORKSPACE:/root/workdir multiarch/alpine:amd64-v3.11 /bin/sh -c "apk add bash git && cd /root/workdir && chmod +x scripts/build.alpine.release.sh && bash scripts/build.alpine.release.sh"
- name: Upload
uses: actions/upload-artifact@v1
with:

View File

@ -26,7 +26,7 @@ jobs:
- name: "Linux x86 Build"
services: docker
script:
- docker run --rm -v $TRAVIS_BUILD_DIR:/root/workdir multiarch/alpine:x86-edge /bin/sh -c "apk add bash git && cd /root/workdir && chmod +x scripts/build.alpine.release.sh && bash scripts/build.alpine.release.sh"
- docker run --rm -v $TRAVIS_BUILD_DIR:/root/workdir multiarch/alpine:x86-v3.11 /bin/sh -c "apk add bash git && cd /root/workdir && chmod +x scripts/build.alpine.release.sh && bash scripts/build.alpine.release.sh"
before_deploy:
- tar czf subconverter_linux32.tar.gz subconverter/
deploy:
@ -40,7 +40,7 @@ jobs:
- name: "Linux x86_64 Build"
services: docker
script:
- docker run -v $TRAVIS_BUILD_DIR:/root/workdir multiarch/alpine:amd64-edge /bin/sh -c "apk add bash git && cd /root/workdir && chmod +x scripts/build.alpine.release.sh && bash scripts/build.alpine.release.sh"
- docker run -v $TRAVIS_BUILD_DIR:/root/workdir multiarch/alpine:amd64-v3.11 /bin/sh -c "apk add bash git && cd /root/workdir && chmod +x scripts/build.alpine.release.sh && bash scripts/build.alpine.release.sh"
before_deploy:
- tar czf subconverter_linux64.tar.gz subconverter/
deploy:
@ -55,7 +55,7 @@ jobs:
services: docker
arch: arm64
script:
- docker run --rm -v $TRAVIS_BUILD_DIR:/root/workdir multiarch/alpine:armhf-edge /bin/sh -c "apk add bash git && cd /root/workdir && chmod +x scripts/build.alpine.release.sh && bash scripts/build.alpine.release.sh"
- docker run --rm -v $TRAVIS_BUILD_DIR:/root/workdir multiarch/alpine:armhf-v3.11 /bin/sh -c "apk add bash git && cd /root/workdir && chmod +x scripts/build.alpine.release.sh && bash scripts/build.alpine.release.sh"
before_deploy:
- tar czf subconverter_armhf.tar.gz subconverter/
deploy:
@ -70,7 +70,7 @@ jobs:
services: docker
arch: arm64
script:
- docker run -v $TRAVIS_BUILD_DIR:/root/workdir multiarch/alpine:aarch64-edge /bin/sh -c "apk add bash git && cd /root/workdir && chmod +x scripts/build.alpine.release.sh && bash scripts/build.alpine.release.sh"
- docker run -v $TRAVIS_BUILD_DIR:/root/workdir multiarch/alpine:aarch64-v3.11 /bin/sh -c "apk add bash git && cd /root/workdir && chmod +x scripts/build.alpine.release.sh && bash scripts/build.alpine.release.sh"
before_deploy:
- tar czf subconverter_aarch64.tar.gz subconverter/
deploy:

View File

@ -3,10 +3,10 @@ find_path(DUKTAPE_INCLUDE_DIRS duktape.h)
find_library(DUKTAPE_LIBRARY duktape)
find_library(DUKTAPE_MODULE_LIBRARY duktape_module)
set(DUKTAPE_LIBRARIES "${DUKTAPE_LIBRARY} ${DUKTAPE_MODULE_LIBRARY}")
set(DUKTAPE_LIBRARIES "${DUKTAPE_LIBRARY}" "${DUKTAPE_MODULE_LIBRARY}")
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(DUKTAPE DEFAULT_MSG
DUKTAPE_INCLUDE_DIRS DUKTAPE_LIBRARY DUKTAPE_MODULE_LIBRARY)
mark_as_advanced(DUKTAPE_INCLUDE_DIRS DUKTAPE_LIBRARY)
mark_as_advanced(DUKTAPE_INCLUDE_DIRS DUKTAPE_LIBRARY DUKTAPE_MODULE_LIBRARY)

View File

@ -26,9 +26,9 @@ cc -c -O3 -o duktape.o duktape.c
cc -c -O3 -o duk_module_node.o -I. ../extras/module-node/duk_module_node.c
ar cr libduktape.a duktape.o
ar cr libduktape_module.a duk_module_node.o
install -m0644 *.a /usr/lib
install -m0644 duk*.h /usr/include
install -m0644 ../extras/module-node/duk_module_node.h /usr/include
install -m0644 *.a /usr/local/lib
install -m0644 duk*.h /usr/local/include
install -m0644 ../extras/module-node/duk_module_node.h /usr/local/include
cd ../../..
cp curl/lib/libcurl.a .

View File

@ -1840,7 +1840,7 @@ std::string surgeConfToClash(RESPONSE_CALLBACK_ARGS)
return "No nodes were found!";
}
extra_settings ext = {true, true, dummy_str_array, dummy_str_array, false, false, false, false, do_sort, filter_deprecated, clash_use_new_field_name, false, "", "", ""};
extra_settings ext = {true, true, dummy_str_array, dummy_str_array, false, false, false, false, do_sort, filter_deprecated, clash_use_new_field_name, false, "", "", "", ""};
netchToClash(nodes, clash, dummy_str_array, false, ext);