Skip to content

Commit af7d3fa

Browse files
committed
Fixed windows docker, released version 0.9.8
1 parent 8248c68 commit af7d3fa

File tree

10 files changed

+260
-575
lines changed

10 files changed

+260
-575
lines changed

Cargo.lock

Lines changed: 207 additions & 200 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "noaa-apt"
3-
version = "0.9.8-dev"
3+
version = "0.9.8"
44
authors = ["Martin Bernardi <martinber.710@gmail.com>"]
55
build = "src/build.rs"
66

build/windows-gnu-docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ RUN set -x
77

88
RUN dnf -y update \
99
&& dnf clean all \
10-
&& dnf -y install file gcc make man sudo tar \
10+
&& dnf -y install file gcc make man sudo tar zip \
1111
mingw64-gcc \
1212
mingw64-freetype freetype freetype-devel \
1313
mingw64-cairo mingw64-cairo-static cairo cairo-devel \
Lines changed: 25 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,41 @@
11
#!/bin/sh
22

3-
set -e
4-
set -x
3+
set -eux -o pipefail
54

6-
PACKAGE_FOLDER=/home/rustacean/src/target/x86_64-pc-windows-gnu/package/
5+
# Get noaa-apt version from Cargo.toml
6+
NOAA_APT_VERSION=$(awk '/^version =/{print substr($NF, 2, length($NF)-2)}' Cargo.toml)
7+
8+
PACKAGES_FOLDER=/home/rustacean/src/target/docker_builds
9+
GUI_PACKAGE_NAME="noaa-apt-$NOAA_APT_VERSION-x86_64-windows-gnu"
10+
GUI_PACKAGE_FOLDER="$PACKAGES_FOLDER/$GUI_PACKAGE_NAME"
711
# GTK_INSTALL_PATH=/usr/i686-w64-mingw32
812
GTK_INSTALL_PATH=/usr/x86_64-w64-mingw32/sys-root/mingw/
913

1014
/home/rustacean/.cargo/bin/cargo build --target=x86_64-pc-windows-gnu --release
1115

12-
rm -r "$PACKAGE_FOLDER" || true
13-
mkdir -p "$PACKAGE_FOLDER"
16+
rm -r "$GUI_PACKAGE_FOLDER" || true
17+
mkdir -p "$GUI_PACKAGE_FOLDER"
1418

