diff --git a/appveyor/fix_desktop_makefile.py b/appveyor/fix_desktop_makefile.py new file mode 100644 index 0000000..509abbd --- /dev/null +++ b/appveyor/fix_desktop_makefile.py @@ -0,0 +1,29 @@ +import re, sys, os + +makefile = sys.argv[-1] +print("Patching '{}'".format(makefile)) + +with open(makefile, 'r') as f: + lines = f.readlines() + +with open(makefile, 'w') as f: + for line in lines: +# if "/SUBSYSTEM:WINDOWS" in line: +# line = line.replace("/SUBSYSTEM:WINDOWS", "/SUBSYSTEM:CONSOLE") +# f.write(line) +# continue + if not line.startswith('LIBS '): + f.write(line) + continue + print("-- INPUT : {}".format(line)) + for lib in ('kiwix', 'zim', 'pugixml', 'z', 'zstd'): + line = line.replace('{}.lib'.format(lib), 'lib{}.a'.format(lib)) + for lib in ('lzma', 'curl'): + line = line.replace('lib{}.lib'.format(lib), 'lib{}.a'.format(lib)) + line = line.strip() +# line += " pthreadVC2.lib" +# line += " icuin.lib icudt.lib icuuc.lib" + line += " Rpcrt4.lib Ws2_32.lib winmm.lib Shlwapi.lib" + line += os.linesep + print("++ OUTPUT : {}".format(line)) + f.write(line) diff --git a/appveyor/install_kiwix-desktop.cmd b/appveyor/install_kiwix-desktop.cmd index 760d0a4..9425429 100644 --- a/appveyor/install_kiwix-desktop.cmd +++ b/appveyor/install_kiwix-desktop.cmd @@ -2,12 +2,10 @@ REM ======================================================== REM Install kiwix-desktop git clone https://github.com/kiwix/kiwix-desktop || exit /b 1 cd kiwix-desktop -echo "Getting fix_desktop" -curl -fsSL -O http://public.kymeria.fr/KIWIX/windows/fix_desktop_makefile.py_ || exit /b 1 echo "Running qmake" C:\Qt\5.12\msvc2017_64\bin\qmake.exe "CONFIG+=static" || exit /b 1 echo "Running fix_desktop" -C:\Python36\Python fix_desktop_makefile.py_ Makefile.Release || exit /b 1 +C:\Python36\Python ..\appveyor\fix_desktop_makefile.py Makefile.Release || exit /b 1 echo "Running nmake" nmake || exit /b 1 cd ..