Commit Graph
48 Commits
Author SHA1 Message Date
John Chilton 4945f55e4f Makefile shortcuts for configuration script. 2017-08-10 13:15:31 -04:00
John Chilton f78b5709a5 Simplify RC creation in Makefile.
These commands fail without any harm and then prevent the important echo statements from printing that follow them.
2017-05-02 15:02:31 -04:00
Martin Cech 7edfe39f20 fix makefile help for docs
thanks nsoranzo
2017-04-26 15:10:04 -04:00
Martin Cech d42fc9ae71 Merge branch 'dev' into fix_documentation_build 2017-04-26 14:23:38 -04:00
Martin Cech 647b4901c3 move reqs to dev-requirements and touch makefile 2017-04-26 14:19:04 -04:00
Dannon Baker 015c32854f Override possible env var use which can break this -- we always want to use Galaxy's modules here anyway 2016-12-12 12:19:28 -05:00
Dannon Baker 49cdd7082d Shot in the dark at @nsoranzo's build woes. 2016-12-12 11:50:12 -05:00
Dannon Baker a0ae63d8c2 Set NODE_MODULES var for 'grunt charts', required due to the execution model here. 2016-12-12 11:33:41 -05:00
Dannon Baker 28c2acf17d Adds a 'make charts' makefile target to make it more obvious how to
build these.  Not invoked automatically though, since these should very
rarely conflict and we don't want to have version build difference
conflicts (harmless) all the time.
2016-12-12 10:15:11 -05:00
John Chilton 6c4d430d75 Add note about building docs to Makefile. 2016-11-14 08:47:16 -05:00
Nicola Soranzo 3180b63166 Properly integrate tool XML schema with docs
Generate intermediate rst file instead of html
Move generation to doc/Makefile
Use pandoc to generate table of contents and fragment ids.
Remove nested inline markup (not supported by reStructuredText)
Fix https and other links.
2016-10-24 19:42:19 +01:00
Martin Cech 00c48e4878 remove the rest of the badle merged target 2016-10-24 14:09:16 -04:00
Martin Cech 0f0bcb6a08 fix bad merge in #3060 2016-10-24 13:39:56 -04:00
Martin Cech 564aeeccd7 remove the duplicated variable 2016-10-17 14:13:01 -04:00
Remi Marenco 3e737c99ea Add Galaxy Architecture slides in .md
+ the plumbing for slides creation

