diff --git a/build/build-env.sh b/build/build-env.sh index 55c2ed1938f467409ec8bd3197c47b077c397333..0a7cab1a82ad2f11f1a972948399d22470d7a5c2 100755 --- a/build/build-env.sh +++ b/build/build-env.sh @@ -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 diff --git a/build/packages-to-be-installed b/build/packages-to-be-installed deleted file mode 100644 index df107c40e7a414eb4b78bedcf735175249234fd5..0000000000000000000000000000000000000000 --- a/build/packages-to-be-installed +++ /dev/null @@ -1,5 +0,0 @@ -vim -bison -wget -flex -libssl-dev diff --git a/windows-installer/Makefile b/windows-installer/Makefile index 133efa7d2ec70d9bc66a711d67370e2d37c04817..c19ba2c721a7727e7dfd1c26ceb7d78bec3423ed 100644 --- a/windows-installer/Makefile +++ b/windows-installer/Makefile @@ -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 diff --git a/windows-installer/install-essencials.sh b/windows-installer/install-essencials.sh index 6f979680d4b576e8dc2e3b5e75a439e525fb56c4..493c37d011842a1c8df93d1a61d2627b1db1866d 100755 --- a/windows-installer/install-essencials.sh +++ b/windows-installer/install-essencials.sh @@ -1,6 +1,6 @@ #!/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"