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

(freecad) 32/64bit detection and shim logic #1638

Closed
wants to merge 7 commits into from

Conversation

RedBaron2
Copy link
Contributor

@RedBaron2 RedBaron2 commented Apr 6, 2021

@AdmiringWorm @majkinetor @pauby @gep13

Description

This will fix the non-matching versioning between the 32/64bit urls #1635 . This will also fix issue #1616 of no shims with new logic.

Motivation and Context

How Has this Been Tested?

Screenshot (if appropriate, usually isn't needed):

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Migrated package (a package has been migrated from another repository)

Checklist:

  • My code follows the code style of this repository.
  • My change requires a change to documentation (this usually means the notes in the description of a package).
  • I have updated the documentation accordingly (this usually means the notes in the description of a package).
  • All files are up to date with the latest Contributing Guidelines
  • The added/modified package passed install/uninstall in the chocolatey test environment.
  • The changes only affect a single package (not including meta package).

Original Location

update of regex incase of multiple digits found in installer filename
This will fix the logic for creating shims
@AppVeyorBot
Copy link

✅ Package verification completed without issues. PR is now pending human review

@adrianinsaval
Copy link
Contributor

Does this install shims for the installer version too? I think that needs to be done with the Install-Binfile command: https://docs.chocolatey.org/en-us/create/functions/install-binfile

@RedBaron2
Copy link
Contributor Author

@adrianinsaval
I was unaware of missing shims on the install version. Normally the shims are created so the program can be used from the command or powershell prompt(s).

If you have any further info to share it could be very helpful, thanks.

@adrianinsaval
Copy link
Contributor

I couldn't test since the install version is broken but I don't see anything that indicates that a shim would be created in the script, my understanding is that this would install freecad to the default location (C:\Program Files\FreeCAD 0.19) and I think chocolatey doesn't auto generate shims for binaries outside of the lib folder.

On an entirely separate issue, the dev version will apparently no longer be published in the main freecad repo, I'm trying to get a definitive answer of where they will be published going forward, they are currently here: https://github.com/FreeCAD/FreeCAD-AppImage/releases/tag/weekly-builds

@adrianinsaval
Copy link
Contributor

@RedBaron2 FreeCAD dev releases will now be published here: https://github.com/FreeCAD/FreeCAD-Bundle/releases/tag/weekly-builds do you think you can change that too in this PR or should I create a new issue for this?

@RedBaron2
Copy link
Contributor Author

@adrianinsaval
I'll look into changing this in the week. Thanks for letting me know.

@RedBaron2 RedBaron2 changed the title (freecad) 32/64bit detection and shim logic (freecad) WIP 32/64bit detection and shim logic Apr 22, 2021
@RedBaron2
Copy link
Contributor Author

RedBaron2 commented Apr 27, 2021

@adrianinsaval
I'm just curious now that I got to look closer at the weekly-builds page. The developers are recommending users switch to the vc17 version instead of the vc14 version.

@AppVeyorBot
Copy link

✅ Package verification completed without issues. PR is now pending human review

@AppVeyorBot
Copy link

❌ Package verification failed, please review the Appveyor Logs and the provided Artifacts before requesting a human reviewer to take a look.

@AppVeyorBot
Copy link

✅ Package verification completed without issues. PR is now pending human review

@AppVeyorBot
Copy link

✅ Package verification completed without issues. PR is now pending human review

@RedBaron2 RedBaron2 changed the title (freecad) WIP 32/64bit detection and shim logic (freecad) 32/64bit detection and shim logic Apr 27, 2021
@RedBaron2
Copy link
Contributor Author

@AdmiringWorm @majkinetor @pauby @pascalberger @gep13
This PR is updated to also fix the new dev url, and newer regex for installer-1, installer1, and installer files.

This will also update the shim logic.

@AppVeyorBot
Copy link

✅ Package verification completed without issues. PR is now pending human review

@RedBaron2
Copy link
Contributor Author

I will close this for now, and start it fresh in a few.

@RedBaron2 RedBaron2 closed this Apr 28, 2021
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.

None yet

3 participants