Dusk/GitAddonsManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

CI: cleanup git.exe

Browse Source
This commit is contained in:
woblight
2018-07-17 14:36:00 +02:00
parent d3381c4c79
commit f1efb0df5c
2 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitlab-ci.yml
+1 -1
View File
@@ -21,7 +21,7 @@ build:
winbuild: winbuild:
stage: build stage: build
before_script: before_script:
- zypper -q install -y wine-staging wine-staging-32bit wget make p7zip tar - zypper -q install -y wine-staging wine-staging-32bit wget make p7zip tar git
script: script:
- make -f CI.mk windeploy - make -f CI.mk windeploy
artifacts: artifacts:
CI.mk
+2 -9
View File
@@ -8,7 +8,7 @@ wine=$(WINEPATH) $(wineenv) wine
WINEPREFIX=WINEPREFIX="$(pwd)/wine" WINEPREFIX=WINEPREFIX="$(pwd)/wine"
WINEPATH=WINEPATH='C:\Program Files (x86)\CMake\bin;$(shell $(winepath) -w "$(pwd)/mingw32/bin");$(shell $(winepath) -w "$(pwd)/Qt/5.11.1/mingw53_32/bin")' QTDIR="Z:$(pwd)/Qt/5.11.1/mingw53_32/" WINEPATH=WINEPATH='C:\Program Files (x86)\CMake\bin;$(shell $(winepath) -w "$(pwd)/mingw32/bin");$(shell $(winepath) -w "$(pwd)/Qt/5.11.1/mingw53_32/bin")' QTDIR="Z:$(pwd)/Qt/5.11.1/mingw53_32/"
qmake_opts="QMAKE_INCDIR+=Z:$(pwd)/libgit2-0.27.2/include" "QMAKE_LIBDIR+=Z:$(pwd)/libgit2-0.27.2/build/" -spec win32-g++ qmake_opts="QMAKE_INCDIR+=Z:$(pwd)/libgit2-0.27.2/include" "QMAKE_LIBDIR+=Z:$(pwd)/libgit2-0.27.2/build/" -spec win32-g++
qmake=$(WINEPATH) $(wineenv) wine $(pwd)/Qt/5.11.1/mingw53_32/bin/qmake.exe qmake=$(wine) $(pwd)/Qt/5.11.1/mingw53_32/bin/qmake.exe
.PHONY: build .PHONY: build
build: build:
@@ -74,14 +74,7 @@ libgit2-0.27.2/build/libgit2.dll: wine/drive_c/Program\ Files\ (x86)/CMake libgi
cd libgit2-0.27.2/build && $(wine) cmake .. -DCMAKE_BINARY_DIR=libgit2-0.27.2/build -G"MinGW Makefiles" -DBUILD_CLAR=OFF cd libgit2-0.27.2/build && $(wine) cmake .. -DCMAKE_BINARY_DIR=libgit2-0.27.2/build -G"MinGW Makefiles" -DBUILD_CLAR=OFF
$(wine) mingw32-make -C libgit2-0.27.2/build -j $(shell nproc) $(wine) mingw32-make -C libgit2-0.27.2/build -j $(shell nproc)
PortableGit-2.18.0-32-bit.7z.exe: build_win32/GitAddonsManager.exe: Qt libgit2-0.27.2/build/libgit2.dll
wget https://github.com/git-for-windows/git/releases/download/v2.18.0.windows.1/PortableGit-2.18.0-32-bit.7z.exe
git/bin/git.exe: PortableGit-2.18.0-32-bit.7z.exe
7zr -ogit x PortableGit-2.18.0-32-bit.7z.exe
touch -c $@
build_win32/GitAddonsManager.exe: Qt libgit2-0.27.2/build/libgit2.dll mingw32/bin/gcc.exe git/bin/git.exe
mkdir -p build_win32 && cd build_win32 && $(qmake) $(qmake_opts) ../GitAddonsManager.pro GIT_DESCRIBE="$(shell git describe --tags)" mkdir -p build_win32 && cd build_win32 && $(qmake) $(qmake_opts) ../GitAddonsManager.pro GIT_DESCRIBE="$(shell git describe --tags)"
$(wine) mingw32-make -C build_win32 $(wine) mingw32-make -C build_win32