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 electron #361

Merged
merged 11 commits into from
Apr 27, 2023
Merged

update electron #361

merged 11 commits into from
Apr 27, 2023

Conversation

2bbb
Copy link
Contributor

@2bbb 2bbb commented Apr 26, 2023

this PR is W.I.P.

but, I feel happy If anyone can check this sometime. (because I have only macos now...)

related: #342

@ofTheo
Copy link
Member

ofTheo commented Apr 26, 2023

Hey @2bbb - wow!
Thanks for this. 👏

Just gave it a try.

I had to change these lines:
https://github.com/2bbb/projectGenerator/blob/PR/update_electronnnn/frontend/package.json#L17-L24

from 0.37.8 to 17.1.1

  "scripts": {
    "start": "electron .",
    "build": "electron-packager . $npm_package_productName --icon=static/icon/of.icns --out=dist --ignore='dist' --ignore='readme.md' --prune --all --overwrite --electron-version=17.1.1",
    "build:osx": "electron-packager . $npm_package_productName --icon=static/icon/of.icns --out=dist --ignore='dist' --ignore='readme.md' --prune --overwrite --electron-version=17.1.1 --platform=darwin --arch=x64",
    "build:linux32": "electron-packager . $npm_package_productName --icon=static/icon/of.icns --out=dist --ignore='dist' --ignore='readme.md' --prune --overwrite --electron-version=17.1.1 --platform=linux --arch=ia32",
    "build:linux64": "electron-packager . $npm_package_productName --icon=static/icon/of.icns --out=dist --ignore='dist' --ignore='readme.md' --prune --overwrite --electron-version=17.1.1 --platform=linux --arch=x64",
    "build:vs": "electron-packager . --icon=static/icon/of.ico --out=dist --ignore='dist' --ignore='readme.md' --prune --overwrite --electron-version=17.1.1 --platform=win32 --arch=ia32"
  },

Then eveything seems to work, for making projects or updating.

Except the update multiple button ( selecting the folder seems to not work )

image

Can test on Windows tomorrow.
But this is great progress!

@2bbb
Copy link
Contributor Author

2bbb commented Apr 26, 2023

@ofTheo

thanks for testing!!
and thanks telling me where the version is decided, I didn't noticed it is hard coded on build lines...

I'll fix about update multiple button.

@2bbb
Copy link
Contributor Author

2bbb commented Apr 26, 2023

@ofTheo
maybe feature about "update multiple" is fixed.
and I found bug on feature about "extra source path" and fixed.

please test again!

I will adopt codes from #216 and #240 if there are my mistakes or better way.

@ofTheo
Copy link
Member

ofTheo commented Apr 27, 2023

@2bbb this looks great
The multiple examples works well now. 🙏

The extra source paths also worked, but might need a bit of tweaking.
( If you update a project with extra source paths, it doesn't import the extra source paths back in ).

I think it was more broken before though, so we could just merge this and do some smaller PRs for the remainder.

@2bbb 2bbb marked this pull request as ready for review April 27, 2023 02:54
@2bbb
Copy link
Contributor Author

2bbb commented Apr 27, 2023

@ofTheo

ok, I update and post small PRs after this PR is merged!

@2bbb 2bbb changed the title [W.I.P.] update electron update electron Apr 27, 2023
@dimitre dimitre merged commit b68594f into openframeworks:master Apr 27, 2023
@2bbb
Copy link
Contributor Author

2bbb commented Jul 14, 2023

@dimitre
now, we can close related PRs #215 #216 #240.

@hiroMTB @autr
thanks for greate PRs!

@hiroMTB
Copy link
Contributor

hiroMTB commented Jul 14, 2023

closed! thanks a lot!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants