revert

scripts/make_unix.sh

@@ -11,6 +11,9 @@ NAME=alpine
 if [ -z "${BUILD_ARCH}" ]; then
   BUILD_ARCH=64_bit
 fi
+if [ -z "${BUILD_TYPE}" ]; then
+  BUILD_TYPE=Release
+fi
 
 ln -sf ${SOURCE_DIR}/build/compile_commands.json ${SOURCE_DIR}/compile_commands.json
 
@@ -18,6 +21,6 @@ docker stop repertory_${NAME}
 docker rm repertory_${NAME}
 docker build -t repertory:${NAME} - < ${SOURCE_DIR}/docker/${BUILD_ARCH}/${NAME} &&
   docker run -td -u $(id -u):$(id -g) --device /dev/fuse --cap-add SYS_ADMIN --name repertory_${NAME} --env MY_NUM_JOBS=${MY_NUM_JOBS} -w ${SOURCE_DIR} -v ${SOURCE_DIR}:${SOURCE_DIR}:rw,z repertory:${NAME} &&
-  docker exec repertory_${NAME} /bin/bash -c "${SOURCE_DIR}/scripts/make_unix_docker.sh ${BUILD_TYPE} ${BUILD_CLEAN}"
+  docker exec repertory_${NAME} /bin/bash -c "${SOURCE_DIR}/scripts/make_common.sh ${BUILD_TYPE} ${BUILD_CLEAN}"
 docker stop repertory_${NAME}
 docker rm repertory_${NAME}

scripts/run_docker_shell.sh

@@ -1,5 +1,15 @@
 #!/bin/bash
 
+NUM_JOBS=${MY_NUM_JOBS}
+if [[ -z "${NUM_JOBS}" ]]; then
+  NUM_JOBS=$(getconf _NPROCESSORS_ONLN 2> /dev/null || getconf NPROCESSORS_ONLN 2> /dev/null || echo 1)
+  if [ "${NUM_JOBS}" -gt "2" ]; then
+    NUM_JOBS=$(expr ${NUM_JOBS} - 2)
+  elif [ "${NUM_JOBS}" -gt "1" ]; then
+    NUM_JOBS=$(expr ${NUM_JOBS} - 1)
+  fi
+fi
+
 pushd "$(dirname "$0")"
 CURRENT_DIR=$(pwd)
 
@@ -13,13 +23,18 @@ else
     TYPE=64_bit
   fi
 
-  docker stop repertory_${NAME}
-  docker rm repertory_${NAME}
-  docker build -t repertory:${NAME} - < docker/${TYPE}/${NAME} &&
-    docker run -itd --device /dev/fuse --cap-add SYS_ADMIN --name repertory_${NAME} -v $(pwd):/mnt repertory:${NAME} &&
-    docker exec -it repertory_${NAME} /bin/bash
-  docker stop repertory_${NAME}
-  docker rm repertory_${NAME}
+  TAG=repertory_shell
+  CONTAINER=${TAG}_${NAME}
+
+  docker stop ${CONTAINER}
+  docker rm ${CONTAINER}
+  docker build --build-arg NUM_JOBS=$NUM_JOBS -t ${TAG}:${NAME} - < docker/${TYPE}/${NAME} &&
+    docker run -itd --device /dev/fuse --cap-add SYS_ADMIN --name ${CONTAINER} -v $(pwd):/mnt ${TAG}:${NAME} &&
+    # docker run -itd --device /dev/fuse --cap-add SYS_ADMIN --name ${CONTAINER} ${TAG}:${NAME} &&
+    docker exec -it ${CONTAINER} /bin/bash
+  docker stop ${CONTAINER}
+  docker rm ${CONTAINER}
+  docker system prune -f
 fi
 popd
 popd

scripts/setup_msys2.sh

@@ -7,5 +7,4 @@ pacman -Sqyuu --noconfirm &&
     mingw64/mingw-w64-x86_64-make \
     mingw64/mingw-w64-x86_64-toolchain \
     msys/git \
-    msys/mercurial \
     make