Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update README for Windows #1309

Merged
merged 89 commits into from
Feb 2, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
89 commits
Select commit Hold shift + click to select a range
367e633
Merge pull request #9 from kliment/master
DivingDuck Jan 26, 2021
acdb999
Merge pull request #10 from kliment/master
DivingDuck Jan 27, 2021
8ea0861
Merge pull request #11 from kliment/master
DivingDuck Jan 28, 2021
0c8630d
Merge pull request #12 from kliment/master
DivingDuck Jan 29, 2021
ab934c9
Merge pull request #13 from kliment/master
DivingDuck Jan 29, 2021
15d6981
Merge pull request #14 from kliment/master
DivingDuck Feb 1, 2021
c3ae0d0
Merge pull request #15 from kliment/master
DivingDuck Feb 2, 2021
33e6535
Merge pull request #16 from kliment/master
DivingDuck Feb 2, 2021
9943b0d
Merge pull request #17 from kliment/master
DivingDuck Feb 7, 2021
d11f35b
cleanup old left overs and add library pycairo for running projector …
DivingDuck Feb 10, 2021
47b6b7e
forgot to delete --hidden-import=cairosvg
DivingDuck Feb 10, 2021
1fbde03
add simplejson polygon3
DivingDuck Feb 10, 2021
2d35b6d
Update for Projector
DivingDuck Feb 11, 2021
250e986
missing quotation marks for additional --add-data entries
DivingDuck Feb 11, 2021
e989927
Corrections due to incompatibility with Python >3.7 and actual wx
DivingDuck Feb 11, 2021
3d47871
Bundling GTK3 runtime library to Pronterface for Windows 10-64bit
DivingDuck Feb 11, 2021
4bbebc2
delete local GTK files
DivingDuck Feb 14, 2021
33851bb
Test for new GTK3 bundling via submodule
DivingDuck Feb 15, 2021
f81b01f
once more
DivingDuck Feb 15, 2021
c8abfb5
test for submodules
DivingDuck Feb 25, 2021
2b7130c
Compile with Py 3.7 instead of 3.8 for test wx problem
DivingDuck Feb 28, 2021
0cfa1f1
# Add Python version 3.7 and 3.9 for being able to test issue #1170 a…
DivingDuck Feb 28, 2021
e3f1ea0
Update for building Projector x32 and add a description how to use
DivingDuck Feb 28, 2021
84c90a1
update submodule in printrun to new version with GTK3 x32 binaries
DivingDuck Feb 28, 2021
aab2b5c
Select GTK-3 binaries based on available bundle and x32/x64 architecture
DivingDuck Mar 1, 2021
c5fed48
Fix for
DivingDuck Mar 1, 2021
49254be
new fix
DivingDuck Mar 1, 2021
d54ef71
add fix for x32bit, use x86 ...
DivingDuck Mar 1, 2021
dfde8a9
Make GTK3 a submodule of Printrun, delete GTK3 files from this reposi…
DivingDuck Mar 2, 2021
cd8736f
forgot to update date
DivingDuck Mar 2, 2021
7a5c1b8
Test for wxPython 4.1.2a1.dev5165+64e5d863
DivingDuck Mar 3, 2021
a1284d4
Update Submodule
DivingDuck Mar 8, 2021
a546c88
Workaround. Update wxpython to latest development version as these se…
DivingDuck Mar 20, 2021
0c4109e
Merge branch 'kliment:master' into master
DivingDuck May 10, 2021
dc95d72
Add building of pronsole executable to release_windows.bat
DivingDuck May 31, 2021
ce6ac80
Merge branch 'kliment:master' into test
DivingDuck May 31, 2021
1c5aa23
Merge branch 'kliment:master' into master
DivingDuck Aug 12, 2021
dd8b92f
Merge branch 'kliment:master' into test
DivingDuck Aug 12, 2021
e6991d7
Merge branch 'kliment:master' into master
DivingDuck Nov 12, 2021
8948dba
Merge branch 'kliment:master' into test
DivingDuck Nov 23, 2021
2911540
Merge branch 'kliment:master' into master
DivingDuck Nov 23, 2021
915735b
Update release_windows.bat: some more descriptions and further infor…
DivingDuck Nov 23, 2021
358bcb0
Delete pronsole.spec
DivingDuck Dec 18, 2021
cfcce3b
Update windows workflows. Add python 3.6+3.9
DivingDuck Dec 18, 2021
6ebc450
Check if wxpython version 4.1.2a1.dev5226+a843ed14 works for x86 and …
DivingDuck Dec 18, 2021
b788af2
error in expression
DivingDuck Dec 18, 2021
b6c8ad9
Add Python 3.10 to github Workflow (windows) for first test
DivingDuck Dec 21, 2021
77e33d8
Add Python 3.10 to github Workflow (windows)
DivingDuck Dec 21, 2021
e509451
remove python '3.10' because numpy is not ready for Python 3.10 (2021…
DivingDuck Dec 21, 2021
f969102
Update submodule to e26b8dd
DivingDuck Jan 12, 2022
85e24c2
work around for pip v 22.x, add --use-deprecated=html5lib for wxpytho…
DivingDuck Feb 23, 2022
00e8c99
remove former commit as not working for github workflow
DivingDuck Feb 23, 2022
31bbfba
solve conflict with #1227
DivingDuck Mar 16, 2022
5a281dd
check if quoted versions ['3.6' , '3.7', '3.8', '3.9', '3.10'] genera…
DivingDuck Mar 16, 2022
a34fdf5
Remove support for Python 3.6, Add Python 10 for test, x86 only for P…
DivingDuck Mar 17, 2022
0135d6d
Remove Python 3.10
DivingDuck Mar 17, 2022
5aa9611
solve conflict with #1227
DivingDuck Mar 17, 2022
7d08a0e
Merge pull request #18 from kliment/master
DivingDuck Mar 17, 2022
d472399
Merge pull request #19 from kliment/master
DivingDuck Mar 17, 2022
4a4f449
Gcode view, Issue #1252. Don't process slider values till self.model …
DivingDuck May 14, 2022
da5e125
Merge pull request #20 from kliment/master
DivingDuck May 18, 2022
71070f3
Merge pull request #21 from kliment/master
DivingDuck May 18, 2022
bb6c3d9
Remove x86 builds for now as there are no snapshot builds of wxPython…
DivingDuck Jun 19, 2022
cf4aa63
add /.eggs
DivingDuck Jun 19, 2022
16a173a
Correction for update pip and remark for droped wxPython x86 support
DivingDuck Jun 19, 2022
232d515
Fix float values to expected int values for DrawBitmap and CallLater …
DivingDuck Jun 19, 2022
6a341f6
Merge branch 'testPython3.10' of https://github.com/DivingDuck/Printr…
DivingDuck Aug 22, 2022
92d014a
Changes for Python 3.10
DivingDuck Aug 22, 2022
99a71d0
Merge branch 'kliment:master' into master
DivingDuck Sep 11, 2022
5aaef0e
Merge branch 'kliment:master' into testPython3.10
DivingDuck Sep 11, 2022
c474a9c
pyglet version 2.0 isn't compatible with actual code in pronterface, …
DivingDuck Dec 21, 2022
3382000
copy workflow buildpackage-win (2).yml to buildpackage-win.yml
DivingDuck Jan 30, 2023
89cfac6
Change Python to 3.10
DivingDuck Jan 30, 2023
478907c
forgot quotes...
DivingDuck Jan 30, 2023
6e41574
Delete branch limitation to testPython3.10
DivingDuck Jan 30, 2023
ac3c3d7
delete branch limitation to testPython3.10
DivingDuck Jan 30, 2023
7aa347f
change name to Build Windows Executable
DivingDuck Jan 30, 2023
3e2911c
solve conflict with master
DivingDuck Jan 30, 2023
9729c22
Merge pull request #24 from kliment/master
DivingDuck Jan 30, 2023
6bda7c5
cairosvg 2.6.0 have problems with locale, so we will stay to version …
DivingDuck Jan 30, 2023
7e92307
some cleaning for release_windows.bat and update of information in du…
DivingDuck Jan 31, 2023
aeaa08d
Merge manually from branch testPython3.10
DivingDuck Jan 31, 2023
70f552b
solve last conflict in release_windows bat for testPython3.10 merge
DivingDuck Jan 31, 2023
7422539
Merge pull request #25 from DivingDuck/testPython3.10
DivingDuck Jan 31, 2023
f4b3efb
delete workflow file buildpackage-win (2).yml for branch master as no…
DivingDuck Jan 31, 2023
97c2cf7
Merge pull request #26 from kliment/master
DivingDuck Jan 31, 2023
2983b5c
Merge pull request #27 from kliment/master
DivingDuck Feb 2, 2023
54e28d3
README.md: Update windows instructions
DivingDuck Feb 2, 2023
c2d74d4
Update README.md
DivingDuck Feb 2, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 21 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -155,15 +155,31 @@ cd Printrun

### Windows

Download and install [Python 3.6](https://www.python.org/downloads/) and follow the **Python virtual environment** section above except use the following to create and activate the virtual environment and install dependencies:
First download and install [GIT for Windows](https://git-scm.com/downloads), [Python 3.10](https://www.python.org/downloads/) and a [C-compiler environment](https://wiki.python.org/moin/WindowsCompilers/).
For the next steps we need a CMD window or a PowerShell window. You can use Windows Terminal for this as well.
Create and navigate to a directory of your choice where you want to download the source files of this repository and follow the next steps:

CMD
```cmd
> py -3 -m venv venv
> venv\Scripts\activate
> python -m pip install -r requirements.txt
> python pronterface.py
> git clone https://github.com/kliment/Printrun.git
> cd Printrun
> git submodule update --init --recursive
> release_windows.bat
```

PowerShell:
```ps
> git clone https://github.com/kliment/Printrun.git
> cd Printrun
> git submodule update --init --recursive
> ./release_windows.bat
```

The script above will clone this repository and the submodule PrintrunGTK3. The script 'release_windows.bat' will install a virtual environment named v3, download all needed python libraries and compile the binaries for Pronterface.exe and Pronsole.exe.
You will find the files in the new created directory 'dist'. You will find further and more detailed information in the script release_windows.bat. Further information for the linked submodul: [PrintrunGTK3](https://github.com/DivingDuck/PrintrunGTK3)
Run Pronterface or Pronsole from the binary files or from source calling pronterface.py for the GUI version and pronsole.py for the commandline version.

Run 'release_windows.bat' when ever you make changes or updates. With each new run it will compile the binaries and update all involved libraries in the virtual environment if needed. Delete the virtual environment if you have problems with it. Use 'git submodule update --init --recursive' for updating the submodule

### macOS

Expand Down
24 changes: 13 additions & 11 deletions release_windows.bat
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ rem ** 10. Go to directory .\dist, list files and ends the activity
rem ** **
rem ** Steps, you need to do manually before running this batch: **
rem ** **
rem ** 1. Install python 64-bit (3.10.x is actually preferred version for **
rem ** Windows 10 and newer) **
rem ** https://www.python.org/downloads/release/python-379/ **
rem ** In case you use an other Python version, check line 88 and adjust **
rem ** 1. Install python 64-bit (3.10.x is actually preferred and standard version **
rem ** for Windows 10) **
rem ** https://www.python.org/downloads/release **
rem ** In case you use an other Python version, check line 91 and adjust **
rem ** the parameter accordingly to build your virtual environment. **
rem ** 2. Install C-compiler environment **
rem ** https://wiki.python.org/moin/WindowsCompilers **
Expand All @@ -40,9 +40,11 @@ rem ** Windows version, available. You can find a striped version of GTK3
rem ** with all needed DLL binary files in directory PrintrunGTK. Please run **
rem ** following git commands before you run this batch in case you don't find **
rem ** this directory in your local repository: **
rem ** git checkout master **
rem ** git submodule add https://github.com/DivingDuck/PrintrunGTK3 **
rem ** git submodule update --init --recursive **
rem ** git checkout master **
rem ** git submodule add https://github.com/DivingDuck/PrintrunGTK3 **
rem ** git submodule update --init --recursive **
rem ** In case the directory PrintrunGTK3 exist but is empty: **
rem ** git submodule update --init --recursive **
rem ** You can find a listing of all used DLL's in file VERSION as reference and **
rem ** further informations about the linked submodule here: **
rem ** https://github.com/DivingDuck/PrintrunGTK3 **
Expand All @@ -54,7 +56,7 @@ rem **
rem ** https://github.com/wxWidgets/Phoenix/commit/d3bdb14365ca754e83732cccd04e94a2ded5029f
rem ** **
rem ** **
rem ** Author: DivingDuck, 2023-01-31, Status: working **
rem ** Author: DivingDuck, 2023-02-02, Status: working **
rem ** **
rem ************************************************************************************
rem ************************************************************************************
Expand Down Expand Up @@ -123,9 +125,9 @@ echo ****** check for and update outdated modules ******
echo ****************************************************
for /F "skip=2 delims= " %%i in ('pip list --outdated') do py -m pip install --upgrade %%i

echo ****************************************************************************
echo ****** Bug on wxPython 4.1.x workaround for Python 3.x and Windows 10 ******
echo ****************************************************************************
rem echo ****************************************************************************
rem echo ****** Bug on wxPython 4.1.x workaround for Python 3.x and Windows 10 ******
rem echo ****************************************************************************
rem wxPython 4.2.0 is available. Snapshot version is not needed now. Hopefully. #2022-08-05
rem pip install -U --pre -f https://wxpython.org/Phoenix/snapshot-builds/ wxPython

Expand Down