Skip to contentSkip to conversation

scripts/git.orderfile: Display meson files along with buildsys ones

PATCH Applied Philippe Mathieu-Daudé 5 participants 7 messages Sep 7, 2020 – Sep 16, 2020

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 scripts/git.orderfile: Display meson files along with buildsys ones

Since commit a56650518f5 ("configure: integrate Meson in the build system") we replaced many Makefile by Meson files. Adapt the git.orderfile script to display the new file at the same position.

---
 scripts/git.orderfile | 1 +
 1 file changed, 1 insertion(+)
scripts/git.orderfile +1 -0
index 73fd818d7f3..a021afc2d51 100644
@@ -18,6 +18,7 @@ docs/*
 configure
 Makefile*
 *.mak
+meson.build
 
 # qapi schema
 qapi/*.json
Signature · 1 line
2.26.2
Reviewed-by on v2 1/1
#1 lore raw
Quoted 25 lines · Philippe Mathieu-Daudé

Since commit a56650518f5 ("configure: integrate Meson in the build system") we replaced many Makefile by Meson files. Adapt the git.orderfile script to display the new file at the same position.

---
 scripts/git.orderfile | 1 +
 1 file changed, 1 insertion(+)
scripts/git.orderfile +1 -0
index 73fd818d7f3..a021afc2d51 100644
@@ -18,6 +18,7 @@ docs/*
 configure
 Makefile*
 *.mak
+meson.build
 
 # qapi schema
 qapi/*.json
Signature · 1 line
2.26.2
#2 lore raw
In reply to Philippe Mathieu-Daudé
Quoted 15 lines · Philippe Mathieu-Daudé

Since commit a56650518f5 ("configure: integrate Meson in the build system") we replaced many Makefile by Meson files. Adapt the git.orderfile script to display the new file at the same position.

---
 scripts/git.orderfile | 1 +
 1 file changed, 1 insertion(+)
scripts/git.orderfile +0 -0
index 73fd818d7f3..a021afc2d51 100644

scripts/git.orderfile docs/* · line 24

Quoted 7 lines
scripts/git.orderfile +1 -0
@@ -18,6 +18,7 @@ docs/*
 configure
 Makefile*
 *.mak
+meson.build
 
 # qapi schema
 qapi/*.json

Possibly related (not sure if there's another patch pending for it already): if you run a "make clean" in the source tree, and have the Meson submodule initialized, the "make clean" will delete files from the Meson submodule.

find . \( -name '*.so' -o -name '*.dll' -o -name '*.[oda]' \) -type f \

"*.d" matches various meson files.

(Again, apologies if this is already known; I understand this is probably the worst context to report his in...)

Thanks
Laszlo

#3 lore raw
Quoted 11 lines · Laszlo Ersek

Possibly related (not sure if there's another patch pending for it already): if you run a "make clean" in the source tree, and have the Meson submodule initialized, the "make clean" will delete files from the Meson submodule.

find . \( -name '*.so' -o -name '*.dll' -o -name '*.[oda]' \) -type f \

"*.d" matches various meson files.

(Again, apologies if this is already known; I understand this is probably the worst context to report his in...)

Is this running "make clean" from an old commit (i.e. as in an in-tree build) after having checked out the meson submodule?

Paolo

#4 lore raw
Quoted 8 lines · Paolo Bonzini
Quoted 7 lines · Laszlo Ersek

Possibly related (not sure if there's another patch pending for it already): if you run a "make clean" in the source tree, and have the Meson submodule initialized, the "make clean" will delete files from the Meson submodule.

find . \( -name '*.so' -o -name '*.dll' -o -name '*.[oda]' \) -type f \

Quoted 7 lines
Quoted 4 lines

"*.d" matches various meson files.

(Again, apologies if this is already known; I understand this is probably the worst context to report his in...)

Is this running "make clean" from an old commit (i.e. as in an in-tree build) after having checked out the meson submodule?

The source tree is checked out at commit 9d5589bb3fee ("Merge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-5.2-pull-request' into staging", 2020-09-07).

The current working directory is the source tree.

The working directory is pristine, as in:

$ git reset --hard
$ git clean -ffdx
$ git submodule deinit --force --all

Then:

$ git submodule update --init --force
$ make clean
$ git status
Quoted 11 lines

On branch master
Your branch is up to date with 'origin/master'.

Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git checkout -- <file>..." to discard changes in working > directory) (commit or discard the untracked or modified content in submodules)

modified: meson (modified content)

no changes added to commit (use "git add" and/or "git commit -a")

And if I change to meson:

$ cd meson
$ git status
Quoted 25 lines

HEAD detached at 68ed748f84f1
Changes not staged for commit:
(use "git add/rm <file>..." to update what will be committed) (use "git checkout -- <file>..." to discard changes in working directory)

        deleted:    test cases/d/1 simple/app.d
        deleted:    test cases/d/1 simple/utils.d
        deleted:    test cases/d/10 d cpp/dmain.d
        deleted:    test cases/d/10 d cpp/libfile.d
        deleted:    test cases/d/11 dub/test.d
        deleted:    test cases/d/2 static library/app.d
        deleted:    test cases/d/2 static library/libstuff.d
        deleted:    test cases/d/3 shared library/app.d
        deleted:    test cases/d/3 shared library/libstuff.d
        deleted:    test cases/d/3 shared library/sub/libstuff.d
        deleted:    test cases/d/4 library versions/lib.d
        deleted:    test cases/d/5 mixed/app.d
        deleted:    test cases/d/6 unittest/app.d
        deleted:    test cases/d/6 unittest/second_unit.d
        deleted:    test cases/d/7 multilib/app.d
        deleted:    test cases/d/7 multilib/say1.d
        deleted:    test cases/d/7 multilib/say2.d
        deleted:    test cases/d/9 features/app.d
        deleted:    test cases/d/9 features/extra.d
Quoted 1 line

no changes added to commit (use "git add" and/or "git commit -a")

I don't know if the "clean" target has any relevance left, in the top-level Makefile; I've only looked at it now because the command

Quoted 5 lines
	find . \( -name '*.so' -o -name '*.dll' -o -name '*.[oda]' \) -type f \
		! -path ./roms/edk2/ArmPkg/Library/GccLto/liblto-aarch64.a \
		! -path ./roms/edk2/ArmPkg/Library/GccLto/liblto-arm.a \
		! -path ./roms/edk2/BaseTools/Source/Python/UPT/Dll/sqlite3.dll \
		-exec rm {} +

needed an update (removing the sqlite3.dll exception) for the edk2-stable202008 update.

Thanks!
Laszlo

#5 lore raw
Quoted 8 lines · Laszlo Ersek

The current working directory is the source tree.

The working directory is pristine, as in:

$ git reset --hard
$ git clean -ffdx
$ git submodule deinit --force --all
Quoted 5 lines

Then:

$ git submodule update --init --force
$ make clean
$ git status

I see. We should probably rename the Makefile in the source tree, since it is only meant to be used from the build tree.

Paolo

#6 lore raw
In reply to Philippe Mathieu-Daudé

Le 07/09/2020 à 18:12, Philippe Mathieu-Daudé a écrit :

Quoted 15 lines

Since commit a56650518f5 ("configure: integrate Meson in the build system") we replaced many Makefile by Meson files. Adapt the git.orderfile script to display the new file at the same position.

---
 scripts/git.orderfile | 1 +
 1 file changed, 1 insertion(+)
scripts/git.orderfile +0 -0
index 73fd818d7f3..a021afc2d51 100644

scripts/git.orderfile docs/* · line 24

Quoted 7 lines
scripts/git.orderfile +1 -0
@@ -18,6 +18,7 @@ docs/*
 configure
 Makefile*
 *.mak
+meson.build
 
 # qapi schema
 qapi/*.json

Applied to my trivial-patches branch.

Thanks,
Laurent