Commit d2622d62 authored by rgaudin's avatar rgaudin
Browse files

updated build and CI rules

	added a .gitlab-ci.yml file to run the master image creation on gitlab (requires 5h timeout)
	updated .travis.yml
		included tests for now-bundled ansiblecube
		removed ansiblecube download/extraction
		using a newwer static qemu instead of compiling it (save time & failures)
		added download and compilation of XZ for linux (build-machine's version is too old. See #176)
	updated appveyor.yml:
		compiling on x64 before x86 (not important)
		removed ansiblecube download/extraction
		updated qemu to latest version
		added 7z (new dependency to extract content files onto data partition)
		added imdisk (new dependency to mount data partition)
	updated pibox-installer-win[32|64].spec
		simplified bundling of qemu
		removed deleted pibox_ideascube_conf.py
		added contents.json
		added imdisk and 7z dependencies
		added imports for the new image parameter
	requirements-[linux|macos|windows].txt
		added psutil, used to get number of cpu/cores
		added humanfriendly, used to parse and format sizes
		added requests, used to download files
parent 231bcee2
image: "python:3.4"
before_script:
- apt-get update
- DEBIAN_FRONTEND=noninteractive apt-get install -y locales openssh-client wget zip unzip tar python3-gi python3-gi-cairo python3-cairo gir1.2-gtk-3.0 libdbus-1-dev libdbus-glib-1-dev libffi-dev build-essential libssl-dev python3-dev libgdk-pixbuf2.0-dev
- sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && dpkg-reconfigure --frontend=noninteractive locales && update-locale LANG=en_US.UTF-8
# SSH key and known hosts handling
- eval $(ssh-agent -s)
- echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - > /dev/null
- mkdir -p ~/.ssh
- chmod 700 ~/.ssh
- ssh-keyscan download.kiwix.org >> ~/.ssh/known_hosts
- chmod 644 ~/.ssh/known_hosts
build-pibox-image:
stage: build
variables:
LANG: 'en_US.UTF-8'
script:
# download custom kernel
- wget http://download.kiwix.org/dev/pibox-installer-vexpress-boot.zip
- unzip pibox-installer-vexpress-boot.zip
# download a static qemu
- wget http://download.kiwix.org/dev/qemu-2.12.0-linux-x86_64.tar.gz
- tar xf qemu-2.12.0-linux-x86_64.tar.gz
# Install python dependancies
- pip3 install -r requirements-linux.txt
# Install and run pyinstaller
- pip3 install https://github.com/thiolliere/pyinstaller/archive/develop.zip
- pyinstaller --log-level=DEBUG pibox-installer-linux.spec
- cat build/pibox-installer-linux/warnpibox-installer-linux.txt
# start image builder
- eval "export OUT_IMG=pibox-master_$(date +"%Y-%m-%d").img"
- dist/pibox-installer image --ram 8G --root 7 --size 8 --out ${OUT_IMG}
- zip -9 ${OUT_IMG}.zip ${OUT_IMG}
- scp ${OUT_IMG}.zip upload@download.kiwix.org:/var/www/download.kiwix.org/plug/base/
only:
- schedules
- web
......@@ -5,12 +5,22 @@ before_install:
matrix:
include:
- language: python
python:
- "2.7"
sudo: false
install:
- pip install -r ansiblecube/tests/requirements-dev.txt
script:
- cd ansiblecube
- py.test
- os: osx
language: generic
install:
# Package pibox-installer
- brew update
- brew install qemu pygobject3 --with-python3 gtk+3 adwaita-icon-theme
- brew install pygobject3 --with-python3 gtk+3 adwaita-icon-theme
- python3 -m pip install -r requirements-macos.txt
- python3 -m pip install https://github.com/pyinstaller/pyinstaller/archive/93eec04eb2fbfc714d2c3453e04fd126e6a86f52.zip
......@@ -18,28 +28,9 @@ matrix:
- wget http://download.kiwix.org/dev/pibox-installer-vexpress-boot.zip
- unzip pibox-installer-vexpress-boot.zip
# Download playbook
- wget https://framagit.org/ideascube/ansiblecube/repository/oneUpdateFile0.4/archive.zip -O oneUpdateFile0.4.zip
- unzip oneUpdateFile0.4.zip
- mv ansiblecube-oneUpdateFile0.4* ansiblecube
# Bundle QEMU
- git clone https://github.com/auriamg/macdylibbundler/
- cd macdylibbundler/
- git checkout 84440587e1b2e4e9e0727cbba7a455b96820e40a
- make
- cd ..
- mkdir qemu
- cd qemu
- cp /usr/local/bin/qemu-img .
- cp /usr/local/bin/qemu-system-arm .
- chmod u+w qemu-img
- chmod u+w qemu-system-arm
- ../macdylibbundler/dylibbundler -d . -p @executable_path/ -b -x ./qemu-system-arm -x ./qemu-img
- chmod u-w qemu-img
- chmod u-w qemu-system-arm
- otool -L *
- cd ..
- wget http://download.kiwix.org/dev/qemu-2.12.0_macOS.tar
- tar xf qemu-2.12.0_macOS.tar
# Run PyInstaller
- pyinstaller --log-level=DEBUG pibox-installer-macos.spec
......@@ -88,40 +79,24 @@ matrix:
python-dev
python3-dev
libgdk-pixbuf2.0-dev
env:
- QEMU_VERSION=2.10.1
- QEMU_DIR=qemu-$QEMU_VERSION
- QEMU_ARCHIVE=$QEMU_DIR.tar.xz
script:
# update XZ (trusty version -5.0.5 is too old)
- wget http://download.kiwix.org/dev/xz-5.2.4.tar.gz
- tar xf xz-5.2.4.tar.gz
- cd xz-5.2.4
- ./configure --enable-shared
- make
- sudo make install
- sudo ldconfig
- cd ..
# Download pibox-installer-vexpress-boot
- wget http://download.kiwix.org/dev/pibox-installer-vexpress-boot.zip
- unzip pibox-installer-vexpress-boot.zip
# Download playbook
- wget https://framagit.org/ideascube/ansiblecube/repository/oneUpdateFile0.4/archive.zip -O oneUpdateFile0.4.zip
- unzip oneUpdateFile0.4.zip
- mv ansiblecube-oneUpdateFile0.4* ansiblecube
# Compile QEMU statically
- wget http://download.qemu-project.org/$QEMU_ARCHIVE
- tar -xf $QEMU_ARCHIVE
- rm $QEMU_ARCHIVE
- cd $QEMU_DIR
- ./configure
--target-list=arm-softmmu
--static
--disable-gtk
--disable-cocoa
--disable-libusb
--disable-glusterfs
--disable-smartcard
--disable-usb-redir
--python=python2
- make
- cp arm-softmmu/qemu-system-arm ..
- cp qemu-img ..
- cd ..
# get static QEMU
- wget http://download.kiwix.org/dev/qemu-2.12.0-linux-x86_64.tar.gz
- tar xf qemu-2.12.0-linux-x86_64.tar.gz
# Install python dependancies
- pip3 install -r requirements-linux.txt
......
......@@ -7,8 +7,8 @@ image: Visual Studio 2015
build: off
platform:
- x86
- x64
- x86
install:
# decrypt certificate
......@@ -19,16 +19,11 @@ install:
- appveyor DownloadFile "http://download.kiwix.org/dev/pibox-installer-vexpress-boot.zip"
- 7z.exe x pibox-installer-vexpress-boot.zip
# Download playbook
- appveyor DownloadFile "https://framagit.org/ideascube/ansiblecube/repository/oneUpdateFile0.4/archive.zip" -FileName "oneUpdateFile0.4.zip"
- 7z.exe x oneUpdateFile0.4.zip
- move ansiblecube-oneUpdateFile0.4* ansiblecube
# Install pygobject
# pygi-aio provides a way to install from cmd even if it is not documented
# the only package to install is GTK with GIR
# note: we don't use msys2 because pyinstaller fails to install on msys2
- appveyor DownloadFile "https://sourceforge.net/projects/pygobjectwin32/files/pygi-aio-3.18.2_rev12-setup_549872deadabb77a91efbc56c50fe15f969e5681.exe/download" -FileName "pygi-aio-setup.exe"
- appveyor DownloadFile "http://download.kiwix.org/dev/pygi-aio-3.18.2_rev12-setup_549872deadabb77a91efbc56c50fe15f969e5681.exe" -FileName "pygi-aio-setup.exe"
- mkdir pygi-aio-setup
- cd pygi-aio-setup
- set SOURCEPATH=%cd%
......@@ -59,11 +54,30 @@ install:
# Install qemu
- mkdir "C:\Program Files\qemu"
- cd "C:\Program Files\qemu"
- if %platform%==x86 appveyor DownloadFile "https://qemu.weilnetz.de/w32/2017/qemu-w32-setup-20171006.exe" -FileName "qemu-setup.exe"
- if %platform%==x64 appveyor DownloadFile "https://qemu.weilnetz.de/w64/2017/qemu-w64-setup-20171006.exe" -FileName "qemu-setup.exe"
- if %platform%==x86 appveyor DownloadFile "https://qemu.weilnetz.de/w32/qemu-w32-setup-20180430.exe" -FileName "qemu-setup.exe"
- if %platform%==x64 appveyor DownloadFile "https://qemu.weilnetz.de/w64/qemu-w64-setup-20180430.exe" -FileName "qemu-setup.exe"
- 7z x qemu-setup.exe
- del qemu-setup.exe
- move qemu-system-arm.exe qemu-arm.exe
- rmdir /S /Q keymaps lib share $PLUGINSDIR
- del qemu-system-*
- move qemu-arm.exe qemu-system-arm.exe
- dir "C:\Program Files\qemu"
# bundle 7zip
- mkdir "C:\Program Files\7zextra"
- cd "C:\Program Files\7zextra"
- appveyor DownloadFile "https://www.7-zip.org/a/7z1805-extra.7z"
- 7z.exe x 7z1805-extra.7z
# Copy Imdisk Installer
- mkdir "C:\Program Files\imdiskinst"
- cd "C:\Program Files\imdiskinst"
- appveyor DownloadFile "http://download.kiwix.org/dev/imdiskinst.exe" -FileName "imdiskinst.exe"
- 7z x imdiskinst.exe
- del imdiskinst.exe
- dir "C:\Program Files\imdiskinst"
# Run pyinstaller and show warning
- cd C:\projects\pibox-installer
- if %platform%==x86 C:\Python34\python.exe C:\Python34\Scripts\pyinstaller-script.py --log-level=DEBUG pibox-installer-win32.spec
......@@ -71,7 +85,6 @@ install:
- if %platform%==x86 type build\pibox-installer-win32\warnpibox-installer-win32.txt
- if %platform%==x64 type build\pibox-installer-win64\warnpibox-installer-win64.txt
# Deploy
- cd C:\projects\pibox-installer\dist\pibox-installer
- 7z.exe a -m0=Copy C:\projects\pibox-installer\windows_bundle\pibox-installer.exe *
......
......@@ -7,11 +7,11 @@ a = Analysis(['pibox-installer/__main__.py'],
pathex=['.'],
binaries=[('qemu-system-arm', '.'), ('qemu-img', '.')],
datas=[('ui.glade', '.'),
('pibox_ideascube_conf.py', '.'),
('contents.json', '.'),
('pibox-installer-logo.png', '.'),
('ansiblecube', 'ansiblecube'),
('pibox-installer-vexpress-boot', 'pibox-installer-vexpress-boot')],
hiddenimports=['gui', 'cli'],
hiddenimports=['gui', 'cli', 'image'],
hookspath=['additional-hooks'],
runtime_hooks=[],
excludes=[],
......
......@@ -10,11 +10,11 @@ a = Analysis(['pibox-installer/__main__.py'],
pathex=['.'],
binaries=[("qemu/" + file, '.') for file in files],
datas=[('ui.glade', '.'),
('pibox_ideascube_conf.py', '.'),
('contents.json', '.'),
('pibox-installer-logo.png', '.'),
('ansiblecube', 'ansiblecube'),
('pibox-installer-vexpress-boot', 'pibox-installer-vexpress-boot')],
hiddenimports=['gui', 'cli'],
hiddenimports=['gui', 'cli', 'image'],
hookspath=['additional-hooks'],
runtime_hooks=[],
excludes=[],
......
# -*- mode: python -*-
import os
import site
block_cipher = None
typelib_path = os.path.join(site.getsitepackages()[1], 'gnome', 'lib', 'girepository-1.0')
a = Analysis(['pibox-installer/__main__.py'],
pathex=['.'],
binaries=[('C:\Program Files\qemu\qemu-system-arm.exe', 'qemu'),
('C:\Program Files\qemu\qemu-img.exe', 'qemu'),
('C:\Program Files\qemu\iconv.dll', 'qemu'),
('C:\Program Files\qemu\libfreetype-6.dll', 'qemu'),
('C:\Program Files\qemu\libgnutlsxx-28.dll', 'qemu'),
('C:\Program Files\qemu\liblzo2-2.dll', 'qemu'),
('C:\Program Files\qemu\libpng16-16.dll', 'qemu'),
('C:\Program Files\qemu\libasprintf-0.dll', 'qemu'),
('C:\Program Files\qemu\libgailutil-3-0.dll', 'qemu'),
('C:\Program Files\qemu\libgobject-2.0-0.dll', 'qemu'),
('C:\Program Files\qemu\libmenuw6.dll', 'qemu'),
('C:\Program Files\qemu\libssh2-1.dll', 'qemu'),
('C:\Program Files\qemu\libatk-1.0-0.dll', 'qemu'),
('C:\Program Files\qemu\libgcc_s_sjlj-1.dll', 'qemu'),
('C:\Program Files\qemu\libgthread-2.0-0.dll', 'qemu'),
('C:\Program Files\qemu\libncurses++w6.dll', 'qemu'),
('C:\Program Files\qemu\libstdc++-6.dll', 'qemu'),
('C:\Program Files\qemu\libbz2-1.dll', 'qemu'),
('C:\Program Files\qemu\libgdk-3-0.dll', 'qemu'),
('C:\Program Files\qemu\libgtk-3-0.dll', 'qemu'),
('C:\Program Files\qemu\libncursesw6.dll', 'qemu'),
('C:\Program Files\qemu\libtasn1-6.dll', 'qemu'),
('C:\Program Files\qemu\libcairo-2.dll', 'qemu'),
('C:\Program Files\qemu\libgdk_pixbuf-2.0-0.dll', 'qemu'),
('C:\Program Files\qemu\libgtkreftestprivate-0.dll', 'qemu'),
('C:\Program Files\qemu\libnettle-4.dll', 'qemu'),
('C:\Program Files\qemu\libtiff-5.dll', 'qemu'),
('C:\Program Files\qemu\libcairo-gobject-2.dll', 'qemu'),
('C:\Program Files\qemu\libgio-2.0-0.dll', 'qemu'),
('C:\Program Files\qemu\libharfbuzz-0.dll', 'qemu'),
('C:\Program Files\qemu\libnghttp2-14.dll', 'qemu'),
('C:\Program Files\qemu\libtiffxx-5.dll', 'qemu'),
('C:\Program Files\qemu\libcairo-script-interpreter-2.dll', 'qemu'),
('C:\Program Files\qemu\libglib-2.0-0.dll', 'qemu'),
('C:\Program Files\qemu\libhogweed-2.dll', 'qemu'),
('C:\Program Files\qemu\libp11-kit-0.dll', 'qemu'),
('C:\Program Files\qemu\libturbojpeg-0.dll', 'qemu'),
('C:\Program Files\qemu\libcurl-4.dll', 'qemu'),
('C:\Program Files\qemu\libgmodule-2.0-0.dll', 'qemu'),
('C:\Program Files\qemu\libintl-8.dll', 'qemu'),
('C:\Program Files\qemu\libpanelw6.dll', 'qemu'),
('C:\Program Files\qemu\libusb-1.0.dll', 'qemu'),
('C:\Program Files\qemu\libepoxy-0.dll', 'qemu'),
('C:\Program Files\qemu\libgmp-10.dll', 'qemu'),
('C:\Program Files\qemu\libjasper-1.dll', 'qemu'),
('C:\Program Files\qemu\libpango-1.0-0.dll', 'qemu'),
('C:\Program Files\qemu\libusbredirparser-1.dll', 'qemu'),
('C:\Program Files\qemu\libexpat-1.dll', 'qemu'),
('C:\Program Files\qemu\libgmpxx-4.dll', 'qemu'),
('C:\Program Files\qemu\libjbig-2.dll', 'qemu'),
('C:\Program Files\qemu\libpangocairo-1.0-0.dll', 'qemu'),
('C:\Program Files\qemu\SDL2.dll', 'qemu'),
('C:\Program Files\qemu\libffi-6.dll', 'qemu'),
('C:\Program Files\qemu\libgnurx-0.dll', 'qemu'),
('C:\Program Files\qemu\libjbig85-2.dll', 'qemu'),
('C:\Program Files\qemu\libpangoft2-1.0-0.dll', 'qemu'),
('C:\Program Files\qemu\zlib1.dll', 'qemu'),
('C:\Program Files\qemu\libfontconfig-1.dll', 'qemu'),
('C:\Program Files\qemu\libgnutls-28.dll', 'qemu'),
('C:\Program Files\qemu\libjpeg-8.dll', 'qemu'),
('C:\Program Files\qemu\libpangowin32-1.0-0.dll', 'qemu'),
('C:\Program Files\qemu\libformw6.dll', 'qemu'),
('C:\Program Files\qemu\libgnutls-openssl-27.dll', 'qemu'),
('C:\Program Files\qemu\liblzma-5.dll', 'qemu'),
('C:\Program Files\qemu\libpixman-1-0.dll', 'qemu')],
binaries=[(os.path.join(typelib_path, tl), 'gi_typelibs') for tl in os.listdir(typelib_path)],
datas=[('ui.glade', '.'),
('pibox_ideascube_conf.py', '.'),
('contents.json', '.'),
('pibox-installer-logo.png', '.'),
('ansiblecube', 'ansiblecube'),
('pibox-installer-vexpress-boot', 'pibox-installer-vexpress-boot')],
hiddenimports=['gui', 'cli'],
('pibox-installer-vexpress-boot', 'pibox-installer-vexpress-boot'),
('C:\Program Files\qemu', 'qemu'),
('C:\Program Files\imdiskinst', 'imdiskinst'),
('C:\Program Files\\7zextra\\7za.dll', '.'),
('C:\Program Files\\7zextra\\7za.exe', '.'),
('C:\Program Files\\7zextra\\7zxa.dll', '.')],
hiddenimports=['gui', 'cli', 'image'],
hookspath=['additional-hooks'],
runtime_hooks=[],
excludes=[],
......
# -*- mode: python -*-
import os
import site
block_cipher = None
typelib_path = os.path.join(site.getsitepackages()[1], 'gnome', 'lib', 'girepository-1.0')
a = Analysis(['pibox-installer/__main__.py'],
pathex=['.'],
binaries=[('C:\Program Files\qemu\qemu-system-arm.exe', 'qemu'),
('C:\Program Files\qemu\qemu-img.exe', 'qemu'),
('C:\Program Files\qemu\iconv.dll', 'qemu'),
('C:\Program Files\qemu\libfreetype-6.dll', 'qemu'),
('C:\Program Files\qemu\libgnutlsxx-28.dll', 'qemu'),
('C:\Program Files\qemu\liblzo2-2.dll', 'qemu'),
('C:\Program Files\qemu\libpng16-16.dll', 'qemu'),
('C:\Program Files\qemu\libasprintf-0.dll', 'qemu'),
('C:\Program Files\qemu\libgailutil-3-0.dll', 'qemu'),
('C:\Program Files\qemu\libgobject-2.0-0.dll', 'qemu'),
('C:\Program Files\qemu\libmenuw6.dll', 'qemu'),
('C:\Program Files\qemu\libssh2-1.dll', 'qemu'),
('C:\Program Files\qemu\libatk-1.0-0.dll', 'qemu'),
('C:\Program Files\qemu\libgcc_s_seh-1.dll', 'qemu'),
('C:\Program Files\qemu\libgthread-2.0-0.dll', 'qemu'),
('C:\Program Files\qemu\libncurses++w6.dll', 'qemu'),
('C:\Program Files\qemu\libstdc++-6.dll', 'qemu'),
('C:\Program Files\qemu\libbz2-1.dll', 'qemu'),
('C:\Program Files\qemu\libgdk-3-0.dll', 'qemu'),
('C:\Program Files\qemu\libgtk-3-0.dll', 'qemu'),
('C:\Program Files\qemu\libncursesw6.dll', 'qemu'),
('C:\Program Files\qemu\libtasn1-6.dll', 'qemu'),
('C:\Program Files\qemu\libcairo-2.dll', 'qemu'),
('C:\Program Files\qemu\libgdk_pixbuf-2.0-0.dll', 'qemu'),
('C:\Program Files\qemu\libgtkreftestprivate-0.dll', 'qemu'),
('C:\Program Files\qemu\libnettle-4.dll', 'qemu'),
('C:\Program Files\qemu\libtiff-5.dll', 'qemu'),
('C:\Program Files\qemu\libcairo-gobject-2.dll', 'qemu'),
('C:\Program Files\qemu\libgio-2.0-0.dll', 'qemu'),
('C:\Program Files\qemu\libharfbuzz-0.dll', 'qemu'),
('C:\Program Files\qemu\libnghttp2-14.dll', 'qemu'),
('C:\Program Files\qemu\libtiffxx-5.dll', 'qemu'),
('C:\Program Files\qemu\libcairo-script-interpreter-2.dll', 'qemu'),
('C:\Program Files\qemu\libglib-2.0-0.dll', 'qemu'),
('C:\Program Files\qemu\libhogweed-2.dll', 'qemu'),
('C:\Program Files\qemu\libp11-kit-0.dll', 'qemu'),
('C:\Program Files\qemu\libturbojpeg-0.dll', 'qemu'),
('C:\Program Files\qemu\libcurl-4.dll', 'qemu'),
('C:\Program Files\qemu\libgmodule-2.0-0.dll', 'qemu'),
('C:\Program Files\qemu\libintl-8.dll', 'qemu'),
('C:\Program Files\qemu\libpanelw6.dll', 'qemu'),
('C:\Program Files\qemu\libusb-1.0.dll', 'qemu'),
('C:\Program Files\qemu\libepoxy-0.dll', 'qemu'),
('C:\Program Files\qemu\libgmp-10.dll', 'qemu'),
('C:\Program Files\qemu\libjasper-1.dll', 'qemu'),
('C:\Program Files\qemu\libpango-1.0-0.dll', 'qemu'),
('C:\Program Files\qemu\libusbredirparser-1.dll', 'qemu'),
('C:\Program Files\qemu\libexpat-1.dll', 'qemu'),
('C:\Program Files\qemu\libgmpxx-4.dll', 'qemu'),
('C:\Program Files\qemu\libjbig-2.dll', 'qemu'),
('C:\Program Files\qemu\libpangocairo-1.0-0.dll', 'qemu'),
('C:\Program Files\qemu\SDL2.dll', 'qemu'),
('C:\Program Files\qemu\libffi-6.dll', 'qemu'),
('C:\Program Files\qemu\libgnurx-0.dll', 'qemu'),
('C:\Program Files\qemu\libjbig85-2.dll', 'qemu'),
('C:\Program Files\qemu\libpangoft2-1.0-0.dll', 'qemu'),
('C:\Program Files\qemu\zlib1.dll', 'qemu'),
('C:\Program Files\qemu\libfontconfig-1.dll', 'qemu'),
('C:\Program Files\qemu\libgnutls-28.dll', 'qemu'),
('C:\Program Files\qemu\libjpeg-8.dll', 'qemu'),
('C:\Program Files\qemu\libpangowin32-1.0-0.dll', 'qemu'),
('C:\Program Files\qemu\libformw6.dll', 'qemu'),
('C:\Program Files\qemu\libgnutls-openssl-27.dll', 'qemu'),
('C:\Program Files\qemu\liblzma-5.dll', 'qemu'),
('C:\Program Files\qemu\libpixman-1-0.dll', 'qemu')],
binaries=[(os.path.join(typelib_path, tl), 'gi_typelibs') for tl in os.listdir(typelib_path)],
datas=[('ui.glade', '.'),
('pibox_ideascube_conf.py', '.'),
('contents.json', '.'),
('pibox-installer-logo.png', '.'),
('ansiblecube', 'ansiblecube'),
('pibox-installer-vexpress-boot', 'pibox-installer-vexpress-boot')],
hiddenimports=['gui', 'cli'],
('pibox-installer-vexpress-boot', 'pibox-installer-vexpress-boot'),
('C:\Program Files\qemu', 'qemu'),
('C:\Program Files\imdiskinst', 'imdiskinst'),
('C:\Program Files\\7zextra\\x64\\7za.dll', '.'),
('C:\Program Files\\7zextra\\x64\\7za.exe', '.'),
('C:\Program Files\\7zextra\\x64\\7zxa.dll', '.')],
hiddenimports=['gui', 'cli', 'image'],
hookspath=['additional-hooks'],
runtime_hooks=[],
excludes=[],
......
......@@ -14,3 +14,6 @@ PyYAML==3.12
six==1.10.0
langcodes==1.4.0
path.py==11.0
psutil==5.4.5
humanfriendly==4.12
requests==2.18.4
......@@ -13,3 +13,6 @@ PyYAML==3.12
six==1.10.0
langcodes==1.4.0
path.py==11.0
psutil==5.4.5
humanfriendly==4.12
requests==2.18.4
......@@ -13,3 +13,6 @@ PyYAML==3.12
six==1.10.0
langcodes==1.4.0
path.py==11.0
psutil==5.4.5
humanfriendly==4.12
requests==2.18.4
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment