Skip to content

tools: change buildsystem to cmake - #951

Merged
lgirdwood merged 11 commits into
thesofproject:masterfrom
jajanusz:tools-cmake
Feb 14, 2019
Merged

lgirdwood merged 11 commits into
thesofproject:masterfrom
jajanusz:tools-cmake

Conversation

@jajanusz

@jajanusz jajanusz commented Feb 3, 2019

Copy link
Copy Markdown
Contributor

Please merge it only after someone who is actively working with tools approves it.
It should be OK I tried to directly translate rules, but I'm not sure if I didn't miss some important tools that you use every day.

How to build & install:

cmake -Bbuild .
cd build
make
make install

@jajanusz

jajanusz commented Feb 3, 2019

Copy link
Copy Markdown
Contributor Author

@xiulipan

+ ./scripts/docker-run.sh make -C tools/ tests -j4
make: *** No rule to make target 'Makefile.am', needed by 'Makefile.in'.  Stop.

Please change that (in jenkins ci), because it relies on internals of makefiles that was deleted.
It's better to use what is documented and I also support that -> make tests from tools directory, or build-tools.sh -t

@lgirdwood lgirdwood left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

We will also need to include changes to the sof-target -install script here to update topology & tools build dir.

Btw, how do we create a tarball release of all source files ?

Comment thread tools/logger/CMakeLists.txt Outdated

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

What's the prefix for destination ? I'm assuming it can be set somewhere.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Comment thread scripts/build-tools.sh Outdated

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Would it be better to name this build_tools ? or build/tools. Where is the "host build" target built ?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

By 'host' i guess you mean testbench that was added in FW buildsystem, because it was there previously as --enable-library(?) option. It was direct port of that, but I plan to separate testbench/fw builds.

@jajanusz jajanusz Feb 4, 2019 •

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Also I can change build dir name to build_tools, however there is nothing else build from this project that's why I named it just build (for fw you have various builds for platfroms/ut/host so it's differnt story there).

@jajanusz

jajanusz commented Feb 4, 2019

Copy link
Copy Markdown
Contributor Author

Btw, how do we create a tarball release of all source files ?

It's missing functionality, can you create issue and write there what target name you want, for example make dist/make tarball. It's going to be simple, git archive + .tarball-version

@jajanusz

jajanusz commented Feb 4, 2019 •

Copy link
Copy Markdown
Contributor Author

@lgirdwood Changed as suggested.
I also renamed sof-target-intsall to sof-target-install (had typo), I hope CI doesn't run this script with old wrong name

@lgirdwood

Copy link
Copy Markdown
Member

Btw, how do we create a tarball release of all source files ?

It's missing functionality, can you create issue and write there what target name you want, for example make dist/make tarball. It's going to be simple, git archive + .tarball-version

Done. It's #954

@lgirdwood lgirdwood left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I'm working on topology atm so will get a chance to test tomorrow.

@xiulipan

Copy link
Copy Markdown
Contributor

@jajanusz
Update the test scripts of sof-ci. Sorry about that old workaround for test topology build.
Please rebase the PR and re-trigger all CIs.

@jajanusz

Copy link
Copy Markdown
Contributor Author

@xiulipan @lgirdwood
updated

@lgirdwood

Copy link
Copy Markdown
Member

Is ci failure due to the ci script using autotools ?

@jajanusz

Copy link
Copy Markdown
Contributor Author

Is ci failure due to the ci script using autotools ?

No, just don't believe QB tests done in the weekend (after stress tests) because it will fail every time with python tests and then @zrombel has to manually rerun them... I don't know how/when they gonna fix it ;)

Signed-off-by: Janusz Jankowski <janusz.jankowski@linux.intel.com>
Signed-off-by: Janusz Jankowski <janusz.jankowski@linux.intel.com>
Signed-off-by: Janusz Jankowski <janusz.jankowski@linux.intel.com>
Signed-off-by: Janusz Jankowski <janusz.jankowski@linux.intel.com>
Signed-off-by: Janusz Jankowski <janusz.jankowski@linux.intel.com>
Signed-off-by: Janusz Jankowski <janusz.jankowski@linux.intel.com>
Signed-off-by: Janusz Jankowski <janusz.jankowski@linux.intel.com>
Signed-off-by: Janusz Jankowski <janusz.jankowski@linux.intel.com>
Signed-off-by: Janusz Jankowski <janusz.jankowski@linux.intel.com>
Signed-off-by: Janusz Jankowski <janusz.jankowski@linux.intel.com>
@jajanusz

Copy link
Copy Markdown
Contributor Author

@ranj063 @lgirdwood
Is it good to merge?
@xiulipan
Why there are no jenkins CIs?

@lgirdwood

Copy link
Copy Markdown
Member

@jajanusz I'm good if you are confirming CI code scan is OK now ?

Signed-off-by: Janusz Jankowski <janusz.jankowski@linux.intel.com>
@jajanusz

Copy link
Copy Markdown
Contributor Author

@lgirdwood I did push for jenkins CI, it works, idk tho if QB build will work this time because IT servers are up and down randomly but it was ok before i rerun it

@jajanusz

Copy link
Copy Markdown
Contributor Author

@jajanusz I'm good if you are confirming CI code scan is OK now ?

It's ok now

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.

3 participants