Repository: vxquery Updated Branches: refs/heads/site a506d0512 -> 7b0801e25
More site clean up for pushing site updates. Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/14a231c4 Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/14a231c4 Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/14a231c4 Branch: refs/heads/site Commit: 14a231c45805af8be54a64b354851be695d8302e Parents: 7521b53 Author: Preston Carman <[email protected]> Authored: Thu Jul 16 10:33:42 2015 -0700 Committer: Preston Carman <[email protected]> Committed: Thu Jul 23 15:23:36 2015 -0700 ---------------------------------------------------------------------- src/site/apt/development_site_update.apt | 41 +++++++++++++++++++++++++-- src/site/site.xml | 12 ++++---- 2 files changed, 45 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/vxquery/blob/14a231c4/src/site/apt/development_site_update.apt ---------------------------------------------------------------------- diff --git a/src/site/apt/development_site_update.apt b/src/site/apt/development_site_update.apt index 2d37f99..3783512 100644 --- a/src/site/apt/development_site_update.apt +++ b/src/site/apt/development_site_update.apt @@ -15,13 +15,50 @@ Updating the Apache VXQuery\x99 site +* One time steps + + * set up directory structure + + There usually are 2 directories at the same level + + * the source directory <<<vxquery>>>, + + * the <<<site>>> directory, and + + The source directory is version-controlled by <<<git>>>, the other is + version controlled by <<<svn>>>. + While the source directory can have an arbitrary name and location, + the <<<site>>> directory has to be called <<<site>>> and it needs to + be at the same level as the source directory to enable site deployment. + + Assuming that the source directory is available one can create the + directory structure by going to the directory that contains the + source directory and checking out the distribution and site + directories: + +--- +$ svn co https://dist.apache.org/repos/dist/release/vxquery dist +$ svn co https://svn.apache.org/repos/asf/vxquery/site +--- + * update the <<<site>>> branch in git - When pushing changes to the site without a code release, the following git - command will create a patch of only differences with in the site. + * New release steps + + Please switch to the {{{http://vxquery.apache.org/development_release.html}release steps}} + and follow their directions. + + * Incremental site update + + When pushing changes to the site without a code release, the following git + commands will create a patch of only differences within the src/site folder. + Please verify the patch before applying it the site ----- +git checkout master git diff site src/site/ > ../site.patch" +git checkout site +git apply ../site.patch ---- * build a new site and deploy it to <<<../site>>> http://git-wip-us.apache.org/repos/asf/vxquery/blob/14a231c4/src/site/site.xml ---------------------------------------------------------------------- diff --git a/src/site/site.xml b/src/site/site.xml index 6758899..08e4522 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -84,12 +84,6 @@ limitations under the License. name="Data Handling" href="development_data_handling.html" /> <item - name="XML Data and Node Types" - href="development_xml_node_details.html" /> - <item - name="XML Data Model Example" - href="development_xml_document.html" /> - <item name="Eclipse Setup" href="development_eclipse_setup.html" /> <item @@ -101,6 +95,12 @@ limitations under the License. <item name="Update Local Git XQTS Results" href="development_update_xqts_results.html" /> + <item + name="XML Data and Node Types" + href="development_xml_node_details.html" /> + <item + name="XML Data Model Example" + href="development_xml_document.html" /> <!-- <item name="XQuery Benchmarks" href="development_benchmarks.html" /> -->
