gump-general mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nickcha...@apache.org
Subject cvs commit: jakarta-gump forrest-targets.ent gumpytest.bat gump.sh gumpytest.sh
Date Thu, 05 Feb 2004 07:06:07 GMT
nickchalko    2004/02/04 23:06:07

  Modified:    .        forrest-targets.ent gumpytest.bat gump.sh
                        gumpytest.sh
  Log:
  Check in as ASCI
  
  Revision  Changes    Path
  1.2       +174 -174  jakarta-gump/forrest-targets.ent
  
  Index: forrest-targets.ent
  ===================================================================
  RCS file: /home/cvs/jakarta-gump/forrest-targets.ent,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- forrest-targets.ent	25 Nov 2003 00:21:22 -0000	1.1
  +++ forrest-targets.ent	5 Feb 2004 07:06:07 -0000	1.2
  @@ -1,174 +1,174 @@
  -<!--
  -This build.xml snippet contains Forrest targets for Ant 1.5+.  It checks that
  -the user has set ${forrest.home}, either in one of:
  -  build.properties
  -  project.properties
  -  ant.properties
  -  .ant.properties
  -or with the FORREST_HOME environment variable, and prints an informative error
  -message if not found.
  -
  -Usage:
  -1) Copy this file to somewhere in your project.
  -2) Add the following to the top of your project's Ant build.xml script
  -(adjusting the path):
  -
  -  <!DOCTYPE project [
  -    <!ENTITY forrest-targets SYSTEM "file:./forrest-targets.ent">
  -  ]>
  -
  -3) Before the closing '</project>' in your build.xml, add this:
  -
  -  &forrest-targets;
  -  
  -This is like expanding a macro: it pulls in the contents of this file.
  -
  -A minimal build.xml would thus be:
  -
  -<!DOCTYPE project [
  -<!ENTITY forrest-targets SYSTEM "file:./forrest-targets.ent">
  -]>
  -
  -<project default="site">
  -    &forrest-targets;
  -</project>
  --->
  -
  -  <target name="site" depends="forrest.init" description="Generates static HTML documentation">
  -    <ant antfile="${forrest.home}/forrest.antproxy.xml" target="site"/>
  -  </target>
  -
  -  <target name="webapp" depends="forrest.init" description="Generates an unpackaged
webapp of the website">
  -    <ant antfile="${forrest.home}/forrest.antproxy.xml" target="webapp"/>
  -  </target>
  -
  -  <target name="war" depends="forrest.init" description="Generates a .war file containing
the website">
  -    <ant antfile="${forrest.home}/forrest.antproxy.xml" target="war"/>
  -  </target>
  -
  -  <target name="validate" depends="forrest.init" description="Validates XML documentation
