diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 3481782..0000000 --- a/Dockerfile +++ /dev/null @@ -1,31 +0,0 @@ -# FROM alpine:latest - -# RUN apk update -# RUN apk upgrade -# RUN apk add curl file git -# RUN apk add gcc -# RUN apk add rust-doc -# # RUN apk search rust-std -# # RUN apk add rust-std - -# RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs -y | sh -# # RUN source $HOME/.cargo/env - - - -# CMD [""] - -FROM rust:latest - -RUN apt upgrade -RUN apt update -# RUN apt install -y \ -# clang \ -# gcc \ -# g++ \ -# zlib1g-dev \ -# libmpc-dev \ -# libmpfr-dev \ -# libgmp-dev - -CMD [""] diff --git a/build.sh b/build.sh deleted file mode 100644 index dbf8c02..0000000 --- a/build.sh +++ /dev/null @@ -1,10 +0,0 @@ -if [ "$1" = "macos-arm" ]; then - rustup target add aarch64-apple-darwin - cargo build --release --target=aarch64-apple-darwin -elif [ "$1" = "linux" ]; then - rustup target add x86_64-unknown-linux-musl - cargo build --release --target=x86_64-unknown-linux-musl -elif [ "$1" = "windows" ]; then - rustup target add x86_64-pc-windows-msvc - cargo build --release --target=x86_64-pc-windows-msvc -fi \ No newline at end of file diff --git a/build/build.sh b/build/build.sh new file mode 100644 index 0000000..97adc2d --- /dev/null +++ b/build/build.sh @@ -0,0 +1,13 @@ +if [ "$1" = "macos-arm" ]; then + rustup target add aarch64-apple-darwin + cargo build --release --target=aarch64-apple-darwin +elif [ "$1" = "linux" ]; then + cd /usr/src + rustup target add x86_64-unknown-linux-gnu + cargo build --release --target=x86_64-unknown-linux-gnu +elif [ "$1" = "windows" ]; then + cd /usr/src + rustup target add x86_64-pc-windows-gnu + rustup toolchain install stable-x86_64-pc-windows-gnu + cargo build --release --target=x86_64-pc-windows-gnu +fi \ No newline at end of file diff --git a/build/windows_build.Dockerfile b/build/windows_build.Dockerfile new file mode 100644 index 0000000..927dc3b --- /dev/null +++ b/build/windows_build.Dockerfile @@ -0,0 +1,8 @@ +FROM rust:latest + +RUN apt update && apt upgrade -y +RUN apt install -y g++-mingw-w64-x86-64 + +WORKDIR /usr/src + +CMD ["sh", "./build/build.sh", "windows"] \ No newline at end of file diff --git a/build/windows_build.docker-compose.yml b/build/windows_build.docker-compose.yml new file mode 100644 index 0000000..dfa5b14 --- /dev/null +++ b/build/windows_build.docker-compose.yml @@ -0,0 +1,9 @@ +version: "2.9" + +services: + app: + build: + dockerfile: ./windows_build.Dockerfile + volumes: + - ../:/usr/src + - /usr/src/Project \ No newline at end of file diff --git a/main.rs b/main.rs index a0c6f2d..342b19b 100644 --- a/main.rs +++ b/main.rs @@ -45,6 +45,7 @@ fn main() { project_type = args.project_type.as_ref().unwrap().to_string(); } else { let selection = Select::with_theme(&ColorfulTheme::default()) + .with_prompt("What type is your project?") .items(&items) .default(0) .interact_on_opt(&Term::stderr());