Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Fix tarballs again #9810

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

Merged
akoeplinger merged 1 commit into from
Jul 31, 2018
Merged

Fix tarballs again #9810

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions mcs/class/I18N/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ include ../../build/rules.make

DISTFILES = \
Assembly/AssemblyInfo.cs \
EncodingTestBase.cs \
README \
README.mono \
mklist.sh \
Expand Down
10 changes: 8 additions & 2 deletions mcs/class/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,8 +410,14 @@ DISTFILES = \
doc/TemplateTest.cs \
notes/BitVecto32.txt \
MicrosoftAjaxLibrary/License.htm \
test-helpers/NetworkHelpers.cs \
test-helpers/SocketResponder.cs \
test-helpers/AdminHelper.cs \
test-helpers/Configuration.Http.cs \
test-helpers/NetworkHelpers.cs \
test-helpers/NunitHelpers.cs \
test-helpers/PlatformDetection.cs \
test-helpers/RemoteExecutorTestBase.Mobile.cs \
test-helpers/RemoteExecutorTestBase.Mono.cs \
test-helpers/SocketResponder.cs \
Copy link
Member

@akoeplinger akoeplinger Jul 30, 2018

Choose a reason for hiding this comment

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

I thought we dist all the .cs files from .sources? Maybe that doesn't work for tests?

Copy link
Contributor Author

@directhex directhex Jul 31, 2018

Choose a reason for hiding this comment

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

I don't think DISTFILES/EXTRA_DIST can traverse up a directory tree? mcs/build/tests.make assigns a full list o' files to TEST_FILES by parsing the relevant .sources files, but I think those files in test-helpers were only being included by being referenced elsewhere (e.g. the two above), not via the .sources parsing

directhex@flame:~/Projects/mono/mcs/class$ sed -e '/^$$/d' -e 's,^../,,' -e '/^\#.*$$/d' -et -e 's,^,Test/,' corlib/corlib_test.dll.sources | grep ^\\.\\.
../../../mono/mini/TestHelpers.cs
../test-helpers/NunitHelpers.cs

$(foreach HOST_PLATFORM,macos linux win32 unix,lib/$(monolite_dir)/mcs.exe $(monolite_files))

.PHONY: all-local $(STD_TARGETS:=-local)
Expand Down