Init of #2244, second part: Python converter md to html + wip on GCC 2015 talk conversion
Add the 2. Galaxy app architecture. Need images
Add the 3. Galaxy components and object model
Add more content in md
Fix linting error by adding newline at the end of build_slideshow.py
Moved the galaxyArchitecture.md into a folder dedicated to it
Add 7th and 17th image + add style.css to have a better management of layout + added first slide as the first in GCC2015 slide
Set properly the CSS used in the whole presentation + add special to p and first slide
Add special orange for regular text and green emphasis (emphasis_2_galaxy)
Changed the font to PT Sans
Add 3. with images + few modifications
Removed the images integrated using background-image by now Markdown imaging (still need work, image's size seems not good by default
Add Makefile target to build architecture slides...
2016 Updates to 2015 architecture talk.
More intro slides for Galaxy architecture.
Update author line.
Progress on architecture slides...
 - Improved styling (use Oxygen - closer to Galaxy font)
 - Add ability to generate SVG diagrams to slide infrastructure
 - Add newer client-server sequence diagram based on that.
Improved logging when there are problems with SQL migrations.
More misc work on architecture talk.
More images, slides, slide formatting, and initial work on an IPython notebook.
Improved styling for architecture slides...
Updates to architecture talk...
- Infrastructure for building class diagrams with plantuml
- Bring in move SVGs from last year's google docs.
- Fill out section on client architecture.
More work on slides for architecture talk.
Add startup_output.
Replace mermaid diagrams with plantuml diagrams.
Fill out these diagrams more and style them for a black background in Galaxy oranges.
2016-10-17 14:02:06 -04:00
Martin Cech bb91a10a4c modify target for tool schema html builder to use pandoc
this is @jmchilton committing as @martenson...pssst
2016-09-21 13:41:25 -04:00
John Chilton a8bc9d5d16 XSD Generated Tool Documentation.
- Add script to generate Markdown documentation from the XSD.
 - Add Makefile target to build these docs, convert to HTML, and open respectively.
2016-09-21 08:41:12 -04:00
John Chilton 2c866e38d6 Automate more of the release process...
... this has worked for a couple releases now - time for the computer to push these tags instead of error-prone humans.
2016-08-25 13:44:30 -04:00
Dannon Baker 483eb45e50 Add a single target. Execute with make -j client-develop. 2016-08-09 10:08:54 -04:00
Dannon Baker 53633a0ac5 Add a few watching makefile targets for quick iterative development of
the client.  Execute in parallel, which is super handy, using something
like `make -j webpack-watch grunt-watch-style grunt-watch-develop`.
Make sure to rerun the root `make client` before committing though!
2016-08-09 10:05:51 -04:00
Dannon Baker ef0d27d677 Change extension of the file that gets immediately deleted to address nsoranzo's concern about bsd utilities. 2016-08-01 11:19:22 -04:00
Dannon Baker 00e41385d7 The previous approach to sed worked great on bsd sed, but gnu sed
doesn't understand an empty '' in-place extension the same way.  So,
fixed one, broke the other.

This approach with the -e argument feels like a total hack since it
explits the fact that bsd sed consumes the -e as the argument to -i, but
it still has the command interpreted correctly.
2016-08-01 09:11:49 -04:00
Dannon Baker 2c75551a02 Fix sed usage in Makefile to be compatible with both gnu and bsd sed. -i's argument is not optional for bsd, but an empty string (no backup extension) works fine and has the same behavior as gnu sed. 2016-08-01 07:48:50 -04:00
Dannon Baker dc668a0bf3 Checkout dev again prior to version branch deletion. This prevents
error: Cannot delete the branch 'blah' which you are currently on
2016-07-29 12:56:39 -04:00
Dannon Baker 6be8d6356d Remove unused def 2016-07-29 12:40:34 -04:00
Dannon Baker 820d545d3a Roll the check into the rule so it gets reevaluated 2016-07-29 12:40:00 -04:00
Dannon Baker 5c38221971 A different form of upstream check that works on osx (and hopefully
still other locations).
2016-07-29 12:30:37 -04:00
John Chilton aeb05e7645 Add Makefile target for fetching updated bower dependencies.
This mirrors the existing `client` target and serves as top-level documentation for how to perform this action.
2016-06-23 20:23:18 -04:00
John Chilton 5a8d2a1ad8 More clarification of release process. 2016-05-18 08:03:08 -04:00
carlfeberhard b5c198a7bc Build: remove redundant webpack step in makefile
Removes the webpack make target and the 'webpack' call from client
target. The webpack production build step is already called from
the `grunt` step.
2016-05-09 13:07:10 -04:00
John Chilton af42338ecc Automate and clarify more of the release process.
upstream is used repeatedly and just assumed to be a remote - this tests for it and adds it if it doesn't exist before using in make commands now. This also automates the previous release to dev merge in the instructions with a new Make command.

Additionally, two PRs need to be created to update versions. This prints a reminder to do this and adds it to the release checklist. Ideally, these PRs could be avoided with a direct push or automatically created with hub (https://github.com/github/hub).
2016-04-08 14:17:55 -04:00
Eric Rasche 9d8957d121 Document a couple other targets 2016-03-22 16:31:15 +00:00
John Chilton 9a6d396230 Fix docs Makefile target. 2016-03-22 11:25:19 +00:00
Eric Rasche 3a1c846902 Remove duplicate help target
And reformat for using existing help-text helper

Fixes #1979
2016-03-22 16:15:22 +00:00
John Chilton eee044aa70 Work toward automating deployment.
Create new makefile targets for release management.

 - ``release-create-issue``: Automates creating a release checklist - https://github.com/jmchilton/galaxy/issues/41)
   Check list contains actual tailored ``make`` commands and links (for PRs and issues).
 - ``release-check-metadata``: Checks milestone PRs for required metadata needed for generating bootstrapped release notes.
 ` ``release-bootstrap-history``: Bootstrap release notes from PRs and metadata.
 - ``release-check-blocking-prs``: Check for PRs blocking release, should happen before branching release and before tagging release.
 - ``release-check-blocking-issues``: Check for Issues blocking release, should happen before tagging release. (Only allowed issue is the release creation issue.)

The issue created with ``release-create-issue`` documents how and when to execute subsequent ``make`` targets (including the target to create the issue for the next release).

This PR contains a bunch of other enhancements to the bootstrap_history.py script to enable these targets and renames ``create_release_rc`` Makefile target so all release related targets start with the prefix ``release-``.

Conflicts:
	Makefile
2016-03-16 15:02:02 +00:00
Eric Rasche b9c8d5beb4 Duplicate @jxtx's fix 2016-03-01 03:08:51 +00:00
Eric Rasche a034238c8c Silence expr warning 2016-03-01 01:25:36 +00:00
Eric Rasche e122bb8f5d Annotate make targets
Saw this cute trick http://marmelab.com/blog/2016/02/29/auto-documented-makefile.html
and figured it wouldn't be too hard to do here as well.

Produces a nice help text for commands
2016-03-01 01:23:28 +00:00
Nate Coraor 5b515a76cd Update Makefile for release/point releases 2016-02-24 16:53:18 -05:00
Eric Rasche f8072a8e48 Configurable upstream 2016-01-06 11:36:18 -06:00
Eric Rasche d848f83e8d Correct name, minor version 2016-01-05 20:46:43 -06:00
Eric Rasche cd1cc96d5d Implement code from @natefoo comment
https://github.com/galaxyproject/galaxy/issues/715#issuecomment-169148056
2016-01-05 17:22:36 -06:00
Dannon Baker 41b77d0c13 Use local versions of node modules instead of system-installed, add a 'build-it-all' target for building the whole client.
Fix two old typos.
2015-12-16 10:09:52 -05:00
Eric Rasche 1295f98510 Rename docker image 2015-12-04 13:36:10 -06:00
Eric Rasche a0c7d87db3 Ease the grunt uglify process 2015-12-04 12:09:40 -06:00
Nate Coraor 9e5f864553 Cleanup old stuff in the root dir. 2011-01-28 16:50:02 -05:00
Daniel Blankenberg b40fc9a4f2 Remove outdated about.rst/html. 2010-06-30 11:09:14 -04:00
James Taylor f788a34fca Moving james-wsgi branch to new trunk. 2006-11-15 16:28:21 +00:00