Commit d50a2536 authored by Diego Giovane Pasqualin's avatar Diego Giovane Pasqualin

Merge branch 'fix/windows-agent-generation' into 'master'

Fix/windows agent generation
parents a2c3224a dad9276f
......@@ -164,6 +164,11 @@ function bootstrap_create() {
chroot "${img_mount}" /bin/chown --recursive "${orig_uid}:usergroup" /home/user
fi
env="PATH=/bin:/usr/bin:/sbin:/usr/sbin"
chroot "${img_mount}" /usr/bin/env "$env" apt-get -y update
chroot "${img_mount}" /usr/bin/env "$env" apt-get -y install vim bison \
wget flex libssl-dev autoconf automake autotools-dev sudo
echo "Unmounting..."
umount_image
......
vim
bison
wget
flex
libssl-dev
......@@ -28,8 +28,11 @@ collect:
installer:
#@cd $(SRCDIR)
@cp ~/.wine/drive_c/windows/system32/python27.dll $(COLLECTDIR)/src/dist/
@cp ~/.wine/drive_c/windows/system32/api-ms-win-core-localregistry-l1-1-0.dll $(COLLECTDIR)/src/dist/
@cp ~/.wine/drive_c/windows/system32/api-ms-win-core-processthreads-l1-1-0.dll $(COLLECTDIR)/src/dist/
@cp ~/.wine/drive_c/windows/system32/api-ms-win-security-base-l1-1-0.dll $(COLLECTDIR)/src/dist/
@$(MAKENSIS) $(INSTALLERSRC)
@mkdir -p "windows-agent"
@cp build/ProInfoData.exe "windows-agent"
@cp 7zS.sfx "windows-agent"
@cp 7zS.sfx "windows-agent"
\ No newline at end of file
#!/bin/bash
REQUIRED_PKGS="wine gcc-mingw-w64 p7zip-full"
REQUIRED_PKGS="wine gcc-mingw-w64 p7zip-full autoconf"
pkgs_to_install=""
for pkg in $REQUIRED_PKGS; do
if ! dpkg --get-selections $pkg | grep -q -w install$; then
......@@ -8,7 +8,7 @@ for pkg in $REQUIRED_PKGS; do
fi
done
test -z $pkgs_to_install || sudo apt-get install $pkgs_to_install -y
test -z $pkgs_to_install || sudo add-apt-repository ppa:ubuntu-wine/ppa || sudo update apt-get installsudo apt-get install $pkgs_to_install -y
required_wine_pkgs="/tmp/nsis-2.45.exe /tmp/python-2.7.5.msi /tmp/py2exe.exe /tmp/pywin32.exe /tmp/wmi.exe"
......
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