setup.sh - Fixes for running in basic composer file-structure #16408
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
|
(Standard links)
|
totten
commented
Jan 28, 2020
| @@ -4,7 +4,8 @@ | |||
| die("GenCode can only be run from command line."); | |||
| } | |||
|
|
|||
| ini_set('include_path', '.' . PATH_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'packages' . PATH_SEPARATOR . '..'); | |||
| $includes = ['.', '../packages', '../../civicrm-packages', '..']; | |||
| ini_set('include_path', implode(PATH_SEPARATOR, $includes)); | |||
There was a problem hiding this comment.
The original mix of PATH_SEPARATOR and DIRECTORY_SEPARATOR and dots might make your eyes glaze over. (At least, it made my eyes glaze over...) Trying to summarize this bit, it:
- Switches to array notation to make it is easier to read
- Retains all the existing items in the search-list (
.,../packages,..) - Adds a new item to the search-list (
../../civicrm-packages)
|
Test fail unerlated and this looks fine to me merging |
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.
Overview
Suppose you make a build of the form:
which gives you folders
If you do development on this build, you may need to run
bin/setup.sh(akaxml/GenCode.php) periodically to update the DAO files.Before
bin/setup.shraises multiple errors.After
bin/setup.shis able to run (with caveats).Comments
The example steps in the "Overview" are just a communication aide to describe the file-structure/context - they're not actual instructions.
This PR is an extracted subset of #16328, which was an exploratory branch aimed at supporting deployment of Civi git repos in D8 via composer. The changes are extracted to make the size of the review more manageable. It's probably best to use this smaller PR to consider topics like regression-risk and general code convention rather than trying to assess the fuller aims.