AppVeyor works now
This commit is contained in:
parent
e44c90098b
commit
6bc6775e7f
2
.gitignore
vendored
2
.gitignore
vendored
@ -38,7 +38,7 @@ CMakeLists.txt.user
|
|||||||
Makefile
|
Makefile
|
||||||
|
|
||||||
# Executable
|
# Executable
|
||||||
KShare
|
./KShare
|
||||||
|
|
||||||
# Other
|
# Other
|
||||||
*.out
|
*.out
|
||||||
|
27
AppVeyor/appveyor.yml
Normal file
27
AppVeyor/appveyor.yml
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
environment:
|
||||||
|
QTDIR: C:\Qt\5.9\mingw53_32
|
||||||
|
build_script:
|
||||||
|
- dir
|
||||||
|
- mkdir build
|
||||||
|
- cd build
|
||||||
|
- set PATH=%PATH%;%QTDIR%\bin;C:\Qt\Tools\mingw530_32\bin;C:\MinGW\msys\1.0\bin
|
||||||
|
- git submodule update --init --recursive
|
||||||
|
- curl -kLO https://ffmpeg.zeranoe.com/builds/win64/dev/ffmpeg-3.3.2-win64-dev.zip
|
||||||
|
- 7z x ffmpeg-3.3.2-win64-dev.zip
|
||||||
|
- set FFMPEG_DEV_PATH=%CD%\ffmpeg-3.3.2-win64-dev
|
||||||
|
- curl -kLO https://ffmpeg.zeranoe.com/builds/win64/shared/ffmpeg-3.3.2-win64-shared.zip
|
||||||
|
- 7z x ffmpeg-3.3.2-win64-shared.zip
|
||||||
|
- set FFMPEG_SHARED_PATH=%cd%\ffmpeg-3.3.2-win64-shared
|
||||||
|
- ps: Start-FileDownload https://downloads.sourceforge.net/project/qtav/depends/QtAV-depends-windows-x86%2Bx64.7z av.7z
|
||||||
|
- 7z x av.7z > NUL
|
||||||
|
- xcopy ffmpeg-3.3.2-win64-shared\* %QTDIR% /e /i /Y
|
||||||
|
- xcopy ffmpeg-3.3.2-win64-dev\* %QTDIR% /e /i /Y
|
||||||
|
- xcopy QtAV-depends-windows-x86+x64\* %QTDIR% /e /i /Y
|
||||||
|
- qmake CONFIG+=nopkg ../KShare.pro
|
||||||
|
- mingw32-make.exe -j8
|
||||||
|
- copy release\KShare.exe ..\KShare.exe
|
||||||
|
- cd ..
|
||||||
|
- bash -xe AppVeyor\make_installer.sh
|
||||||
|
artifacts:
|
||||||
|
- path: KShare.exe
|
||||||
|
- path: installer.exe
|
34
AppVeyor/make_installer.sh
Normal file
34
AppVeyor/make_installer.sh
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
function addFile {
|
||||||
|
cp $1 .
|
||||||
|
echo "Source: \"$(basename $1)\"; DestDir: \"{app}\"; Flags: ignoreversion" >> installer.iss
|
||||||
|
}
|
||||||
|
ver=$(cat main.cpp | grep setApplicationVersion | sed "s/\\s*a.setApplicationVersion(\"//g" | sed "s/\");//g")
|
||||||
|
|
||||||
|
cd packages/windows
|
||||||
|
cp ../../KShare.exe . || exit 1
|
||||||
|
# BOOOOOOIII Feeels good, it's not powershell.
|
||||||
|
|
||||||
|
sed "s/;VER;/$ver/" installer.iss.pattern.top > installer.iss
|
||||||
|
|
||||||
|
addFile ../../build/ffmpeg-3.3.2-win64-shared/bin/avcodec-57.dll
|
||||||
|
#addFile ../../build/ffmpeg-3.3.2-win64-shared/bin/avdevice-57.dll
|
||||||
|
#addFile ../../build/ffmpeg-3.3.2-win64-shared/bin/avfilter-6.dll
|
||||||
|
addFile ../../build/ffmpeg-3.3.2-win64-shared/bin/avformat-57.dll
|
||||||
|
addFile ../../build/ffmpeg-3.3.2-win64-shared/bin/avutil-55.dll
|
||||||
|
#addFile ../../build/ffmpeg-3.3.2-win64-shared/bin/postproc-54.dll
|
||||||
|
#addFile ../../build/ffmpeg-3.3.2-win64-shared/bin/swresample-2.dll
|
||||||
|
addFile ../../build/ffmpeg-3.3.2-win64-shared/bin/swscale-4.dll
|
||||||
|
addFile /c/Qt/5.9/mingw53_32/bin/Qt5Core.dll
|
||||||
|
addFile /c/Qt/5.9/mingw53_32/bin/Qt5Network.dll
|
||||||
|
addFile /c/Qt/5.9/mingw53_32/bin/Qt5Gui.dll
|
||||||
|
addFile /c/Qt/5.9/mingw53_32/bin/Qt5Widgets.dll
|
||||||
|
addFile /c/Qt/5.9/mingw53_32/bin/Qt5WinExtras.dll
|
||||||
|
addFile /c/Qt/5.9/mingw53_32/bin/Qt5Network.dll
|
||||||
|
addFile /c/Qt/5.9/mingw53_32/bin/LIBSTDC++-6.DLL
|
||||||
|
addFile /c/Qt/5.9/mingw53_32/bin/LIBWINPTHREAD-1.DLL
|
||||||
|
addFile /c/Qt/5.9/mingw53_32/bin/LIBGCC_S_DW2-1.DLL
|
||||||
|
|
||||||
|
cat installer.iss.pattern.bottom >> installer.iss
|
||||||
|
"C:\Program Files (x86)\Inno Setup 5\ISCC.exe" installer.iss
|
||||||
|
cp Output/setup.exe ../../installer.exe || exit 1
|
17
KShare.pro
17
KShare.pro
@ -114,7 +114,21 @@ HEADERS += mainwindow.hpp \
|
|||||||
filenamevalidator.hpp
|
filenamevalidator.hpp
|
||||||
|
|
||||||
nopkg {
|
nopkg {
|
||||||
|
# win32 {
|
||||||
|
# !exists($$(FFMPEG_DEV_PATH)\README.txt) {
|
||||||
|
# error("You must define a valid FFMPEG_DEV_PATH")
|
||||||
|
# }
|
||||||
|
|
||||||
|
# !exists($$(FFMPEG_SHARED_PATH)\README.txt) {
|
||||||
|
# error("You must define a valid FFMPEG_SHARED_PATH")
|
||||||
|
# }
|
||||||
|
|
||||||
|
# INCLUDEPATH += $$(FFMPEG_DEV_PATH)\include
|
||||||
|
# LIBS += -L$$(FFMPEG_DEV_PATH)\lib
|
||||||
|
# message(Set the library and include paths);
|
||||||
|
# }
|
||||||
LIBS += -lavcodec -lavformat -lavutil -lswscale
|
LIBS += -lavcodec -lavformat -lavutil -lswscale
|
||||||
|
message(nopkg);
|
||||||
} else {
|
} else {
|
||||||
CONFIG += link_pkgconfig
|
CONFIG += link_pkgconfig
|
||||||
PKGCONFIG += libavformat libavcodec libswscale libavutil
|
PKGCONFIG += libavformat libavcodec libswscale libavutil
|
||||||
@ -154,7 +168,8 @@ DISTFILES += \
|
|||||||
README.md \
|
README.md \
|
||||||
LICENSE \
|
LICENSE \
|
||||||
OlderSystemFix.patch \
|
OlderSystemFix.patch \
|
||||||
appveyor.yml
|
AppVeyor/appveyor.yml \
|
||||||
|
AppVeyor/make_installer.sh
|
||||||
|
|
||||||
RESOURCES += \
|
RESOURCES += \
|
||||||
icon.qrc
|
icon.qrc
|
||||||
|
15
appveyor.yml
15
appveyor.yml
@ -1,15 +0,0 @@
|
|||||||
enviroment:
|
|
||||||
QTDIR: C:\Qt\5.9\mingw53_32
|
|
||||||
PATH: %PATH%;%QTDIR%\bin;C:\MinGW\bin
|
|
||||||
build_script:
|
|
||||||
- git submodule update --init --recursive
|
|
||||||
- qmake CONFIG+=nopkg KShare.pro
|
|
||||||
- curl -kLO https://ffmpeg.zeranoe.com/builds/win64/dev/ffmpeg-3.3.2-win64-dev.zip
|
|
||||||
- 7z x ffmpeg-3.3.2-win64-dev.zip
|
|
||||||
- set CPATH=ffmpeg-3.3.2-win64-dev\include;%CPATH%
|
|
||||||
- curl -kLO https://ffmpeg.zeranoe.com/builds/win64/dev/ffmpeg-3.3.2-win64-static.zip
|
|
||||||
- 7z x ffmpeg-3.3.2-win64-static.zip
|
|
||||||
- set LIBRARY_PATH=ffmpeg-3.3.2-win64-static\lib;%LIBRARY_PATH%
|
|
||||||
- mingw32-make -j8
|
|
||||||
artifacts:
|
|
||||||
- path: release/KShare.exe
|
|
1
packages/arch/KShare-Stable/.gitignore
vendored
Normal file
1
packages/arch/KShare-Stable/.gitignore
vendored
Normal file
@ -0,0 +1 @@
|
|||||||
|
PKGBUILD.sample
|
27
packages/arch/KShare-Stable/PKGBUILD
Normal file
27
packages/arch/KShare-Stable/PKGBUILD
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
# Maintainer: ArsenArsen <arsenarsentmc@outlook.com>
|
||||||
|
pkgname=kshare
|
||||||
|
pkgver=4.1
|
||||||
|
pkgrel=1
|
||||||
|
conflicts=("kshare-git")
|
||||||
|
pkgdesc="A ShareX inspired cross platform utility written with Qt."
|
||||||
|
arch=('i686' 'x86_64')
|
||||||
|
url="https://github.com/ArsenArsen/KShare"
|
||||||
|
license=('MIT')
|
||||||
|
provides=('kshare=$pkgver')
|
||||||
|
depends=(qt5-base qt5-x11extras xcb-util-cursor ffmpeg libxfixes)
|
||||||
|
source=(git+https://github.com/ArsenArsen/KShare.git#tag=v${pkgver})
|
||||||
|
sha1sums=('SKIP')
|
||||||
|
|
||||||
|
build() {
|
||||||
|
cd "${srcdir}/KShare"
|
||||||
|
git submodule update --init --recursive
|
||||||
|
qmake
|
||||||
|
make
|
||||||
|
}
|
||||||
|
|
||||||
|
package() {
|
||||||
|
cd "${srcdir}/KShare"
|
||||||
|
mkdir -p "$pkgdir/usr/bin"
|
||||||
|
install ./KShare "$pkgdir/usr/bin/kshare"
|
||||||
|
}
|
||||||
|
|
5
packages/arch/KShare-Stable/release.sh
Executable file
5
packages/arch/KShare-Stable/release.sh
Executable file
@ -0,0 +1,5 @@
|
|||||||
|
sed "s/;VER;/$1/" PKGBUILD.sample > PKGBUILD
|
||||||
|
makepkg --printsrcinfo > .SRCINFO
|
||||||
|
git stage .SRCINFO PKGBUILD
|
||||||
|
git commit -m "Release $1"
|
||||||
|
git push
|
28
packages/arch/KShare/PKGBUILD
Normal file
28
packages/arch/KShare/PKGBUILD
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
# Maintainer: ArsenArsen <arsenarsentmc@outlook.com>
|
||||||
|
pkgname=kshare-git
|
||||||
|
pkgver=cfdecf06cedd9002b2fb4e1ef8df67c72fc540f94
|
||||||
|
pkgrel=1
|
||||||
|
conflicts=("kshare")
|
||||||
|
pkgdesc="A ShareX inspired cross platform utility written with Qt."
|
||||||
|
arch=('i686' 'x86_64')
|
||||||
|
url="https://github.com/ArsenArsen/KShare"
|
||||||
|
license=('MIT')
|
||||||
|
provides=('kshare=$pkgver')
|
||||||
|
depends=(qt5-base qt5-x11extras xcb-util-cursor ffmpeg libxfixes)
|
||||||
|
source=(git+https://github.com/ArsenArsen/KShare.git)
|
||||||
|
sha1sums=('SKIP')
|
||||||
|
|
||||||
|
build() {
|
||||||
|
cd "${srcdir}/KShare"
|
||||||
|
git checkout dev
|
||||||
|
git submodule update --init --recursive
|
||||||
|
qmake
|
||||||
|
make
|
||||||
|
}
|
||||||
|
|
||||||
|
package() {
|
||||||
|
cd "${srcdir}/KShare"
|
||||||
|
mkdir -p "$pkgdir/usr/bin"
|
||||||
|
install ./KShare "$pkgdir/usr/bin/kshare"
|
||||||
|
}
|
||||||
|
|
28
packages/arch/KShare/PKGBUILD.sample
Normal file
28
packages/arch/KShare/PKGBUILD.sample
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
# Maintainer: ArsenArsen <arsenarsentmc@outlook.com>
|
||||||
|
pkgname=kshare-git
|
||||||
|
pkgver=;COMMIT;
|
||||||
|
pkgrel=1
|
||||||
|
conflicts=("kshare")
|
||||||
|
pkgdesc="A ShareX inspired cross platform utility written with Qt."
|
||||||
|
arch=('i686' 'x86_64')
|
||||||
|
url="https://github.com/ArsenArsen/KShare"
|
||||||
|
license=('MIT')
|
||||||
|
provides=('kshare=$pkgver')
|
||||||
|
depends=(qt5-base qt5-x11extras xcb-util-cursor ffmpeg libxfixes)
|
||||||
|
source=(git+https://github.com/ArsenArsen/KShare.git)
|
||||||
|
sha1sums=('SKIP')
|
||||||
|
|
||||||
|
build() {
|
||||||
|
cd "${srcdir}/KShare"
|
||||||
|
git checkout dev
|
||||||
|
git submodule update --init --recursive
|
||||||
|
qmake
|
||||||
|
make
|
||||||
|
}
|
||||||
|
|
||||||
|
package() {
|
||||||
|
cd "${srcdir}/KShare"
|
||||||
|
mkdir -p "$pkgdir/usr/bin"
|
||||||
|
install ./KShare "$pkgdir/usr/bin/kshare"
|
||||||
|
}
|
||||||
|
|
12
packages/arch/KShare/pre-push
Executable file
12
packages/arch/KShare/pre-push
Executable file
@ -0,0 +1,12 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
if [[ `git rev-parse --abbrev-ref HEAD 2>/dev/null` == "dev" ]]
|
||||||
|
then
|
||||||
|
HASH=`git rev-parse --verify HEAD`
|
||||||
|
sed "s/;COMMIT;/c$HASH/g" /media/arsen/Data/Packages/KShare/PKGBUILD.sample > /media/arsen/Data/Packages/KShare/PKGBUILD
|
||||||
|
cd /media/arsen/Data/Packages/KShare
|
||||||
|
makepkg --printsrcinfo > .SRCINFO
|
||||||
|
git stage .
|
||||||
|
git commit -m "UPDATE $HASH"
|
||||||
|
git push
|
||||||
|
fi
|
||||||
|
|
1
packages/windows/LICENSE.txt
Normal file
1
packages/windows/LICENSE.txt
Normal file
@ -0,0 +1 @@
|
|||||||
|
BLANK: FILL IN BEFORE RELEASE
|
11
packages/windows/installer.iss.pattern.bottom
Normal file
11
packages/windows/installer.iss.pattern.bottom
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
;Source: "FILE"; DestDir: "{app}"; Flags: ignoreversion
|
||||||
|
; NOTE: Don't use "Flags: ignoreversion" on any shared system files
|
||||||
|
|
||||||
|
[Icons]
|
||||||
|
Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
|
||||||
|
Name: "{group}\{cm:UninstallProgram,{#MyAppName}}"; Filename: "{uninstallexe}"
|
||||||
|
Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
|
||||||
|
|
||||||
|
[Run]
|
||||||
|
Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
|
||||||
|
|
37
packages/windows/installer.iss.pattern.top
Normal file
37
packages/windows/installer.iss.pattern.top
Normal file
@ -0,0 +1,37 @@
|
|||||||
|
; Script generated by the Inno Script Studio Wizard.
|
||||||
|
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
|
||||||
|
|
||||||
|
#define MyAppName "KShare"
|
||||||
|
#define MyAppVersion ";VER;"
|
||||||
|
#define MyAppPublisher "ArsenArsen"
|
||||||
|
#define MyAppURL "http://kshare.arsenarsen.com/"
|
||||||
|
#define MyAppExeName "KShare.exe"
|
||||||
|
|
||||||
|
[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={{4D052A58-8982-4FB0-A542-22D1E3936AA9}
|
||||||
|
AppName={#MyAppName}
|
||||||
|
AppVersion={#MyAppVersion}
|
||||||
|
;AppVerName={#MyAppName} {#MyAppVersion}
|
||||||
|
AppPublisher={#MyAppPublisher}
|
||||||
|
AppPublisherURL={#MyAppURL}
|
||||||
|
AppSupportURL={#MyAppURL}
|
||||||
|
AppUpdatesURL={#MyAppURL}
|
||||||
|
DefaultDirName={pf}\{#MyAppName}
|
||||||
|
DefaultGroupName={#MyAppName}
|
||||||
|
LicenseFile=LICENSE.txt
|
||||||
|
OutputBaseFilename=setup
|
||||||
|
Compression=lzma
|
||||||
|
SolidCompression=yes
|
||||||
|
|
||||||
|
[Languages]
|
||||||
|
Name: "english"; MessagesFile: "compiler:Default.isl"
|
||||||
|
|
||||||
|
[Tasks]
|
||||||
|
Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
|
||||||
|
|
||||||
|
[Files]
|
||||||
|
Source: "KShare.exe"; DestDir: "{app}"; Flags: ignoreversion
|
||||||
|
|
Loading…
Reference in New Issue
Block a user