files">
  -    <ant antfile="${forrest.home}/forrest.antproxy.xml" target="validate"/>
  -  </target>
  -
  -  <target name="forrest.init" depends="forrest.sethome, forrest.home.defined"/>
  -
  -  <target name="forrest.sethome" depends="forrest.loadenv,
  -  forrest.checkenv, forrest.checkhome, forrest.check-build.properties,
  -  forrest.check-project.properties, forrest.check-ant.properties,
  -  forrest.check-.ant.properties"/>
  -
  -  <target name="forrest.loadenv" unless="forrest.home.present">
  -    <property environment="env"/>
  -    <echo level="verbose">Forrest: Got ${env.FORREST_HOME}</echo>
  -  </target>
  -
  -  <target name="forrest.checkenv" if="env.FORREST_HOME">
  -    <echo level="verbose">Found $FORREST_HOME..</echo>
  -    <property name="forrest.home" location="${env.FORREST_HOME}"/>
  -    <echo level="verbose">forrest.home set to ${forrest.home}</echo>
  -    <available file="${forrest.home}" type="dir" property="forrest.home.present"/>
  -  </target>
  -
  -
  -  <target name="forrest.checkhome">
  -    <available file="${forrest.home}" type="dir" property="forrest.home.present"/>
  -    <available file="build.properties" type="file" property="build.properties.present"/>
  -    <available file="project.properties" type="file" property="project.properties.present"/>
  -    <available file="ant.properties" type="file" property="ant.properties.present"/>
  -    <available file=".ant.properties" type="file" property=".ant.properties.present"/>
  -  </target>
  -
  -  <!-- No we can't extract the commonalities below into an antcall'ed target,
  -  because it wouldn't be able to set forrest.home -->
  -  <target name="forrest.check-build.properties" unless="forrest.home.present"
  -  if="build.properties.present">
  -    <echo level="verbose">Forrest: Checking build.properties..</echo>
  -    <loadproperties srcfile="build.properties">
  -      <filterchain>
  -        <linecontains>
  -          <contains value="forrest.home"/>
  -        </linecontains>
  -      </filterchain>
  -    </loadproperties>
  -    <available file="${forrest.home}" type="dir" property="forrest.home.present"/>
  -
  -  </target>
  -
  -  <target name="forrest.check-project.properties" unless="forrest.home.present"
  -  if="project.properties.present">
  -    <echo level="verbose">Forrest: Checking project.properties..</echo>
  -    <loadproperties srcfile="project.properties">
  -      <filterchain>
  -        <linecontains>
  -          <contains value="forrest.home"/>
  -        </linecontains>
  -      </filterchain>
  -    </loadproperties>
  -    <available file="${forrest.home}" type="dir" property="forrest.home.present"/>
  -  </target>
  -
  -  <target name="forrest.check-ant.properties" unless="forrest.home.present"
  -  if="ant.properties.present">
  -    <echo level="verbose">Forrest: Checking ant.properties..</echo>
  -    <loadproperties srcfile="ant.properties">
  -      <filterchain>
  -        <linecontains>
  -          <contains value="forrest.home"/>
  -        </linecontains>
  -      </filterchain>
  -    </loadproperties>
  -    <available file="${forrest.home}" type="dir" property="forrest.home.present"/>
  -  </target>
  -
  -  <target name="forrest.check-.ant.properties" unless="forrest.home.present"
  -  if=".ant.properties.present">
  -    <echo level="verbose">Forrest: Checking .ant.properties..</echo>
  -    <loadproperties srcfile=".ant.properties">
  -      <filterchain>
  -        <linecontains>
  -          <contains value="forrest.home"/>
  -        </linecontains>
  -      </filterchain>
  -    </loadproperties>
  -    <available file="${forrest.home}" type="dir" property="forrest.home.present"/>
  -  </target>
  -
  -  <target name="forrest.home.defined" depends="forrest.sethome" unless="forrest.home.present">
  -    <property name="path" value="${user.home}/xml-forrest/build/dist/shbat"/>
  -    <pathconvert targetos="windows" property="winpath">
  -      <path>
  -        <pathelement location="${path}"/>
  -      </path>
  -    </pathconvert>
  -    <pathconvert targetos="unix" property="unixpath">
  -      <path>
  -        <pathelement
  -          location="${path}"/>
  -      </path>
  -    </pathconvert>
  -
  -    <echo>
  -      ----------------------------------------------
  -      To run this target, you need Forrest installed.
  -      Please do the following:
  -
  -      export CVSROOT=:pserver:anoncvs@cvs.apache.org:/home/cvspublic
  -      cvs checkout xml-forrest
  -      cd xml-forrest
  -      build      (Windows)
  -      ./build.sh (Unix)
  -
  -      Then either:
  -
  -      - Set FORREST_HOME as the Forrest build instructions describe
  -      - Create a build.properties, with the forrest.home property pointing to
  -        the forrest shbat directory, eg:
  -
  -        forrest.home=${winpath}  (Windows)
  -        forrest.home=${unixpath}  (Unix)
  -
  -        (adjusting the path according to where your xml-forrest is)
  -      ----------------------------------------------
  -    </echo>
  -    <fail message="Need to define $${forrest.home}"/>
  -  </target>
  +<!--
  +This build.xml snippet contains Forrest targets for Ant 1.5+.  It checks that
  +the user has set ${forrest.home}, either in one of:
  +  build.properties
  +  project.properties
  +  ant.properties
  +  .ant.properties
  +or with the FORREST_HOME environment variable, and prints an informative error
  +message if not found.
  +
  +Usage:
  +1) Copy this file to somewhere in your project.
  +2) Add the following to the top of your project's Ant build.xml script
  +(adjusting the path):
  +
  +  <!DOCTYPE project [
  +    <!ENTITY forrest-targets SYSTEM "file:./forrest-targets.ent">
  +  ]>
  +
  +3) Before the closing '</project>' in your build.xml, add this:
  +
  +  &forrest-targets;
  +  
  +This is like expanding a macro: it pulls in the contents of this file.
  +
  +A minimal build.xml would thus be:
  +
  +<!DOCTYPE project [
  +<!ENTITY forrest-targets SYSTEM "file:./forrest-targets.ent">
  +]>
  +
  +<project default="site">
  +    &forrest-targets;
  +</project>
  +-->
  +
  +  <target name="site" depends="forrest.init" description="Generates static HTML documentation">
  +    <ant antfile="${forrest.home}/forrest.antproxy.xml" target="site"/>
  +  </target>
  +
  +  <target name="webapp" depends="forrest.init" description="Generates an unpackaged
