fixes
This commit is contained in:
parent
c562d17b78
commit
0520aa3d40
@ -4,5 +4,5 @@ set ARG1=%~1
|
|||||||
set ARG2=%~2
|
set ARG2=%~2
|
||||||
|
|
||||||
pushd "%~dp0%"
|
pushd "%~dp0%"
|
||||||
call mingw64 -no-start ./cleanup.sh "%ARG1%" "x86_64" "%ARG2%" 1 0
|
call mingw64 -no-start ./cleanup.sh "x86_64" "%ARG1%" "%ARG2%" 1 0
|
||||||
popd
|
popd
|
||||||
|
@ -41,7 +41,7 @@ if [ "${DOCKER_CREATE_ONLY}" != "1" ]; then
|
|||||||
docker exec \
|
docker exec \
|
||||||
${DOCKER_CONTAINER} \
|
${DOCKER_CONTAINER} \
|
||||||
/bin/bash -c \
|
/bin/bash -c \
|
||||||
"${SOURCE_DIR}/scripts/make_common.sh \"${PROJECT_CMAKE_BUILD_TYPE}\" \"${PROJECT_BUILD_ARCH}\" \"${PROJECT_BUILD_CLEAN}\" ${IS_MINGW} ${IS_UNIX}" || exit 1
|
"${SOURCE_DIR}/scripts/make_common.sh \"${PROJECT_BUILD_ARCH}\" \"${PROJECT_CMAKE_BUILD_TYPE}\" \"${PROJECT_BUILD_CLEAN}\" ${IS_MINGW} ${IS_UNIX}" || exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
docker stop ${DOCKER_CONTAINER}
|
docker stop ${DOCKER_CONTAINER}
|
||||||
|
@ -4,6 +4,6 @@ set ARG1=%~1
|
|||||||
set ARG2=%~2
|
set ARG2=%~2
|
||||||
|
|
||||||
pushd "%~dp0%"
|
pushd "%~dp0%"
|
||||||
call mingw64 -no-start ./info.sh "%ARG1%" "x86_64" "%ARG2%" 1 0
|
call mingw64 -no-start ./info.sh "x86_64" "%ARG1%" "%ARG2%" 1 0
|
||||||
popd
|
popd
|
||||||
|
|
||||||
|
@ -12,5 +12,5 @@ if [ "${PROJECT_REQUIRE_ALPINE}" == "ON" ]; then
|
|||||||
|
|
||||||
. "${CURRENT_DIR}/docker_common.sh" || exit 1
|
. "${CURRENT_DIR}/docker_common.sh" || exit 1
|
||||||
else
|
else
|
||||||
"${SOURCE_DIR}/scripts/make_common.sh" "${PROJECT_CMAKE_BUILD_TYPE}" "${PROJECT_BUILD_ARCH}" "${PROJECT_BUILD_CLEAN}" 0 0 || exit 1
|
"${SOURCE_DIR}/scripts/make_common.sh" "${PROJECT_BUILD_ARCH}" "${PROJECT_CMAKE_BUILD_TYPE}" "${PROJECT_BUILD_CLEAN}" 0 0 || exit 1
|
||||||
fi
|
fi
|
||||||
|
@ -6,5 +6,5 @@ set ARG2=%~2
|
|||||||
pushd "%~dp0%"
|
pushd "%~dp0%"
|
||||||
call setup_msys2.cmd "%ARG1%" "%ARG2%"
|
call setup_msys2.cmd "%ARG1%" "%ARG2%"
|
||||||
|
|
||||||
call mingw64 -no-start ./make_common.sh "%ARG1%" "x86_64" "%ARG2%" 1 0 || exit 1
|
call mingw64 -no-start ./make_common.sh "x86_64" "%ARG1%" "%ARG2%" 1 0 || exit 1
|
||||||
popd
|
popd
|
||||||
|
@ -4,6 +4,6 @@ set ARG1=%~1
|
|||||||
set ARG2=%~2
|
set ARG2=%~2
|
||||||
|
|
||||||
pushd "%~dp0%"
|
pushd "%~dp0%"
|
||||||
call mingw64 -no-start ./setup_msys2.sh "%ARG1%" "x86_64" "%ARG2%" 1 0
|
call mingw64 -no-start ./setup_msys2.sh "x86_64" "%ARG1%" "%ARG2%" 1 0
|
||||||
call mingw64 -no-start ./setup_msys2.sh "%ARG1%" "x86_64" "%ARG2%" 1 0
|
call mingw64 -no-start ./setup_msys2.sh "x86_64" "%ARG1%" "%ARG2%" 1 0
|
||||||
popd
|
popd
|
||||||
|
Loading…
x
Reference in New Issue
Block a user