ICU-22855: Create combined source distribution when running make dist on C++ side
#3097
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@markusicu Is this something like what you had in mind? Also cc @srl295 |
srl295
reviewed
Aug 12, 2024
icu4c/source/config/dist.mk
Outdated
| @@ -65,25 +65,25 @@ $(DISTY_FILE_TGZ) $(DISTY_FILE_ZIP) $(DISTY_DATA_ZIP): $(DISTY_DAT) $(DISTY_TMP | |||
| @echo Export icu4c@$(GITVER) to "$(DISTY_TMP)/icu" | |||
| -$(RMV) $(DISTY_FILE) $(DISTY_TMP) | |||
| $(MKINSTALLDIRS) $(DISTY_TMP) | |||
| ( cd $(ICU4CTOP)/.. && git archive --format=tar --prefix=icu/ HEAD:icu4c/ ) | ( cd "$(DISTY_TMP)" && tar xf - ) | |||
| ( cd $(ICU4CTOP)/.. && git archive --format=tar --prefix=icu/ HEAD -- icu4c/ icu4j/ testdata/ ) | ( cd "$(DISTY_TMP)" && tar xf - ) | |||
There was a problem hiding this comment.
probably top level README* LICENSE*
There was a problem hiding this comment.
Added LICENSE and README
srl295
reviewed
Aug 12, 2024
icu4c/source/config/dist.mk
Outdated
| # special handling for LICENSE file. The symlinks will be included as files by tar and zip. | ||
| cp -fv $(ICU4CTOP)/LICENSE "$(DISTY_TMP)/LICENSE" | ||
| # Copy top-level testdata directory so it's a sibling of the source/ directory | ||
| cp -fv $(ICU4CTOP)/LICENSE "$(DISTY_ICU)/LICENSE" |
There was a problem hiding this comment.
Removed this line due to the other change
markusicu
requested review from
echeran,
mihnita,
yumaoka,
markusicu and
richgillam
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR changes
make diston the C++ side to create a single combined sources distribution, including icu4c/, icu4j/, and testdata/. It also undoes the change inintltest.cppthat looks for thetestdatadirectory in multiple locations.Note: I haven't changed anything on the Java side because I'm not sure what the layout of the .jar file should look like.
Checklist