You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by el...@apache.org on 2016/09/01 18:58:00 UTC
svn commit: r1758837 - in /phoenix: build.sh phoenix-docs/build.sh
site/publish/building_website.html
site/source/src/site/markdown/building_website.md
Author: elserj
Date: Thu Sep 1 18:58:00 2016
New Revision: 1758837
URL: http://svn.apache.org/viewvc?rev=1758837&view=rev
Log:
PHOENIX-3238 Clean up site build scripts
* Ensures that existing files are removed for new files to replace them
* Prevents a dock icon from appearing on OSX
* Removes invalid steps after point #1
Modified:
phoenix/build.sh
phoenix/phoenix-docs/build.sh
phoenix/site/publish/building_website.html
phoenix/site/source/src/site/markdown/building_website.md
Modified: phoenix/build.sh
URL: http://svn.apache.org/viewvc/phoenix/build.sh?rev=1758837&r1=1758836&r2=1758837&view=diff
==============================================================================
--- phoenix/build.sh (original)
+++ phoenix/build.sh Thu Sep 1 18:58:00 2016
@@ -4,7 +4,7 @@ echo ""
echo "BUILDING LANGUAGE REFERENCE"
echo "==========================="
-rm -rf /site/publish/language
+rm -rf ./site/publish/language
cd phoenix-docs
./build.sh docs
echo ""
Modified: phoenix/phoenix-docs/build.sh
URL: http://svn.apache.org/viewvc/phoenix/phoenix-docs/build.sh?rev=1758837&r1=1758836&r2=1758837&view=diff
==============================================================================
--- phoenix/phoenix-docs/build.sh (original)
+++ phoenix/phoenix-docs/build.sh Thu Sep 1 18:58:00 2016
@@ -10,4 +10,4 @@ if [ "$1" = "clean" ] ; then rm -rf temp
if [ ! -d "temp" ] ; then mkdir temp ; fi
if [ ! -d "bin" ] ; then mkdir bin ; fi
"$JAVA_HOME/bin/javac" -sourcepath src/tools -d bin src/tools/org/h2/build/*.java
-"$JAVA_HOME/bin/java" -Xmx256m -cp "bin:$JAVA_HOME/lib/tools.jar:temp" org.h2.build.Build $@
+"$JAVA_HOME/bin/java" -Xmx256m -cp "bin:$JAVA_HOME/lib/tools.jar:temp" -Dapple.awt.UIElement=true org.h2.build.Build $@
Modified: phoenix/site/publish/building_website.html
URL: http://svn.apache.org/viewvc/phoenix/site/publish/building_website.html?rev=1758837&r1=1758836&r2=1758837&view=diff
==============================================================================
--- phoenix/site/publish/building_website.html (original)
+++ phoenix/site/publish/building_website.html Thu Sep 1 18:58:00 2016
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<!--
- Generated by Apache Maven Doxia at 2016-08-19
+ Generated by Apache Maven Doxia at 2016-09-01
Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
-->
<html xml:lang="en" lang="en">
@@ -158,7 +158,7 @@
</div>
<ol style="list-style-type: decimal">
<li>Edit/Add source markdown files in <tt>/src/site/markdown</tt> directory.</li>
- <li>Edit <tt>phoenix-docs/src/docsrc/help/phoenix.csv</tt> to update Reference pages, adding any missing new words to <tt>phoenix-docs/src/tools/org/h2/build/doc/dictionary.txt</tt>, and manually remove <tt>site/publish/language/*.html</tt>.</li>
+ <li>Edit <tt>phoenix-docs/src/docsrc/help/phoenix.csv</tt> to update Reference pages, adding any missing new words to <tt>phoenix-docs/src/tools/org/h2/build/doc/dictionary.txt</tt>.</li>
<li>Run <tt>build.sh</tt> located at root to generate/update html web pages in <tt>site/publish</tt> directory</li>
<li><tt>svn commit</tt> source markdown files and html web pages</li>
</ol>
Modified: phoenix/site/source/src/site/markdown/building_website.md
URL: http://svn.apache.org/viewvc/phoenix/site/source/src/site/markdown/building_website.md?rev=1758837&r1=1758836&r2=1758837&view=diff
==============================================================================
--- phoenix/site/source/src/site/markdown/building_website.md (original)
+++ phoenix/site/source/src/site/markdown/building_website.md Thu Sep 1 18:58:00 2016
@@ -7,7 +7,7 @@
```
2. Edit/Add source markdown files in `/src/site/markdown` directory.
-2. Edit `phoenix-docs/src/docsrc/help/phoenix.csv` to update Reference pages, adding any missing new words to `phoenix-docs/src/tools/org/h2/build/doc/dictionary.txt`, and manually remove `site/publish/language/*.html`.
+2. Edit `phoenix-docs/src/docsrc/help/phoenix.csv` to update Reference pages, adding any missing new words to `phoenix-docs/src/tools/org/h2/build/doc/dictionary.txt`.
3. Run `build.sh` located at root to generate/update html web pages in `site/publish` directory
4. `svn commit` source markdown files and html web pages