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.

Sign up for GitHub

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

Jump to bottom

Update README for Windows #1309

Merged
merged 89 commits into from
Feb 2, 2023
Merged

Update README for Windows #1309

merged 89 commits into from
Feb 2, 2023

Conversation

DivingDuck
Copy link
Collaborator

Update for README.md and release_windows.bat.

@DivingDuck
Merge pull request #9 from kliment/master
367e633 
Import latest updates from Kliment
@DivingDuck
Merge pull request #10 from kliment/master
acdb999 
Merge last changes from Kliment
@DivingDuck
Merge pull request #11 from kliment/master
8ea0861 
Update to latest version from Kliment
@DivingDuck
Merge pull request #12 from kliment/master
0c8630d 
Latest updates from Kliment
@DivingDuck
Merge pull request #13 from kliment/master
ab934c9 
New updates from Kliment macos package
@DivingDuck
Merge pull request #14 from kliment/master
15d6981 
Pull newest updates from Kliment
@DivingDuck
Merge pull request #15 from kliment/master
c3ae0d0 
Update from Kiment
@DivingDuck
Merge pull request #16 from kliment/master
33e6535 
Update from Kliment RC8
@DivingDuck
Merge pull request #17 from kliment/master
9943b0d 
Updates from Kiment master
@DivingDuck
cleanup old left overs and add library pycairo for running projector …
d11f35b 
…from source
@DivingDuck
forgot to delete --hidden-import=cairosvg
47b6b7e
@DivingDuck
add simplejson polygon3
1fbde03
@DivingDuck
Update for Projector
2d35b6d
@DivingDuck
missing quotation marks for additional --add-data entries
250e986
@DivingDuck
Corrections due to incompatibility with Python >3.7 and actual wx
e989927 
Replacing time.clock() with time.perf_counter() --> Deprecated since Python 3.3 and deleted in Python 3.8

Replacing wx.FutureCall with wx.CallLater --> wxPyDeprecationWarning
@DivingDuck
Bundling GTK3 runtime library to Pronterface for Windows 10-64bit
3d47871 
1. Add directory GTK3Windows10-64 with all needed DLL’s
2. Modified release_windows.bat for local compilation too
3. Modified Github action workflow for Windows 10-64bit only
@DivingDuck
delete local GTK files
4bbebc2
@DivingDuck
Test for new GTK3 bundling via submodule
33851bb
@DivingDuck
once more
f81b01f
@DivingDuck
test for submodules
c8abfb5
@DivingDuck
Compile with Py 3.7 instead of 3.8 for test wx problem
2b7130c
@DivingDuck
# Add Python version 3.7 and 3.9 for being able to test issue kliment…
0cfa1f1 
…#1170 and maybe kliment#1174
@DivingDuck
Update for building Projector x32 and add a description how to use
e3f1ea0
@DivingDuck
update submodule in printrun to new version with GTK3 x32 binaries
84c90a1
@DivingDuck
Select GTK-3 binaries based on available bundle and x32/x64 architecture
aab2b5c
@DivingDuck
Fix for
c5fed48 
Select GTK-3 binaries based on available bundle and x32/x64 architecture
@DivingDuck
new fix
49254be
@DivingDuck
add fix for x32bit, use x86 ...
d54ef71
@DivingDuck
Make GTK3 a submodule of Printrun, delete GTK3 files from this reposi…
dfde8a9 
…tory, change buildpackage-win.yml to integrate GTK3 as submodule and compile the correct version GTK3 version for 32-/64-bit or as external reference via windows system environment path
@DivingDuck
forgot to update date
cd8736f
@DivingDuck
Fix float values to expected int values for DrawBitmap and CallLater …
232d515 
…as these are not longer accepted for Python 3.10Correction for update pip and remark for droped wxPython x86 support
@DivingDuck
Merge branch 'testPython3.10' of https://github.com/DivingDuck/Printrun…
6a341f6 
… into testPython3.10
@DivingDuck
Changes for Python 3.10
92d014a
@DivingDuck
Merge branch 'kliment:master' into master
99a71d0
@DivingDuck
Merge branch 'kliment:master' into testPython3.10
5aaef0e
@DivingDuck
pyglet version 2.0 isn't compatible with actual code in pronterface, …
c474a9c 
…so pyglet version needs to be below 2.0 (requirements.txt and release_windows.bat)

Add superslicer.ini to .gitignore.
@DivingDuck
copy workflow buildpackage-win (2).yml to buildpackage-win.yml
3382000 
Cleanup requirements.txt
@DivingDuck
Change Python to 3.10
89cfac6
@DivingDuck
forgot quotes...
478907c
@DivingDuck
Delete branch limitation to testPython3.10
6e41574
@DivingDuck
delete branch limitation to testPython3.10
ac3c3d7
@DivingDuck
change name to Build Windows Executable
7aa347f
@DivingDuck
solve conflict with master
3e2911c
@DivingDuck
Merge pull request #24 from kliment/master
9729c22 
Latest changes from Kliment
@DivingDuck
cairosvg 2.6.0 have problems with locale, so we will stay to version …
6bda7c5 
…2.5.2 as workaround for now
@DivingDuck
some cleaning for release_windows.bat and update of information in du…
7e92307 
…mmy file VERSION
@DivingDuck
Merge manually from branch testPython3.10
aeaa08d
@DivingDuck
solve last conflict in release_windows bat for testPython3.10 merge
70f552b
@DivingDuck
Merge pull request #25 from DivingDuck/testPython3.10
7422539 
merge branch testPython3.10 into master
@DivingDuck
delete workflow file buildpackage-win (2).yml for branch master as no…
f4b3efb 
…t needed.
@DivingDuck
Merge pull request #26 from kliment/master
97c2cf7 
Fix and update Windows build scripts by DivingDuck
@DivingDuck
Merge pull request #27 from kliment/master
2983b5c 
README: Update Debian/Ubuntu installation
@DivingDuck
README.md: Update windows instructions
54e28d3 
release_windows.bat: Update instruction and deactivate echo for wxPython workaround
@DivingDuck
Update README.md
c2d74d4 
Additional update for Windows
@DivingDuck
Copy link
Collaborator Author

DivingDuck commented Feb 2, 2023 •
edited
Loading

A GIT noob question: Can you give me a tip how I can compress those differences in my repository w/o loosing my info's?

@DivingDuck DivingDuck mentioned this pull request Feb 2, 2023
Merged
2 tasks
@rockstorm101
Copy link
Collaborator

Can you give me a tip how I can compress those differences in my repository w/o loosing my info's?

I would say git rebase is your best friend here. I use it all the time on my local copy before submitting PRs here. Caution note, it's a command that rewrites history so it must be used with care and never really on public repositories. This guide I think is quite good: https://www.atlassian.com/git/tutorials/rewriting-history/git-rebase

@kliment
Copy link
Owner

kliment commented Feb 2, 2023

I'll squash them all into one commit here. Now that your repo is up to date with mine, you don't need to keep all those merge commits.

@kliment kliment merged commit afdbe5b into kliment:master Feb 2, 2023
@kliment
Copy link
Owner

kliment commented Feb 2, 2023

If you just want to get the same state on your side without all the merge commits you can also pull from my repo and force-push to yours.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@DivingDuck @rockstorm101 @kliment