You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by sm...@apache.org on 2012/05/17 11:24:16 UTC

svn commit: r1339529 - in /pivot/site/trunk: README build.xml

Author: smartini
Date: Thu May 17 09:24:15 2012
New Revision: 1339529

URL: http://svn.apache.org/viewvc?rev=1339529&view=rev
Log:
updated some info on web site generation/update via ant

Modified:
    pivot/site/trunk/README
    pivot/site/trunk/build.xml

Modified: pivot/site/trunk/README
URL: http://svn.apache.org/viewvc/pivot/site/trunk/README?rev=1339529&r1=1339528&r2=1339529&view=diff
==============================================================================
--- pivot/site/trunk/README (original)
+++ pivot/site/trunk/README Thu May 17 09:24:15 2012
@@ -13,6 +13,17 @@ follows:
 
   $ ant -Dfolder.trunk=/path/to/pivot/trunk build
 
-Make sure you don't run clean, as this will wipe the deploy/.svn/ folder. To deploy updated pages
-to the Pivot web site, you check in the built files, then ssh over to people.apache.org, go to
-/www/pivot.apache.org/, and svn update.
+
+Make sure you don't run clean, as this will wipe the deploy/.svn/ folder.
+To deploy updated pages to the Pivot web site, now it'e enough to check in the built files.
+
+
+Note that when regenerating the site, the version is taken from the build.properties file
+in pivot trunk, so for example during a web site maintenance/update:
+change it back temporary to the current version published in the web site, 
+and finally revert local changes to that file.
+
+For example:
+
+  $ ant -Dfolder.trunk=../../trunk build
+

Modified: pivot/site/trunk/build.xml
URL: http://svn.apache.org/viewvc/pivot/site/trunk/build.xml?rev=1339529&r1=1339528&r2=1339529&view=diff
==============================================================================
--- pivot/site/trunk/build.xml (original)
+++ pivot/site/trunk/build.xml Thu May 17 09:24:15 2012
@@ -17,10 +17,16 @@ limitations under the License.
 -->
 
 <project name="pivot-site" default="build" basedir=".">
+
+    <!-- Properties that affect the directories that are created as part of the build -->
     <property name="folder.trunk" location="trunk"/>
     <property name="folder.deploy" location="deploy"/>
+
+    <!-- Dynamic properties -->
     <property file="${folder.trunk}/build.properties"/>
 
+
+    <!-- Ant argument check -->
     <fail unless="version">
     <![CDATA[
     Error:
@@ -28,8 +34,8 @@ limitations under the License.
     Usage: ant [-Dfolder.trunk=pathtotrunk] [target]
 
     Parameters:
-      folder.trunk    This specifies the absolute file system location of the 
-                      pivot trunk. The site pulls the current Pivot version, 
+      folder.trunk    This specifies the file system location of the pivot trunk. 
+	                  The site pulls the current Pivot version, 
                       the demos, and the tutorials from this location. 
                       If unspecified, it will default to 'trunk', meaning that 
                       you can either check the trunk out into this folder, 
@@ -39,6 +45,7 @@ limitations under the License.
     ]]>
     </fail>
 
+
     <!-- Transform macro -->
     <macrodef name="transform">
         <attribute name="stylesheet"/>
@@ -58,6 +65,13 @@ limitations under the License.
         </sequential>
     </macrodef>
 
+
+    <!-- Removes build artifacts -->
+    <target name="clean" description="Removes build artifacts">
+        <delete dir="${folder.deploy}"/>
+    </target>
+
+    <!-- Builds the site -->
     <target name="build" description="Builds the site">
         <!-- perform XSLT transformations -->
         <transform stylesheet="xsl/index.xsl">
@@ -131,7 +145,4 @@ limitations under the License.
         </javadoc>
     </target>
 
-    <target name="clean" description="Removes build artifacts">
-        <delete dir="${folder.deploy}"/>
-    </target>
 </project>