Merge pull request #13 from 13hannes11/dependabot/cargo/xml-rs-0.8.14

Bump xml-rs from 0.8.4 to 0.8.14

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,38 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
+**Smartphone (please complete the following information):**
+ - Device: [e.g. iPhone6]
+ - OS: [e.g. iOS8.1]
+ - Browser [e.g. stock browser, safari]
+ - Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/workflows/build_and_publish.yml

@@ -25,14 +25,17 @@ jobs:
     - uses: actions/checkout@v2
     - name: Build (Windows)
       run: docker-compose -f docker-compose.windows.yml up
-    - name: rename windows artifact
+    - name: Make Windows Installer
-      run: mv package.zip windows.zip
+      run: ./create_windows_installer.sh
+    - name: Zip Portable Windows Artifact
+      run: zip -r windows-portable.zip package
     - name: Upload Artifact
       uses: actions/upload-artifact@v2.3.1
       with:
         name: executables
         path: |
           *.zip
+          *.exe
           
   publish:
     needs: [build, build-windows]
@@ -47,3 +50,4 @@ jobs:
         files: |
           **/*.AppImage
           **/*.zip
+          **/*.exe

.gitignore

@@ -1,3 +1,6 @@
 /target
-*.zip
+/Output
+/package
 /libs
+*.zip
+*.exe

Cargo.lock

@@ -158,7 +158,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
 [[package]]
 name = "focus-annotator"
-version = "0.1.0"
+version = "0.1.1"
 dependencies = [
  "derive_builder",
  "gls",
@@ -1014,6 +1014,6 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "xml-rs"
-version = "0.8.4"
+version = "0.8.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3"
+checksum = "52839dc911083a8ef63efa4d039d1f58b5e409f923e44c80828f206f66e5541c"

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "focus-annotator"
-version = "0.1.0"
+version = "0.1.1"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -20,3 +20,8 @@ auto_link_exclude_list = [
     "libdl.so*",
     "libpthread.so*",
 ]
+
+[[bin]]
+name = "focus-annotator"
+path = "src/main.rs"
+

README.md

@@ -8,7 +8,7 @@ Focus Annotator is a tool for annotation the focal plane of a part of an image.
 
 ## Installation
 
-Currently the application can only be optained by compiling from source.
+You can either download the latest release [here](https://github.com/13hannes11/focus_annotator/releases) or compile from source.
 
 ## Compilation Instructions
 
@@ -16,7 +16,7 @@ Currently the application can only be optained by compiling from source.
 
 The tool can be compiled with docker-compose:
 
-* Linux Version `docker-compose up` (found in *target/release/*, dependencies are not included therefore install `libadwaita` via your distros package manager)
+* Linux Version `docker-compose up` (compiles to AppImage)
 * Windows Version: `docker-compose -f docker-compose.windows.yml up` (the resulting file is packaged as *package.zip*, dependencies included)
 
 

create_windows_installer.sh

@@ -0,0 +1,10 @@
+unzip -o package.zip
+docker rm setup
+docker container create --name setup amake/innosetup setup.iss
+docker cp ./package setup:/work/
+docker cp setup.iss setup:/work/
+docker cp LICENSE.md setup:/work/
+docker start -i -a setup
+docker cp setup:/work/Output/. .
+docker rm setup
+# rm -r package

docker-compose.windows.yml

@@ -1,8 +1,8 @@
 version: "3"
 services:
   cross:
-    image: mglolenstine/gtk4-cross:rust-gtk-4.6
+    image: ghcr.io/mglolenstine/gtk4-cross:rust-gtk-4.8
     volumes:
       - .:/mnt:z
-    command: bash -c "build && package_with_icons"
+    command: bash -c "build && package"
 

setup.iss

@@ -0,0 +1,43 @@
+; Script generated by the Inno Setup Script Wizard.
+; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
+
+[Setup]
+; NOTE: The value of AppId uniquely identifies this application. Do not use the same AppId value in installers for other applications.
+; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
+AppId={{0AD7C555-49E0-47FC-A6ED-22677FD5AD28}
+AppName=Focus Annotator
+AppVersion=0.1.1
+;AppVerName=Focus Annotator 0.1.0
+AppPublisher=Hannes Fredrik Kuchelmeister
+AppPublisherURL=https://github.com/13hannes11/focus_annotator
+AppSupportURL=https://github.com/13hannes11/focus_annotator
+AppUpdatesURL=https://github.com/13hannes11/focus_annotator
+DefaultDirName={autopf}\Focus Annotator
+DisableProgramGroupPage=yes
+LicenseFile=LICENSE.md
+; Uncomment the following line to run in non administrative install mode (install for current user only.)
+;PrivilegesRequired=lowest
+PrivilegesRequiredOverridesAllowed=dialog
+OutputBaseFilename=focus_annotator_setup
+Compression=lzma
+SolidCompression=yes
+WizardStyle=modern
+
+[Languages]
+Name: "english"; MessagesFile: "compiler:Default.isl"
+
+[Tasks]
+Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
+
+[Files]
+Source: "package\focus-annotator.exe"; DestDir: "{app}"; Flags: ignoreversion
+Source: "package\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
+; NOTE: Don't use "Flags: ignoreversion" on any shared system files
+
+[Icons]
+Name: "{autoprograms}\Focus Annotator"; Filename: "{app}\focus-annotator.exe"
+Name: "{autodesktop}\Focus Annotator"; Filename: "{app}\focus-annotator.exe"; Tasks: desktopicon
+
+[Run]
+Filename: "{app}\focus-annotator.exe"; Description: "{cm:LaunchProgram,Focus Annotator}"; Flags: nowait postinstall skipifsilent
+