Changeset 13379


Ignore:
Timestamp:
2006-11-29T17:00:33+13:00 (17 years ago)
Author:
kjdon
Message:

modified these for new distributions

Location:
trunk/gsdl3/dist-resources
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/gsdl3/dist-resources/convert-build-xml-source.xsl

    r10911 r13379  
    1010    <xsl:copy>
    1111      <xsl:copy-of select="@*"/>
    12       <!--<xsl:for-each select="@*">
    13     <xsl:attribute name="name()"><xsl:value-of select="."/></xsl:attribute>
    14       </xsl:for-each>-->
    1512      <xsl:apply-templates/>
    1613    </xsl:copy>
    1714  </xsl:template>
     15     
     16  <!-- delete the unnecessary targets -->
     17  <xsl:template match="target[starts-with(@name, 'prepare')]"></xsl:template>
     18  <xsl:template match="target[starts-with(@name, 'cvsupdate')]"></xsl:template>
     19  <xsl:template match="target[starts-with(@name, 'update')]"></xsl:template>
     20  <xsl:template match="target[starts-with(@name, 'checkout')]"></xsl:template>
     21  <xsl:template match="target[starts-with(@name, 'rename-gs2build')]"></xsl:template>
     22  <xsl:template match="target[@name='test']"></xsl:template>
     23  <xsl:template match="target[@name='get-macos-extra']"></xsl:template>
     24  <xsl:template match="target[@name='get-windows-binaries']"></xsl:template>
    1825 
    19   <!-- delete the install-for-dist target-->
    20   <xsl:template match="target[@name='install-for-dist']">
     26  <xsl:template match="property[@name='install-command']">
     27    <property name="install-command" value="ant [options] install"/>
    2128  </xsl:template>
    22    
    23   <!-- delete the unnecessary targets -->
    24   <xsl:template match="target[starts-with(@name, 'prepare')]">
    25   </xsl:template>
    26   <xsl:template match="target[starts-with(@name, 'cvsupdate')]">
    27   </xsl:template>
    28   <xsl:template match="target[starts-with(@name, 'update')]">
    29   </xsl:template>
    30   <xsl:template match="target[starts-with(@name, 'checkout')]">
    31   </xsl:template>
     29
     30  <xsl:variable name="install-for-dist" select="document('dist-build.xml')/project/target[@name='install-for-source-dist']"/>
    3231 
    33   <!-- save the prepare-tomcat and prepare-mysql targets -->
    34   <xsl:template match="target[@name='prepare-tomcat']">
    35     <xsl:copy-of select="."/>
    36   </xsl:template>
    37   <xsl:template match="target[@name='prepare-tomcat-compat']">
    38     <xsl:copy-of select="."/>
    39   </xsl:template>
    40   <xsl:template match="target[@name='prepare-mysql']">
    41     <xsl:copy-of select="."/>
    42   </xsl:template>
    43   <xsl:template match="target[@name='prepare-web']">
    44     <xsl:copy-of select="."/>
    45   </xsl:template>
    46   <!-- rename the 'prepare-for-source' target 'prepare' -->
    47   <xsl:template match="target[@name='prepare-for-source']">
    48     <target name="prepare">
    49       <xsl:copy-of select="@depends|@description|@if|@unless|node()"/>
     32  <!-- copy in our new install target -->
     33  <xsl:template match="target[@name='install']">
     34    <target name="install">
     35      <xsl:copy-of select="$install-for-dist/@depends|$install-for-dist/@description|$install-for-dist/@if|$install-for-dist/@unless|$install-for-dist/node()"/>
    5036    </target>
    5137  </xsl:template>
    52 
    5338
    5439  <xsl:template match="*">
  • trunk/gsdl3/dist-resources/convert-build-xml.xsl

    r10911 r13379  
    1010    <xsl:copy>
    1111      <xsl:copy-of select="@*"/>
    12       <!--<xsl:for-each select="@*">
    13     <xsl:attribute name="name()"><xsl:value-of select="."/></xsl:attribute>
    14       </xsl:for-each>-->
    1512      <xsl:apply-templates/>
    1613    </xsl:copy>
    1714  </xsl:template>
    1815 
    19   <!-- rename the 'install-for-dist' target 'install' -->
    20   <xsl:template match="target[@name='install-for-dist']">
    21     <target name="install">
    22       <xsl:copy-of select="@depends|@description|@if|@unless|node()"/>
    23     </target>
    24   </xsl:template>
    25 
    2616  <!-- delete the old install target-->
    27   <xsl:template match="target[@name='install']">
    28   </xsl:template>
     17  <xsl:template match="target[@name='install']"></xsl:template>
    2918
    3019  <!-- delete the unnecessary targets -->
    31   <xsl:template match="target[starts-with(@name, 'prepare')]">
    32   </xsl:template>
    33   <xsl:template match="target[starts-with(@name, 'cvsupdate')]">
    34   </xsl:template>
    35   <xsl:template match="target[starts-with(@name, 'update')]">
    36   </xsl:template>
    37   <xsl:template match="target[starts-with(@name, 'checkout')]">
    38   </xsl:template>
     20  <xsl:template match="target[starts-with(@name, 'prepare')]"></xsl:template>
     21  <xsl:template match="target[starts-with(@name, 'cvsupdate')]"></xsl:template>
     22  <xsl:template match="target[starts-with(@name, 'update')]"></xsl:template>
     23  <xsl:template match="target[starts-with(@name, 'checkout')]"></xsl:template>
     24  <xsl:template match="target[starts-with(@name, 'rename-gs2build')]"></xsl:template>
     25  <xsl:template match="target[@name='test']"></xsl:template>
     26  <xsl:template match="target[@name='get-macos-extra']"></xsl:template>
     27  <xsl:template match="target[@name='get-windows-binaries']"></xsl:template>
    3928
    40   <xsl:template match="property[@name='install-command']">
    41     <property name="install-command" value="ant [options] install"/>
     29  <xsl:variable name="usage-for-dist" select="document('dist-build.xml')/project/target[@name='usage-for-binary-dist']"/>
     30 
     31  <!-- copy in our new usage target -->
     32  <xsl:template match="target[@name='usage']">
     33    <target name="usage">
     34      <xsl:copy-of select="$usage-for-dist/@description|$usage-for-dist/node()"/>
     35    </target>
    4236  </xsl:template>
    4337 
Note: See TracChangeset for help on using the changeset viewer.