You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ka...@apache.org on 2018/01/15 19:57:54 UTC
[1/2] storm-site git commit: Update README,
the guide for building the site was not correct
Repository: storm-site
Updated Branches:
refs/heads/asf-site b9be84eb2 -> 9dc4e0d9a
Update README, the guide for building the site was not correct
Project: http://git-wip-us.apache.org/repos/asf/storm-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm-site/commit/964e87f2
Tree: http://git-wip-us.apache.org/repos/asf/storm-site/tree/964e87f2
Diff: http://git-wip-us.apache.org/repos/asf/storm-site/diff/964e87f2
Branch: refs/heads/asf-site
Commit: 964e87f236f6c0dd3c980be743ca4d6a540969df
Parents: b9be84e
Author: Stig Rohde Døssing <st...@gmail.com>
Authored: Tue Jan 9 20:02:00 2018 +0100
Committer: Stig Rohde Døssing <st...@gmail.com>
Committed: Sat Jan 13 15:10:37 2018 +0100
----------------------------------------------------------------------
README.md | 66 ++++++++++++++++++++++++++--------------------------------
1 file changed, 29 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm-site/blob/964e87f2/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index e6d939b..f26255a 100644
--- a/README.md
+++ b/README.md
@@ -1,28 +1,21 @@
# Apache Storm Website and Documentation
This is the source for the Release specific part of the Apache Storm website and documentation. It is statically generated using [jekyll](http://jekyllrb.com).
-## Generate Javadoc
-
-You have to generate javadoc on project root before generating document site.
+## Site Generation
+First install jekyll and bundler (assuming you have ruby installed):
```
-mvn javadoc:javadoc -Dnotimestamp=true
-mvn javadoc:aggregate -DreportOutputDirectory=./docs/ -DdestDir=javadocs -Dnotimestamp=true
+gem install jekyll bundler
```
-You need to create distribution package with gpg certificate. Please refer [here](https://github.com/apache/storm/blob/master/DEVELOPER.md#packaging).
-
-## Site Generation
-First install jekyll (assuming you have ruby installed):
-
+Fetch/update site dependencies
```
-gem install jekyll
+bundle install
```
Generate the site, and start a server locally:
```
-cd docs
-jekyll serve -w
+bundle exec jekyll serve -w
```
The `-w` option tells jekyll to watch for changes to files and regenerate the site automatically when any content changes.
@@ -31,48 +24,47 @@ Point your browser to http://localhost:4000
By default, jekyll will generate the site in a `_site` directory.
-This will only show the portion of the documentation that is specific to this release.
-
## Adding a new release to the website
-In order to add a new relase, you must have committer access to Storm's subversion repository at https://svn.apache.org/repos/asf/storm/site.
-
-Release documentation is placed under the releases directory named after the release version. Most metadata about the release will be generated automatically from the name using a jekyll plugin. Or by plaing them in the _data/releases.yml file.
+In order to add a new release, you must have committer access to the storm-site repository at https://github.com/apache/storm-site.
-To create a new release run the following from the main git directory
+You must first generate Javadoc for the new release. Check out the Storm repository from https://github.com/apache/storm, and check out the version of the code you are releasing.
+In the Storm project root run
```
mvn javadoc:javadoc -Dnotimestamp=true
mvn javadoc:aggregate -DreportOutputDirectory=./docs/ -DdestDir=javadocs -Dnotimestamp=true
-mkdir ${path_to_svn}/releases/${release_name}
+```
+
+In the storm-site project, release documentation is placed under the releases directory named after the release version. See [below](#how-release-specific-docs-work) for details about release specific documentation.
+
+To add documentation for a new release, run the following from the Storm project root
+
+```
+mkdir ${path_to_storm_site}/releases/${release_name}
#Copy everything over, and compare checksums, except for things that are part of the site,
# and are not release specific like the _* directories that are jekyll specific
# assests/ css/ and README.md
rsync -ac --delete --exclude _\* --exclude assets --exclude css --exclude README.md ./docs/ ${path_to_svn}/releases/${release_name}
-cd ${path_to_svn}
-svn add releases/${release_name}
-svn commit
+cd ${path_to_storm_site}
+git add releases/${release_name}
+git commit
```
-to publish a new release run
-
+To publish the site, run the following from the storm-site root
```
-cd ${path_to_svn}
-jekyll build -d publish/
-svn add publish/ #Add any new files
-svn commit
+bundle exec jekyll build -d content
+git add content
+git commit
```
+and push the commit to the asf-site branch.
## How release specific docs work
-Release specific documentation is controlled by a jekyll plugin [releases.rb](./_plugins/releases.rb)
-
-If the plugin is running from the git repo the config `storm_release_only` is set and teh plugin will treat all of the markdown files as release sepcific file.
-
-If it is running from the subversion repositiory it will look in the releases driectory for release sepcific docs.
+Release specific documentation is controlled by a jekyll plugin [releases.rb](./_plugins/releases.rb).
-http://svn.apache.org/viewvc/storm/site/releases/
+The plugin will look in the [releases](https://github.com/apache/storm-site/tree/asf-site/releases) directory for release specific docs.
-Each sub directory named after the release in question. The "current" release is pointed to by a symlink in that directory called `current`.
+Each sub directory is named after the release in question. The "current" release is pointed to by a symlink in that directory called `current`.
The plugin sets three configs for each release page.
@@ -80,7 +72,7 @@ The plugin sets three configs for each release page.
* git-tree-base - a link to a directory in github that this version is on
* git-blob-base - a link to to where on github that this version is on, but should be used when pointing to files.
-If `storm_release_only` is set for the project the version is determined from the maven pom.xml and the branch is the current branch in git. If it is not set the version is determined by the name of the sub-directory and branch is assumed to be a `"v#{version}"` which corresponds with our naming conventions. For SNAPSHOT releases you will need to override this in `_data/releases.yml`
+The version is determined by the name of the `releases/${release_name}` sub-directory and branch is assumed to be a `"v#{version}"` which corresponds with our naming conventions. For SNAPSHOT releases you will need to override this in `_data/releases.yml`
The plugin also augments the `site.data.releases` dataset.
Each release in the list includes the following, and each can be set in `_data/releases.yml` to override what is automatically generated by the plugin.
[2/2] storm-site git commit: Merge branch 'fix-readme' of
https://github.com/srdo/storm-site into pr-3-merge
Posted by ka...@apache.org.
Merge branch 'fix-readme' of https://github.com/srdo/storm-site into pr-3-merge
Project: http://git-wip-us.apache.org/repos/asf/storm-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm-site/commit/9dc4e0d9
Tree: http://git-wip-us.apache.org/repos/asf/storm-site/tree/9dc4e0d9
Diff: http://git-wip-us.apache.org/repos/asf/storm-site/diff/9dc4e0d9
Branch: refs/heads/asf-site
Commit: 9dc4e0d9a49e5db5a51cfc9dc93c209a1b677fd6
Parents: b9be84e 964e87f
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Tue Jan 16 04:56:57 2018 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Tue Jan 16 04:56:57 2018 +0900
----------------------------------------------------------------------
README.md | 66 ++++++++++++++++++++++++++--------------------------------
1 file changed, 29 insertions(+), 37 deletions(-)
----------------------------------------------------------------------