1519
# Copy exe
16-
cp ./target/x86_64-pc-windows-gnu/release/*.exe "$PACKAGE_FOLDER"
20+
cp ./target/x86_64-pc-windows-gnu/release/*.exe "$GUI_PACKAGE_FOLDER"
1721

1822
# Copy GTK files
19-
cp "$GTK_INSTALL_PATH"/bin/*.dll "$PACKAGE_FOLDER"
20-
mkdir -p "$PACKAGE_FOLDER/share/glib-2.0/schemas"
21-
mkdir "$PACKAGE_FOLDER/share/icons"
22-
cp "$GTK_INSTALL_PATH"/share/glib-2.0/schemas/* "$PACKAGE_FOLDER/share/glib-2.0/schemas"
23-
cp -r "$GTK_INSTALL_PATH"/share/icons/* "$PACKAGE_FOLDER/share/icons"
23+
cp "$GTK_INSTALL_PATH"/bin/*.dll "$GUI_PACKAGE_FOLDER"
24+
mkdir -p "$GUI_PACKAGE_FOLDER/share/glib-2.0/schemas"
25+
mkdir "$GUI_PACKAGE_FOLDER/share/icons"
26+
cp "$GTK_INSTALL_PATH"/share/glib-2.0/schemas/* "$GUI_PACKAGE_FOLDER/share/glib-2.0/schemas"
27+
cp -r "$GTK_INSTALL_PATH"/share/icons/* "$GUI_PACKAGE_FOLDER/share/icons"
2428

2529
# Copy settings.ini
26-
mkdir "$PACKAGE_FOLDER/share/gtk-3.0"
27-
cp ./build/windows-files/settings.ini "$PACKAGE_FOLDER/share/gtk-3.0/"
30+
mkdir -p "$GUI_PACKAGE_FOLDER/share/gtk-3.0"
31+
cp ./build/windows-files/settings.ini "$GUI_PACKAGE_FOLDER/share/gtk-3.0/"
2832

2933
# Copy test files
30-
mkdir "$PACKAGE_FOLDER/test"
31-
cp ./test/*.wav "$PACKAGE_FOLDER/test/"
34+
mkdir "$GUI_PACKAGE_FOLDER/test"
35+
cp ./test/*.wav "$GUI_PACKAGE_FOLDER/test/"
36+
37+
# Zip
38+
39+
pushd "$GUI_PACKAGE_FOLDER/"
40+
zip -r "$PACKAGES_FOLDER/$GUI_PACKAGE_NAME.zip" ./*
41+
popd

debian/changelog

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,15 @@
1-
noaa-apt (0.9.8-dev-1) unstable; urgency=medium
1+
noaa-apt (0.9.8-1) testing; urgency=medium
2+
3+
* Automatic contrast adjustment.
4+
* Now can read telemetry frames.
5+
* Application icons for GNU/Linux and Windows.
6+
* .deb packages for Debian-based distros.
7+
* Better font for GUI on Windows.
8+
* Small fixes and improvements.
9+
10+
-- Martin Bernardi <mbernardi@mbernardi-pc> Sat, 23 Feb 2019 20:08:25 -0300
11+
12+
noaa-apt (0.9.7+dev-1) testing; urgency=medium
213

314
* Initial packaged release.
415

docs/development.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ located on `/test/`. Results are on `/test/results/`, check with Audacity.
220220
git tag -l
221221
```
222222
223-
- Increment version number on `/Cargo.lock`.
223+
- Increment version number on `/Cargo.toml`.
224224
225225
- Increment version number on `/docs/version_check`.
226226
@@ -242,7 +242,7 @@ located on `/test/`. Results are on `/test/results/`, check with Audacity.
242242
- [Check required glibc version](https://www.agardner.me/golang/cgo/c/dependencies/glibc/kernel/linux/2015/12/12/c-dependencies.html),
243243
should be less than the version shown on the Download page.
244244
245-
- Check zip archives. Names should be:
245+
- Check archives, names should be:
246246
247247
- `noaa-apt-?.?.?-x86_64-linux-gnu.zip`
248248

docs/download.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,13 @@ layout: main
77

88
There is a GUI version and a no-GUI version available.
99

10-
- [noaa-apt 0.9.7 GNU/Linux x86_64](https://github.com/martinber/noaa-apt/releases/download/v0.9.7/noaa-apt-0.9.7-x86_64-linux-gnu.zip).
10+
- [noaa-apt 0.9.8 GNU/Linux x86_64 .deb package](https://github.com/martinber/noaa-apt/releases/download/v0.9.8/noaa-apt_0.9.8-1_amd64.deb).
1111

12-
- [noaa-apt 0.9.7 GNU/Linux x86_64 (no GUI)](https://github.com/martinber/noaa-apt/releases/download/v0.9.7/noaa-apt-0.9.7-x86_64-linux-gnu-nogui.zip).
12+
- [noaa-apt 0.9.8 Windows x86_64](https://github.com/martinber/noaa-apt/releases/download/v0.9.8/noaa-apt-0.9.8-x86_64-windows-gnu.zip).
1313

14-
- [noaa-apt 0.9.7 Windows x86_64](https://github.com/martinber/noaa-apt/releases/download/v0.9.7/noaa-apt-0.9.7-x86_64-windows-gnu.zip).
14+
- [noaa-apt 0.9.8 GNU/Linux x86_64 zip](https://github.com/martinber/noaa-apt/releases/download/v0.9.8/noaa-apt-0.9.8-x86_64-linux-gnu.zip).
15+
16+
- [noaa-apt 0.9.8 GNU/Linux x86_64 (no GUI) zip](https://github.com/martinber/noaa-apt/releases/download/v0.9.8/noaa-apt-0.9.8-x86_64-linux-gnu-nogui.zip).
1517

1618
You can download those executables, or old ones from the
1719
[releases page on GitHub](https://github.com/martinber/noaa-apt/releases).
@@ -20,6 +22,8 @@ Your options are:
2022

2123
- GNU/Linux:
2224

25+
- Download .deb package for Debian based distros (Ubuntu, Linux Mint...)
26+
2327
- Download executable with GUI.
2428

2529
- Download executable without GUI.

docs/version_check

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.9.7
1+
0.9.8

0 commit comments

Comments
 (0)