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

fix(makefile): Bugfixes and minor improvements #10423

Merged
merged 1 commit into from
Apr 25, 2023

Conversation

igor-sirotin
Copy link
Contributor

@igor-sirotin igor-sirotin commented Apr 25, 2023

What does the PR do

Makefile:

  • silent StatusQ build output
  • silent QrCodeGenerator build output
  • silent StatusQ cmake warnings
  • clean command for DOtherSide and status-go

Other:

  • silent SortFilterProxyModel and qzxing warnings
  • removed duplication in statusq.qrc

Affected areas

Makefile, build system

@status-im-auto
Copy link
Member

status-im-auto commented Apr 25, 2023

Jenkins Builds

Commit #️⃣ Finished (UTC) Duration Platform Result
✔️ aa87e84 #1 2023-04-25 12:05:25 ~5 min tests/imports 📄log
✔️ aa87e84 #1 2023-04-25 12:06:35 ~6 min tests/nim 📄log
✔️ aa87e84 #1 2023-04-25 12:08:36 ~8 min macos/aarch64 🍎dmg
✔️ aa87e84 #1 2023-04-25 12:13:21 ~13 min macos/x86_64 🍎dmg
✔️ aa87e84 #1 2023-04-25 12:16:21 ~16 min linux/x86_64 📦tgz
✔️ 66d2a2b #2 2023-04-25 12:24:08 ~6 min macos/aarch64 🍎dmg
✔️ 66d2a2b #2 2023-04-25 12:29:07 ~11 min macos/x86_64 🍎dmg
✔️ 66d2a2b #2 2023-04-25 12:30:09 ~12 min tests/imports 📄log
✔️ 66d2a2b #2 2023-04-25 12:36:00 ~18 min tests/nim 📄log
✔️ 66d2a2b #2 2023-04-25 12:38:27 ~20 min linux/x86_64 📦tgz
✔️ 66d2a2b #2 2023-04-25 12:48:33 ~30 min tests/e2e 📄log
✔️ 66d2a2b #2 2023-04-25 12:49:32 ~31 min windows/x86_64 💿exe

Makefile Outdated Show resolved Hide resolved

STATUSGO := vendor/status-go/build/bin/libstatus.$(LIBSTATUS_EXT)
STATUSGO_LIBDIR := $(shell pwd)/$(shell dirname "$(STATUSGO)")
export STATUSGO_LIBDIR

status-go: $(STATUSGO)
Copy link
Contributor

Choose a reason for hiding this comment

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

@igor-sirotin I would keep this line instead of line 343, it's clearer and more intuitive.

Copy link
Contributor Author

@igor-sirotin igor-sirotin Apr 25, 2023

Choose a reason for hiding this comment

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

I don't really care actually, just wanted to group all status-go-* targets together
If you're of strong opinion, I'm ok to revert it. Or we can wait for someone else to reply here 🙂

Copy link
Contributor

Choose a reason for hiding this comment

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

There is already STATUSGO defined in the line 333 because of that it's (at least to me) clearer to remove line 342 and have line 337 like status-go: | deps, but let's hear form others.

Copy link
Contributor Author

@igor-sirotin igor-sirotin Apr 25, 2023

Choose a reason for hiding this comment

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

@saledjenic, sorry, I think I don't fully understand you.
And the line numbering has also changed here 😄 I suppose you refer to the new one.

The targets we have

  1. Define the variable with binary path

    STATUSGO := vendor/status-go/build/bin/libstatus.$(LIBSTATUS_EXT)

  2. Define the target, which is the status-go binary, which path is defined in1
    Also set the target dependencies and instructions to build the target.

    $(STATUSGO): | deps

  3. Define a status-go target
    This is just an alias to use like make status-go, which is much easier than make vendor/status-go/build/bin/libstatus.dylib

    status-go: $(STATUSGO)

  4. Define a status-go-clean target
    So I could write make status-go-clean instead of rm vendor/status-go/build/bin/libstatus.dylib

    status-go-clean:

Note

From your first comment I though you want to leave the previous order of the targets. Like this:

  • status-go
  • $(STATUSGO)

But from you second comment do you propose to remove one of the targets? Did I get it right?

Copy link
Contributor

Choose a reason for hiding this comment

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

minor thing, irrelevant, just proceed and merge it

@igor-sirotin igor-sirotin merged commit 70e8370 into master Apr 25, 2023
@igor-sirotin igor-sirotin deleted the fix/makefile-bugfixes-1 branch April 25, 2023 15:01
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