Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 5bf14b8

Browse files
committed
Fix built-in examples update during build
Previously, the built-in examples assembly step of the build system set the `final_folder` parameter of the `unzip` target to the true final installation location of the examples. The behavior of the `unzip` target is to only unzip the archive if `final_folder` doesn't exist. Because that folder will exist any time a previous build has been done and `ant clean` was not run, the archive will not be unzipped. This causes the build to fail after an update to the built-in examples version when it attempts to copy the examples from the version-dependent extraction staging folder to the final location. The fix is to set the `final_folder` parameter to the version-dependent staging folder location, which will cause the extraction to happen every time the examples version is updated, but to be skipped when there was no update.
1 parent 7a9234c commit 5bf14b8

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

‎build/build.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,8 @@
242242
<antcall target="unzip">
243243
<param name="archive_file" value="${BUILT-IN-EXAMPLES-REPOSITORY-NAME}-${BUILT-IN-EXAMPLES-VERSION}.zip" />
244244
<param name="archive_url" value="https://github.com/${BUILT-IN-EXAMPLES-REPOSITORY-OWNER}/${BUILT-IN-EXAMPLES-REPOSITORY-NAME}/archive/${BUILT-IN-EXAMPLES-VERSION}.zip" />
245-
<param name="final_folder" value="${BUILT-IN-EXAMPLES-FINAL-PATH}" />
245+
<!-- Because the presence of this folder determines whether the extraction happens, this must point to a version-dependent path, otherwise updates will fail -->
246+
<param name="final_folder" value="${BUILT-IN-EXAMPLES-STAGING-PATH}/${BUILT-IN-EXAMPLES-REPOSITORY-NAME}-${BUILT-IN-EXAMPLES-VERSION}/examples" />
246247
<param name="dest_folder" value="${BUILT-IN-EXAMPLES-STAGING-PATH}" />
247248
</antcall>
248249

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /