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

Build and installer fixes #2429

Merged
merged 11 commits into from
Nov 19, 2021
Merged

Build and installer fixes #2429

merged 11 commits into from
Nov 19, 2021

Conversation

mikee47
Copy link
Contributor

@mikee47 mikee47 commented Nov 17, 2021 •
edited
Loading

Host

  • Fix host --help option
  • Add --loopcount emulator option

Build

  • Update FixPath to handle spaces in path
  • Fix COMPONENT_SEARCH_DIRS for Windows
  • Fix appcode object path resolution, ensure object path is relative

Installer

  • all option missing rp2040
  • Remove doc option from all

CI testing

  • Revise to simplify use by external libraries

@mikee47 mikee47 mentioned this pull request Nov 17, 2021
Merged
@mikee47 mikee47 force-pushed the fix/build-installer branch 2 times, most recently from 9f88253 to 4cac611 Compare November 17, 2021 22:59
@slaff slaff added this to the 4.5.0 milestone Nov 18, 2021
@slaff
Copy link
Contributor

slaff commented Nov 18, 2021

@mikee47 Please take a look at the failing CIs.

@mikee47
Fix host --help option
cf58341
@mikee47
Add --loopcount emulator option
c185e57
@mikee47
Update FixPath to handle spaces in path
d5bc79a
@mikee47
Fix COMPONENT_SEARCH_DIRS for Windows
e3b85cc
@mikee47
Fix appcode object path resolution
d5485ee 
Appcode source file can contain path outside Sming repository so ends up with absolute path.
Ensure object path is relative.
@mikee47
Fix install.sh
852bab5 
`all` option missing rp2040
Remove `doc` option from `all`
@mikee47
Move CI setup into scripts
21b562f 
Can be used for CI library builds
Separate docs install
@mikee47
Use CPU count for make
1c9b1a0
@mikee47
Win32 fixes
ece83df
@mikee47 mikee47 force-pushed the fix/build-installer branch from 4cac611 to ece83df Compare November 18, 2021 09:45
mikee47
mikee47 commented Nov 18, 2021
View reviewed changes
Tools/ci/build.sh
@@ -2,7 +2,7 @@
set -ex # exit with nonzero exit code if anything fails

# Build times benefit from parallel building
export MAKE_PARALLEL="make -j3"
export MAKE_PARALLEL="make -j$(nproc)"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@slaff This surely won't work?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My bad. Thanks.

Copy link
Contributor Author

@mikee47 mikee47 Nov 18, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Think I'm going slightly potty switching between linux/windows all the time...

@mikee47 mikee47 force-pushed the fix/build-installer branch from 37c8e1b to e91c22d Compare November 18, 2021 10:37
@mikee47
Copy link
Contributor Author

mikee47 commented Nov 18, 2021

@slaff I wonder if it's time to drop the old toolchains?

@slaff
Copy link
Contributor

slaff commented Nov 18, 2021

@slaff I wonder if it's time to drop the old toolchains?

I ... (hesitation.. mumbling... hesitation) would say yes. Those who cannot install a newer toolchain can still use the LTS version.

@mikee47
Copy link
Contributor Author

mikee47 commented Nov 18, 2021

@slaff I wonder if it's time to drop the old toolchains?

I ... (hesitation.. mumbling... hesitation) would say yes. Those who cannot install a newer toolchain can still use the LTS version.

Should make development a little less awkward and save some CI time! I'll prep a PR for this.

@slaff slaff merged commit 0ddd831 into SmingHub:develop Nov 19, 2021
@mikee47 mikee47 deleted the fix/build-installer branch November 19, 2021 09:36
@mikee47 mikee47 mentioned this pull request Nov 29, 2021
Merged
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
4.5.0
Development

Successfully merging this pull request may close these issues.
3 participants
@mikee47 @slaff @slav-at-attachix