add cmake

quiet zipping
remove more Windows 10 theme stuff
2020-10-04 15:58:06 +01:00 · 2020-10-04 14:16:32 +01:00 · 2020-10-04 13:39:24 +01:00 · 2020-10-04 13:39:14 +01:00
2 changed files with 6 additions and 13 deletions
--- a/2
+++ b/2
@@ -6,7 +6,7 @@ RUN useradd -ms /bin/bash rust
 ADD peldd /usr/bin/peldd
 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 git && 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 cmake @development-tools && dnf clean all -y

 USER rust

--- a/package.sh
+++ b/package.sh
@@ -1,12 +1,14 @@
 #!/bin/bash

-source ~/.cargo/env
+source /home/rust/.cargo/env
 cargo build --target=x86_64-pc-windows-gnu --release

 mkdir package
 cp target/x86_64-pc-windows-gnu/release/*.exe package

-export DLLS=`peldd package/*.exe -t --ignore-errors`
+DLLS=$(peldd package/*.exe -t --ignore-errors)
+export DLLS
+
 for DLL in $DLLS
    do cp "$DLL" package
 done
@@ -14,16 +16,7 @@ done
 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/icons package/share/icons
-cp -r ~/Windows10 package/share/themes
-
-cat << EOF > package/share/gtk-3.0/settings.ini
-[Settings]
-gtk-theme-name = Windows10
-gtk-font-name = Segoe UI 10
-gtk-xft-rgba = rgb
-gtk-xft-antialias = 1
-EOF

 mingw-strip package/*

-zip -r package.zip package/*
+zip -q -r package.zip package/*
Author	SHA1	Message	Date
Max Bradbury	a163c71a9b	add cmake	2020-10-04 15:58:06 +01:00
Max Bradbury	ed9cbdbccd	quiet zipping	2020-10-04 14:16:32 +01:00
Max Bradbury	fd512f0f8c	remove more Windows 10 theme stuff	2020-10-04 13:39:24 +01:00
Max Bradbury	67bd8f242a	fix highlighted problems	2020-10-04 13:39:14 +01:00