fergalmoran/flameshot
1
0
Fork 0
mirror of https://github.com/fergalmoran/flameshot.git synced 2025-12-22 09:51:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add helps or/and update documentation

Browse Source
This commit is contained in:
Yuriy Puchkov
2020-07-07 15:10:24 +03:00
parent 87086df399
commit b4fa375e69
6 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

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

3
appveyor.yml
View File

@@ -1,7 +1,7 @@
image: Visual Studio 2015 image: Visual Studio 2015
#TODO: we should take version from the last tag in git history + build number #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 # Major_Version_Number.Minor_Version_Number.Patch_Number.Build_Number
skip_branch_with_pr: true 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%\build\release\flameshot.exe" "distrib\flameshot\flameshot.exe"
- copy "%APPVEYOR_BUILD_FOLDER%\README.md" "distrib\flameshot\README.md" - copy "%APPVEYOR_BUILD_FOLDER%\README.md" "distrib\flameshot\README.md"
- copy "%APPVEYOR_BUILD_FOLDER%\LICENSE" "distrib\flameshot\LICENSE.txt" - 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 %flameshot_version% > "distrib\flameshot\version.txt"
- echo Build:%build_number% >> "distrib\flameshot\version.txt" - echo Build:%build_number% >> "distrib\flameshot\version.txt"
- echo %APPVEYOR_REPO_COMMIT% >> "distrib\flameshot\version.txt" - echo %APPVEYOR_REPO_COMMIT% >> "distrib\flameshot\version.txt"

BIN
docs/flameshot-documentation.pdf Normal file
View File

Binary file not shown.

2
flameshot.pro
View File

@@ -6,7 +6,7 @@
win32:LIBS += -luser32 -lshell32 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)" TAG_VERSION = "$$system(git --git-dir $$PWD/.git --work-tree $$PWD describe --always --tags)"
isEmpty(TAG_VERSION){ isEmpty(TAG_VERSION){
TAG_VERSION = $$BASE_VERSION TAG_VERSION = $$BASE_VERSION

4
update_version_everywhere.sh
View File

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

7
win_setup/flameshot.iss
View File

@@ -6,9 +6,9 @@
[Setup] [Setup]
AppName=Flameshot AppName=Flameshot
AppVersion=0.7.3 AppVersion=0.7.4
AppCopyright=NameCheap inc. AppCopyright=NameCheap inc.
VersionInfoVersion=0.7.3 VersionInfoVersion=0.7.4
WizardStyle=modern WizardStyle=modern
DefaultDirName={autopf}\Flameshot DefaultDirName={autopf}\Flameshot
DefaultGroupName=Flameshot DefaultGroupName=Flameshot
@@ -34,8 +34,9 @@ Source: "flameshot\platforms\*"; DestDir: "{app}\platforms"
Source: "flameshot\translations\*"; DestDir: "{app}\translations" Source: "flameshot\translations\*"; DestDir: "{app}\translations"
[Icons] [Icons]
Name: "{group}\Flameshot"; Filename: "{app}\flameshot.exe"; WorkingDir: "{app}"
Name: "{commondesktop}\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 ; 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 ; don't know what the registry is or if you need to use it, then chances are