Lines Matching +full:- +full:- +full:git
4 https://github.com/unicode-org/icu/releases.
10 * See http://site.icu-project.org/repository
11 …* [git-lts](https://git-lfs.github.com/) has to be installed to pull binaries correctly from the g…
12 2. Generate a github read-access token and setup a local ~/.m2/setting.xml
16 * http://go/repo-init/aosp-master-with-phones
20 …* The branch is a staging branch to **rebase** Android-specific patches onto the new upstream vers…
21 … instruction at http://g3doc/company/teams/android-build-team/playbook/create_branch#creating-new-…
26 We use the **`aosp/upstream-release-cldr** as the mirror of the upstream release branch.
39 export UPSTREAM_CLDR_GIT=/media/user/disk/icu-git/cldr
40 export UPSTREAM_ICU_GIT=/media/user/disk/icu-git/icu
46 lunch sdk_phone_x86_64-userdebug
49 3. Copy the CLDR sources into the `upstream-release-cldr` branch
53 export CLDR_UPSTREAM_BRANCH=release-${CLDR_VERSION}
56 git fetch aosp upstream-release-cldr
57 git branch ${CLDR_UPSTREAM_BRANCH} --track aosp/upstream-release-cldr
58 git checkout ${CLDR_UPSTREAM_BRANCH}
60 git clone https://github.com/unicode-org/cldr.git ${UPSTREAM_CLDR_GIT}
62 git --git-dir=${UPSTREAM_CLDR_GIT}/.git --work-tree=${UPSTREAM_CLDR_GIT} fetch
63 …git --git-dir=${UPSTREAM_CLDR_GIT}/.git --work-tree=${UPSTREAM_CLDR_GIT} checkout ${CLDR_UPSTREAM_…
64 rm -rf *
65 cp -r ${UPSTREAM_CLDR_GIT}/* .
66 git clean -dfX # Remove ignored files
67 git add -A
68 git commit -F- <<EOF
74 # Upload this CL to upstream-release-cldr branch
75 repo upload --cbr .
80 export CLDR_BRANCH=cldr${CLDR_VERSION}-master
81 git branch ${CLDR_BRANCH} --track aosp/master
82 git checkout ${CLDR_BRANCH}
83 git merge ${CLDR_UPSTREAM_BRANCH} -m "
84 Merge CLDR ${CLDR_VERSION} in upstream-release-cldr into aosp/master
91 3c. Resolve any merge conflicts with the Android-specific patches.
94 git merge --continue
99 repo upload --cbr .
106 export UPSTREAM_RELEASE_TAG=release-${ICU_VERSION}-${ICU_MINOR_VERSION}
107 git fetch aosp ${ICU_BRANCH}
108 git branch ${ICU_BRANCH} --track aosp/${ICU_BRANCH}
109 git checkout ${ICU_BRANCH}
112 test -d ${UPSTREAM_ICU_GIT} || git clone https://github.com/unicode-org/icu.git ${UPSTREAM_ICU_GIT}
114 git --git-dir=${UPSTREAM_ICU_GIT}/.git --work-tree=${UPSTREAM_ICU_GIT} fetch
115 git --git-dir=${UPSTREAM_ICU_GIT}/.git --work-tree=${UPSTREAM_ICU_GIT} checkout ${UPSTREAM_RELEASE_…
116 …ind icu4j/ -type f,d ! -regex ".*/\(Android.mk\|Android.bp\|adjust_icudt_path.mk\|liblayout-jarjar…
117 find icu4c/ -type f,d ! -regex ".*/\(Android.mk\|Android.bp\|.gitignore\|AndroidTest.xml\)" -delete
118 cp -r ${UPSTREAM_ICU_GIT}/icu4j .
119 cp -r ${UPSTREAM_ICU_GIT}/icu4c .
120 git checkout HEAD -- icu4c/.gitignore icu4j/.gitignore # Android has extra .gitignores. Use our ver…
121 rm -r tools/cldr
122 cp -r ${UPSTREAM_ICU_GIT}/tools/cldr tools/cldr
124 git add -A
125 git commit -F- <<EOF
129 …ind icu4j/ -type f,d ! -regex ".*/\(Android.mk\|Android.bp\|adjust_icudt_path.mk\|liblayout-jarjar…
130 find icu4c/ -type f,d ! -regex ".*/\(Android.mk\|Android.bp\|.gitignore\|AndroidTest.xml\)" -delete
131 cp -r \${UPSTREAM_ICU_GIT}/icu4j .
132 cp -r \${UPSTREAM_ICU_GIT}/icu4c .
133 git checkout HEAD -- icu4c/.gitignore icu4j/.gitignore
134 rm -r tools/cldr
135 cp -r \${UPSTREAM_ICU_GIT}/tools/cldr tools/cldr
139 5. Apply Android-specific patches into `external/icu`
141 …5a. Cherry-pick the patches from the last staging branch. For example using the following query fo…
143 * The cherry-pick command is
145 git cherry-pick <first_patch_in_the_chain>~1..<last_patch_in_the_chain>
147 5b. Cherry-pick the patches since the ICU upgrade
149 …h%2522+project:platform/external/icu+status:merged+-owner:automerger+-owner:android-build-coastgua…
158 git add -A
159 git commit -F- <<EOF
172 git add -A
173 git commit -F- <<EOF
187 git add -A
188 git commit -F- <<EOF
200 git add -A
201 git commit -F- <<EOF
213 find android_icu4j/ -name *.orig -delete
215 git commit -amend
218 git add -A && git commit -F- <<EOF
225 6e. Re-genereate libandroidicu/ sources
228 git add -A && git commit -F- <<EOF
243 git add -A && git commit -a -F- <<EOF
255 git diff HEAD~1 ./libicu/ndk_headers/
261 git add -A && git commit -F- <<EOF
275 ./update-tzdata.py
276 git add -A
277 git commit -F- <<EOF
281 system/timezone/update-tzdata.py
292 git add -A
293 git commit -F- <<EOF
294 Regenerate tz-related data files
297 system/timezone/update-tzdata.py
307 3. `git commit` the file change
313 git commit -a -F- <<EOF
327 …s CtsLibcoreOjTestCases CtsBionicTestCases CtsTextTestCases minikin_tests -- --abi x86_64 # the pr…
329 7c. Run the host-side test by
330 * ICU4J host-side test `ant check`
331 * ICU4C host-side test `make CINTLTST_OPTS=-w INTLTEST_OPTS=-w check`
333 …views from `aosp/icu${ICU_VERSION}` in `external/icu` and `aosp/upstream-release-cldr` in `externa…
335 repo upload --cbr -o uploadvalidator~skip --no-verify .
340 repo start icu${ICU_VERSION}-master .
341 git merge --no-ff icu${ICU_VERSION} -m "
350 10a. `repo upload --cbr -o uploadvalidator~skip --no-verify .`
359 rm tools/srcgen/allowlisted-public-api.txt
362 m update-api droid
364 git commit -a -F- <<EOF
367 According to the upstream API coverage report external/icu/icu4j/coverage-exclusion.txt,
374 12. Send email android-libcore@ and icu-team@ to announce this.
383 https://googleplex-android.googlesource.com/platform/external/icu/+/sc-dev/README.version
386 - Contains bug fixes / build changes with a small set of API methods added.
387 - Unicode stays at version 14, and no new version has been published yet.