Browse Source

Add helps or/and update documentation

Yuriy Puchkov 4 years ago
parent
commit
b4fa375e69
6 changed files with 10 additions and 8 deletions
  1. 1 1
      .travis.yml
  2. 2 1
      appveyor.yml
  3. BIN
      docs/flameshot-documentation.pdf
  4. 1 1
      flameshot.pro
  5. 2 2
      update_version_everywhere.sh
  6. 4 3
      win_setup/flameshot.iss

+ 1 - 1
.travis.yml

@@ -17,7 +17,7 @@ env:
       # Environment variables for packaging
       - PRODUCT=flameshot
       #TODO: we should take version from the last tag in git history + build number
-      - VERSION=0.7.3
+      - VERSION=0.7.4
       - RELEASE=1
       - ARCH=x86_64
       # Dockerfile from https://github.com/flameshotapp/flameshot-docker-images

+ 2 - 1
appveyor.yml

@@ -1,7 +1,7 @@
 image: Visual Studio 2015
 
 #TODO: we should take version from the last tag in git history + build number
-version: 0.7.3.{build}
+version: 0.7.4.{build}
 # Major_Version_Number.Minor_Version_Number.Patch_Number.Build_Number
 
 skip_branch_with_pr: true
@@ -51,6 +51,7 @@ after_build:
   - copy "%APPVEYOR_BUILD_FOLDER%\build\release\flameshot.exe" "distrib\flameshot\flameshot.exe"
   - copy "%APPVEYOR_BUILD_FOLDER%\README.md" "distrib\flameshot\README.md"
   - copy "%APPVEYOR_BUILD_FOLDER%\LICENSE" "distrib\flameshot\LICENSE.txt"
+  - copy "%APPVEYOR_BUILD_FOLDER%\docs\flameshot-documentation.pdf" "distrib\flameshot\flameshot-documentation.pdf"
   - echo %flameshot_version% > "distrib\flameshot\version.txt"
   - echo Build:%build_number% >> "distrib\flameshot\version.txt"
   - echo %APPVEYOR_REPO_COMMIT% >> "distrib\flameshot\version.txt"

BIN
docs/flameshot-documentation.pdf


+ 1 - 1
flameshot.pro

@@ -6,7 +6,7 @@
 
 win32:LIBS += -luser32 -lshell32
 
-BASE_VERSION = 0.7.3
+BASE_VERSION = 0.7.4
 TAG_VERSION = "$$system(git --git-dir $$PWD/.git --work-tree $$PWD describe --always --tags)"
 isEmpty(TAG_VERSION){
     TAG_VERSION = $$BASE_VERSION

+ 2 - 2
update_version_everywhere.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-BASE_VERSION_OLD=0.7.2
-BASE_VERSION_NEW=0.7.3
+BASE_VERSION_OLD=0.7.3
+BASE_VERSION_NEW=0.7.4
 
 sed -i "s/BASE_VERSION = ${BASE_VERSION_OLD}/BASE_VERSION = ${BASE_VERSION_NEW}/g" flameshot.pro
 

+ 4 - 3
win_setup/flameshot.iss

@@ -6,9 +6,9 @@
 
 [Setup]
 AppName=Flameshot
-AppVersion=0.7.3
+AppVersion=0.7.4
 AppCopyright=NameCheap inc.
-VersionInfoVersion=0.7.3
+VersionInfoVersion=0.7.4
 WizardStyle=modern
 DefaultDirName={autopf}\Flameshot
 DefaultGroupName=Flameshot
@@ -34,8 +34,9 @@ Source: "flameshot\platforms\*"; DestDir: "{app}\platforms"
 Source: "flameshot\translations\*"; DestDir: "{app}\translations"
 
 [Icons]
-Name: "{group}\Flameshot"; Filename: "{app}\flameshot.exe"; WorkingDir: "{app}"
 Name: "{commondesktop}\Flameshot"; Filename: "{app}\flameshot.exe"; WorkingDir: "{app}"
+Name: "{group}\Flameshot"; Filename: "{app}\flameshot.exe"; WorkingDir: "{app}"
+Name: "{group}\FlameShot Documentation"; Filename: "{app}\flameshot-documentation.pdf"; WorkingDir: "{app}"
 
 ; NOTE: Most apps do not need registry entries to be pre-created. If you
 ; don't know what the registry is or if you need to use it, then chances are