max
/
docker-rust-cross
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: max:67d7ef1a187c8be78bf63c9bb4ba2e858dafea03
Branches Tags
max:master
...
compare: max:43b7bb2152dc21df50f003abac81ae80b32bd49f
Branches Tags
max:master

3 Commits
67d7ef1a18 ... 43b7bb2152

Author SHA1 Message Date
Max Bradbury 43b7bb2152 remove "Windows 10" GTK theme since it doesn't work 2020-10-04 11:27:30 +01:00
Max Bradbury 05e9981c7e add git 2020-10-04 10:29:31 +01:00
Max Bradbury 3bdcec3443 tidyup 2020-10-04 10:29:21 +01:00
3 changed files with 4 additions and 6 deletions
Show Stats Expand all files Collapse all files

5
Dockerfile
View File

@ -6,7 +6,7 @@ RUN useradd -ms /bin/bash rust
ADD peldd /usr/bin/peldd ADD peldd /usr/bin/peldd
ADD package.sh /usr/bin/package.sh ADD package.sh /usr/bin/package.sh
RUN dnf install -y mingw64-gcc mingw64-freetype mingw64-cairo mingw64-harfbuzz mingw64-pango mingw64-poppler mingw64-gtk3 mingw64-winpthreads-static mingw64-glib2-static gcc boost zip && dnf clean all -y RUN dnf install -y mingw64-gcc mingw64-freetype mingw64-cairo mingw64-harfbuzz mingw64-pango mingw64-poppler mingw64-gtk3 mingw64-winpthreads-static mingw64-glib2-static gcc boost zip git && dnf clean all -y
USER rust USER rust
@ -18,7 +18,6 @@ RUN . ~/.cargo/env && \
rustup target add x86_64-pc-windows-gnu rustup target add x86_64-pc-windows-gnu
ADD cargo.config /home/rust/.cargo/config ADD cargo.config /home/rust/.cargo/config
ADD Windows-10 /home/rust/Windows10
ENV PKG_CONFIG_ALLOW_CROSS=1 ENV PKG_CONFIG_ALLOW_CROSS=1
ENV PKG_CONFIG_PATH=/usr/x86_64-w64-mingw32/sys-root/mingw/lib/pkgconfig/ ENV PKG_CONFIG_PATH=/usr/x86_64-w64-mingw32/sys-root/mingw/lib/pkgconfig/
@ -33,6 +32,6 @@ CMD ["/usr/bin/package.sh"]
# $ docker build . -t PROJECTNAME-build-image # $ docker build . -t PROJECTNAME-build-image
# 3) Creating a container with the source mounted the image (which kicks off the build): # 3) Creating a container with the source mounted the image (which kicks off the build):
# $ docker create -v `pwd`:/home/rust/src --name PROJECTNAME-build PROJECTNAME-build-image # $ docker create -v `pwd`:/home/rust/src --name PROJECTNAME-build PROJECTNAME-build-image
# 4) Each time you want to build the project, start the Docker container. # 4) Each time you want to build the project, start the Docker container.
# Add "-ai" to watch the build progress. # Add "-ai" to watch the build progress.
# $ docker start PROJECTNAME-build # $ docker start PROJECTNAME-build

1
Windows-10

@ -1 +0,0 @@
Subproject commit 06dd5b87781908ca0448d4577142d50796557dee

4
package.sh
View File

@ -12,8 +12,8 @@ for DLL in $DLLS
done done
mkdir -p package/share/{themes,gtk-3.0} mkdir -p package/share/{themes,gtk-3.0}
cp -r $GTK_INSTALL_PATH/share/glib-2.0/schemas package/share/glib-2.0 cp -r "$GTK_INSTALL_PATH"/share/glib-2.0/schemas package/share/glib-2.0
cp -r $GTK_INSTALL_PATH/share/icons package/share/icons cp -r "$GTK_INSTALL_PATH"/share/icons package/share/icons
cp -r ~/Windows10 package/share/themes cp -r ~/Windows10 package/share/themes
cat << EOF > package/share/gtk-3.0/settings.ini cat << EOF > package/share/gtk-3.0/settings.ini