Modified windows installation instructions for dockerized version

3 files changed, 56 insertions, 48 deletions

diff --git a/create-windows-setup-instructions b/create-windows-setup-instructions
new file mode 100644
index 0000000..a906b3d
--- /dev/null
+++ b/create-windows-setup-instructions
@@ -0,0 +1,56 @@
+

+# Alpha version - process is working, instructions not fully tested for minor details yet.

+

+Instructions for creating a windows package for q:

+

+The installation is based on a wine docker container.

+

+fetch all files from https://github.com/harelba/packages-for-q/tree/master/artifactory-for-packaging into dist/windows folder.

+

+extract pyinstaller2.1 zip file inside the folder.

+

+d=`pwd`

+cid1=`docker run -d -v ${d}:/q -e VNC_PASSWORD=newPW -p 5900:5900 suchja/x11server`

+cid2=`docker run -d --rm -i --link ${cid1}:xserver --volumes-from ${cid1} suchja/wine:latest /bin/bash`

+

+sleep 1

+

+function kill_container {

+  tmp=`docker kill ${cid1} ${cid2}`

+}

+trap kill_container EXIT

+

+docker exec -it ${cid2} /bin/bash 

+

+

+inside the docker container prompt:

+

+  export DISPLAY=xserver:0

+

+  wine wineboot --init

+

+  cd ~/.wine/dosdevices/

+

+  ln -s /q "q:"

+

+  wine msiexec /i q:\\dist\\windows\\python-2.7.13.msi

+

+  wine q:\\dist\\windows\\pywin32-219.win32-py2.7.exe

+

+  mkdir ~/.wine/drive_c/q-build-environment

+

+  cp -r /q/dist/windows/PyInstaller2.1 ~/.wine/drive_c/q-build-environment/

+

+  wine q:\\dist\\windows\\nsis-2.46-setup.exe - install to c:\\q-build-environment\\nsis

+

+  wine c:\\python27\\python.exe c:\\q-build-environment\\PyInstaller-2.1\\pyinstaller.py -F --distpath=win_output --workpath=win_build q:\\bin\\q

+

+  wine c:\\q-build-environment\\nsis\\makensis.exe -DVERSION=1.6.2.0 q:\\dist\\q-TextAsData-with-path.nsi

+

+run the installation file and check that the install works properly:

+

+  wine setup.exe

+

+

+

+

diff --git a/dist/create-windows-setup-instructions b/dist/create-windows-setup-instructions
deleted file mode 100644
index bf414e9..0000000
--- a/dist/create-windows-setup-instructions
+++ /dev/null
@@ -1,41 +0,0 @@
-

-Instructions for creating a windows package for q:

-

-1. Prepare the environment:

-

-	a. Drive Q: needs to point to the source code folder (use VirtualBox's shared folder or checkout from it and map it to Q:)

-

-	b. Create C:\q-build-environment folder 

-

-	c. Install the following:

-

-		1. Python 2.7 (32 bit) - Make sure to add python.exe to the path in the installation instructions

-		2. Pywin32 - pywin32-219.win32-py2.7.exe (make sure it's 32 bit)

-		3. PyInstaller 2.1 (Extract the zip file into c:\q-build-environment\ so the files will reside in c:\q-build-environment\PyInstaller-2.1\)

-		4. NSIS - nsis-2.46-setup.exe (into c:\q-build-environment\nsis)

-

-2. Go to q:\dist and remove the folder

-

-3. Remove the folder win_output, win_build and any setup*.exe files from q:\dist

-

-4. Run the following to compile q.exe:

-

-	python.exe c:\q-build-environment\PyInstaller-2.1\pyinstaller.py -F --distpath=win_output --workpath=win_build q:\bin\q

-

-	output will reside in win_output\

-

-5. Run the following in order to package it to an installer:

-

-	Make sure to set the version number properly - Note that windows requires versions to be in the format X.X.X.X

-

-	c:\q-build-environment\nsis\makensis.exe -DVERSION=<version-number> q-TextAsData-with-path.nsi

-

-	setup.exe will reside in the current folder

-

-6. Rename the file to the proper version:

-

-	ren q:\dist\setup.exe q:\dist\setup-<version-number>.exe

-

-7. Put the file in the packages-for-q repository

-

-

diff --git a/dist/pre-requisites b/dist/pre-requisites
deleted file mode 100644
index 1772614..0000000
--- a/dist/pre-requisites
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-sudo apt-get install gem
-sudo gem install ruby-ronn
-sudo apt-get install rpm
-sudo apt-get install alien
-pyinstaller (For windows version creation)