webapp of the website">
  +    <ant antfile="${forrest.home}/forrest.antproxy.xml" target="webapp"/>
  +  </target>
  +
  +  <target name="war" depends="forrest.init" description="Generates a .war file containing
the website">
  +    <ant antfile="${forrest.home}/forrest.antproxy.xml" target="war"/>
  +  </target>
  +
  +  <target name="validate" depends="forrest.init" description="Validates XML documentation
files">
  +    <ant antfile="${forrest.home}/forrest.antproxy.xml" target="validate"/>
  +  </target>
  +
  +  <target name="forrest.init" depends="forrest.sethome, forrest.home.defined"/>
  +
  +  <target name="forrest.sethome" depends="forrest.loadenv,
  +  forrest.checkenv, forrest.checkhome, forrest.check-build.properties,
  +  forrest.check-project.properties, forrest.check-ant.properties,
  +  forrest.check-.ant.properties"/>
  +
  +  <target name="forrest.loadenv" unless="forrest.home.present">
  +    <property environment="env"/>
  +    <echo level="verbose">Forrest: Got ${env.FORREST_HOME}</echo>
  +  </target>
  +
  +  <target name="forrest.checkenv" if="env.FORREST_HOME">
  +    <echo level="verbose">Found $FORREST_HOME..</echo>
  +    <property name="forrest.home" location="${env.FORREST_HOME}"/>
  +    <echo level="verbose">forrest.home set to ${forrest.home}</echo>
  +    <available file="${forrest.home}" type="dir" property="forrest.home.present"/>
  +  </target>
  +
  +
  +  <target name="forrest.checkhome">
  +    <available file="${forrest.home}" type="dir" property="forrest.home.present"/>
  +    <available file="build.properties" type="file" property="build.properties.present"/>
  +    <available file="project.properties" type="file" property="project.properties.present"/>
  +    <available file="ant.properties" type="file" property="ant.properties.present"/>
  +    <available file=".ant.properties" type="file" property=".ant.properties.present"/>
  +  </target>
  +
  +  <!-- No we can't extract the commonalities below into an antcall'ed target,
  +  because it wouldn't be able to set forrest.home -->
  +  <target name="forrest.check-build.properties" unless="forrest.home.present"
  +  if="build.properties.present">
  +    <echo level="verbose">Forrest: Checking build.properties..</echo>
  +    <loadproperties srcfile="build.properties">
  +      <filterchain>
  +        <linecontains>
  +          <contains value="forrest.home"/>
  +        </linecontains>
  +      </filterchain>
  +    </loadproperties>
  +    <available file="${forrest.home}" type="dir" property="forrest.home.present"/>
  +
  +  </target>
  +
  +  <target name="forrest.check-project.properties" unless="forrest.home.present"
  +  if="project.properties.present">
  +    <echo level="verbose">Forrest: Checking project.properties..</echo>
  +    <loadproperties srcfile="project.properties">
  +      <filterchain>
  +        <linecontains>
  +          <contains value="forrest.home"/>
  +        </linecontains>
  +      </filterchain>
  +    </loadproperties>
  +    <available file="${forrest.home}" type="dir" property="forrest.home.present"/>
  +  </target>
  +
  +  <target name="forrest.check-ant.properties" unless="forrest.home.present"
  +  if="ant.properties.present">
  +    <echo level="verbose">Forrest: Checking ant.properties..</echo>
  +    <loadproperties srcfile="ant.properties">
  +      <filterchain>
  +        <linecontains>
  +          <contains value="forrest.home"/>
  +        </linecontains>
  +      </filterchain>
  +    </loadproperties>
  +    <available file="${forrest.home}" type="dir" property="forrest.home.present"/>
  +  </target>
  +
  +  <target name="forrest.check-.ant.properties" unless="forrest.home.present"
  +  if=".ant.properties.present">
  +    <echo level="verbose">Forrest: Checking .ant.properties..</echo>
  +    <loadproperties srcfile=".ant.properties">
  +      <filterchain>
  +        <linecontains>
  +          <contains value="forrest.home"/>
  +        </linecontains>
  +      </filterchain>
  +    </loadproperties>
  +    <available file="${forrest.home}" type="dir" property="forrest.home.present"/>
  +  </target>
  +
  +  <target name="forrest.home.defined" depends="forrest.sethome" unless="forrest.home.present">
  +    <property name="path" value="${user.home}/xml-forrest/build/dist/shbat"/>
  +    <pathconvert targetos="windows" property="winpath">
  +      <path>
  +        <pathelement location="${path}"/>
  +      </path>
  +    </pathconvert>
  +    <pathconvert targetos="unix" property="unixpath">
  +      <path>
  +        <pathelement
  +          location="${path}"/>
  +      </path>
  +    </pathconvert>
  +
  +    <echo>
  +      ----------------------------------------------
  +      To run this target, you need Forrest installed.
  +      Please do the following:
  +
  +      export CVSROOT=:pserver:anoncvs@cvs.apache.org:/home/cvspublic
  +      cvs checkout xml-forrest
  +      cd xml-forrest
  +      build      (Windows)
  +      ./build.sh (Unix)
  +
  +      Then either:
  +
  +      - Set FORREST_HOME as the Forrest build instructions describe
  +      - Create a build.properties, with the forrest.home property pointing to
  +        the forrest shbat directory, eg:
  +
  +        forrest.home=${winpath}  (Windows)
  +        forrest.home=${unixpath}  (Unix)
  +
  +        (adjusting the path according to where your xml-forrest is)
  +      ----------------------------------------------
  +    </echo>
  +    <fail message="Need to define $${forrest.home}"/>
  +  </target>
  
  
  
  1.5       +10 -10    jakarta-gump/gumpytest.bat
  
  Index: gumpytest.bat
  ===================================================================
  RCS file: /home/cvs/jakarta-gump/gumpytest.bat,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- gumpytest.bat	27 Dec 2003 15:12:01 -0000	1.4
  +++ gumpytest.bat	5 Feb 2004 07:06:07 -0000	1.5
  @@ -1,10 +1,10 @@
  -@echo off
  -
  -REM 
  -REM    Copyright (c) 2000-2003 The Apache Software Foundation.  All rights
  -REM    reserved.
  -
  -SET
  -
  -CD %GUMP_PYTHON%
  -python gump\test\pyunit.py
  +@echo off
  +
  +REM 
  +REM    Copyright (c) 2000-2003 The Apache Software Foundation.  All rights
  +REM    reserved.
  +
  +SET
  +
  +CD %GUMP_PYTHON%
  +python gump\test\pyunit.py
  
  
  
  1.12      +0 -0      jakarta-gump/gump.sh
  
  Index: gump.sh
  ===================================================================
  RCS file: /home/cvs/jakarta-gump/gump.sh,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- gump.sh	9 Jan 2004 19:53:13 -0000	1.11
  +++ gump.sh	5 Feb 2004 07:06:07 -0000	1.12
  @@ -157,8 +157,8 @@
   pkill -P $$ 
   
   # $Log$
  -# Revision 1.11  2004/01/09 19:53:13  ajack
  -# Trying to fix ASCII things marked as BINARY
  +# Revision 1.12  2004/02/05 07:06:07  nickchalko
  +# Check in as ASCI
   #
   # Revision 1.10  2003/08/08 06:34:26  nickchalko
   # Test for gen.sh  failure.  Make sure ant is in the path before calling ant.
  
  
  
  1.5       +0 -0      jakarta-gump/gumpytest.sh
  
  Index: gumpytest.sh
  ===================================================================
  RCS file: /home/cvs/jakarta-gump/gumpytest.sh,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  
  
  

Mime
View raw message