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.

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

Jump to bottom

ICU-22855: Create combined source distribution when running make dist on C++ side #3097

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

ICU-22855: Create combined source distribution when running make dist on C++ side #3097

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bf1bb4b
Create combined source distribution when running `make dist` on C++ side
catamorphism Aug 12, 2024
dd627a6
Copy LICENSE and README; remove special case for LICENSE
catamorphism Aug 12, 2024
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
22 changes: 11 additions & 11 deletions icu4c/source/config/dist.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ include $(top_builddir)/icudefs.mk
DISTY_DIR=dist
DISTY_TMP=dist/tmp
DISTY_ICU=$(DISTY_TMP)/icu
DISTY_DATA=$(DISTY_ICU)/source/data
DISTY_DATA=$(DISTY_ICU)/icu4c/source/data
# The following line controls what is removed in the data/ subdirectory for the source tarball.
DISTY_RMV=brkitr coll curr lang locales mappings rbnf region translit xml zone misc/*.txt misc/*.mk unit
DISTY_RMDIR=$(DISTY_RMV:%=$(DISTY_DATA)/%)
Expand Down Expand Up @@ -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 - )
Copy link
Member

Choose a reason for hiding this comment

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

probably top level README* LICENSE*

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Added LICENSE and README

# 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"
Copy link
Member

Choose a reason for hiding this comment

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

may need revisit

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Removed this line due to the other change

# Copy top-level testdata directory
cp -R $(ICU4CTOP)/../testdata $(DISTY_TMP)/icu
( cd $(DISTY_TMP)/icu/source ; zip -rlq $(DISTY_DATA_ZIP) data )
( cd $(DISTY_TMP)/icu/icu4c/source ; zip -rlq $(DISTY_DATA_ZIP) data )
$(MKINSTALLDIRS) $(DISTY_IN)
echo DISTY_DAT=$(DISTY_DAT)
cp $(DISTY_DAT) $(DISTY_IN)
$(RMV) $(DISTY_RMDIR)
( cd $(DISTY_TMP)/icu ; python as_is/bomlist.py > as_is/bomlist.txt || rm -f as_is/bomlist.txt )
( cd $(DISTY_TMP)/icu/icu4c ; python as_is/bomlist.py > as_is/bomlist.txt || rm -f as_is/bomlist.txt )
( cd $(DISTY_TMP) ; tar cfpzh $(DISTY_FILE_TGZ) icu )
( cd $(DISTY_TMP) ; zip -rlq $(DISTY_FILE_ZIP) icu )
$(RMV) $(DISTY_TMP)
ln -sf $(shell basename $(DISTY_FILE_ZIP)) $(DISTY_FILE_DIR)/icu4c-src.zip
ln -sf $(shell basename $(DISTY_FILE_TGZ)) $(DISTY_FILE_DIR)/icu4c-src.tgz
ln -sf $(shell basename $(DISTY_FILE_ZIP)) $(DISTY_FILE_DIR)/icu-combined-src.zip
ln -sf $(shell basename $(DISTY_FILE_TGZ)) $(DISTY_FILE_DIR)/icu-combined-src.tgz
ln -sf $(shell basename $(DISTY_DATA_ZIP)) $(DISTY_FILE_DIR)/icu4c-data.zip
ln -f $(DISTY_FILE_ZIP) $(DISTY_FILE_DIR)/icu4c-$(DISTY_VER)-src.zip
ln -f $(DISTY_FILE_TGZ) $(DISTY_FILE_DIR)/icu4c-$(DISTY_VER)-src.tgz
ln -f $(DISTY_FILE_ZIP) $(DISTY_FILE_DIR)/icu-combined-$(DISTY_VER)-src.zip
ln -f $(DISTY_FILE_TGZ) $(DISTY_FILE_DIR)/icu-combined-$(DISTY_VER)-src.tgz
ln -f $(DISTY_DATA_ZIP) $(DISTY_FILE_DIR)/icu4c-$(DISTY_VER)-data.zip
ls -l $(DISTY_FILE_TGZ) $(DISTY_FILE_ZIP) $(DISTY_DATA_ZIP)

Expand All @@ -98,4 +98,4 @@ distcheck-tgz: $(DISTY_FILE_TGZ)
@echo Checking $(DISTY_FILE_TGZ)
@-$(RMV) $(DISTY_CHECK)
@$(MKINSTALLDIRS) $(DISTY_CHECK)
@(cd $(DISTY_CHECK) && tar xfpz $(DISTY_FILE_TGZ) && cd icu/source && $(SHELL) ./configure $(DISTCHECK_CONFIG_OPTIONS) && $(MAKE) check $(DISTCHECK_MAKE_OPTIONS) ) && (echo "!!! PASS: $(DISTY_FILE_TGZ)" )
@(cd $(DISTY_CHECK) && tar xfpz $(DISTY_FILE_TGZ) && cd icu/icu4c/source && $(SHELL) ./configure $(DISTCHECK_CONFIG_OPTIONS) && $(MAKE) check $(DISTCHECK_MAKE_OPTIONS) ) && (echo "!!! PASS: $(DISTY_FILE_TGZ)" )
23 changes: 8 additions & 15 deletions icu4c/source/test/intltest/intltest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1694,26 +1694,19 @@ static bool fileExists(const char* fileName) {
* Returns the path to icu/testdata/
*/
const char *IntlTest::getSharedTestData(UErrorCode& err) {
#define SOURCE_TARBALL_TOP U_TOPSRCDIR U_FILE_SEP_STRING ".." U_FILE_SEP_STRING
#define REPO_TOP SOURCE_TARBALL_TOP ".." U_FILE_SEP_STRING
#define REPO_TOP U_TOPSRCDIR U_FILE_SEP_STRING ".." U_FILE_SEP_STRING ".." U_FILE_SEP_STRING
#define FILE_NAME U_FILE_SEP_STRING "message2" U_FILE_SEP_STRING "valid-tests.json"
const char *srcDataDir = nullptr;
const char *testFile = nullptr;
if (U_SUCCESS(err)) {
#ifdef U_TOPSRCDIR
// Try U_TOPSRCDIR/../testdata (source tarball)
srcDataDir = SOURCE_TARBALL_TOP "testdata" U_FILE_SEP_STRING;
testFile = SOURCE_TARBALL_TOP "testdata" FILE_NAME;
if (!fileExists(testFile)) {
// If that doesn't exist, try U_TOPSRCDIR/../../testdata (in-repo)
srcDataDir = REPO_TOP "testdata" U_FILE_SEP_STRING;
testFile = REPO_TOP "testdata" FILE_NAME;
if (!fileExists(testFile)) {
// If neither exists, return null
err = U_FILE_ACCESS_ERROR;
srcDataDir = nullptr;
}
}
srcDataDir = REPO_TOP "testdata" U_FILE_SEP_STRING;
testFile = REPO_TOP "testdata" FILE_NAME;
if (!fileExists(testFile)) {
// If neither exists, return null
err = U_FILE_ACCESS_ERROR;
srcDataDir = nullptr;
}
#else
// Try ../../../../testdata (if we're in icu/source/test/intltest)
// and ../../../../../../testdata (if we're in icu/source/test/intltest/Platform/(Debug|Release)
Expand Down