Various build and deploy fixes from the FS branch #627
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
Previously it was always necessary to be in the top-level directory for build.py to work properly. Now, if os.chdir is always performed to the top-level, and if a build.xml file is present in the current working dir (before os.chdir) then it will be passed to ant as "-f `pwd`/build.xml"" This allows: ../../../build.py test and similar from OmeroPy etc.
Previous minor fixes to build.py allowed called from anywhere in the source repository. If a build.xml is present in the current directory, that is used. If not, then the top-level directory is used. However, there was no way to use the top-level when a build.xml was present. `-top` now allows this.
Now, "-fs", "-java", "-cpp", "-web", and "-py" all run the builds at the proper layer, i.e. equivalent to: ./build.py -f components/tools/X/build.xml
|
All changes work as expected. The two things I'd probably flag as missing are:
|
|
@bpindelski, fair enough. Opened https://trac.openmicroscopy.org.uk/ome/ticket/10236 since the changes will need to go to both branches, and update the submodule. |
joshmoore
added a commit
that referenced
this pull request
Jan 22, 2013
Various build and deploy fixes from the FS branch
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.
== Build ==
These are constitute a number of scripts that I've had
for some time locally, but which make server work faster
and therefore should be available for everyone. A general
workflow might be:
This will:
Also available are:
== Deploy ==
The blitz-gc target is now available for use with
bin/omero adminin order to enable GC logging:
Finally, the ignore=dirty .gitmodule statements should make the
output of
git statusa bit nicer and prevent odd messages ongit commit -awhen using hooks.