jeremias    2004/02/27 11:35:43

  Modified:    examples/embedding build.bat build.sh build.xml
  Log:
  Applied Apache License Version 2.0 by following the instructions at 
http://www.apache.org/dev/apply-license.html.
  
  Revision  Changes    Path
  1.3       +38 -22    xml-fop/examples/embedding/build.bat
  
  Index: build.bat
  ===================================================================
  RCS file: /home/cvs/xml-fop/examples/embedding/build.bat,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- build.bat 12 Mar 2003 11:14:53 -0000      1.2
  +++ build.bat 27 Feb 2004 19:35:43 -0000      1.3
  @@ -1,34 +1,50 @@
   @echo off
  +REM  Copyright 1999-2004 The Apache Software Foundation
  +REM
  +REM  Licensed under the Apache License, Version 2.0 (the "License");
  +REM  you may not use this file except in compliance with the License.
  +REM  You may obtain a copy of the License at
  +REM
  +REM       http://www.apache.org/licenses/LICENSE-2.0
  +REM
  +REM  Unless required by applicable law or agreed to in writing, software
  +REM  distributed under the License is distributed on an "AS IS" BASIS,
  +REM  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  +REM  See the License for the specific language governing permissions and
  +REM  limitations under the License.
  +REM
  +REM  $Id$
   
  -echo Fop Build System
  -echo ----------------
  +echo Apache FOP: Build System
  +echo --------------------------
   
  -if "%JAVA_HOME%" == "" goto error
  +if "%JAVA_HOME%" == "" goto no_java_home
  +if "%ANT_HOME%" == "" goto no_ant_home
   
  -set LIBDIR=../../lib
  -set LOCALCLASSPATH=%JAVA_HOME%\lib\tools.jar;%JAVA_HOME%\lib\classes.zip
  -set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\ant.jar
  -set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\xml-apis.jar
  -set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\xercesImpl-2.2.1.jar
  -set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\xalan-2.4.1.jar
  -
  -set ANT_HOME=%LIBDIR%
  -
  -echo Building with classpath %LOCALCLASSPATH%
  -
  -echo Starting Ant...
  -
  -%JAVA_HOME%\bin\java.exe -Dant.home=%ANT_HOME% -classpath "%LOCALCLASSPATH%" 
org.apache.tools.ant.Main %1 %2 %3 %4 %5
  +call %ANT_HOME%\bin\ant.bat %1 %2 %3 %4 %5 %6 %7 %8
   
   goto end
   
  -:error
  -
  +:no_java_home
   echo ERROR: JAVA_HOME not found in your environment.
   echo Please, set the JAVA_HOME variable in your environment to match the
   echo location of the Java Virtual Machine you want to use.
  +goto end
   
  -:end
  -
  -rem set LOCALCLASSPATH=
  +:no_ant_home
  +echo ERROR: ANT_HOME not found in your environment.
  +echo Please install Apache Ant first. FOP uses Ant as its build system.
  +echo You can download Apache Ant from http://ant.apache.org
  +echo 1. Download and install Ant
  +echo 2. Set the ANT_HOME environment variable to the directory where you've
  +echo    placed Ant.
  +echo 3. Add "%%ANT_HOME%%\bin" to your PATH so the "ant.bat" batch file
  +echo    can be executed from wherever needed.
  +echo 4. (optional) Download JUnit and place junit-*.jar in %%ANT_HOME%%\lib.
  +echo    This enables the JUnit test cases.
  +echo You will now be directed to the Apache Ant website...
  +pause
  +start http://ant.apache.org
  +goto end
   
  +:end
  
  
  
  1.3       +45 -14    xml-fop/examples/embedding/build.sh
  
  Index: build.sh
  ===================================================================
  RCS file: /home/cvs/xml-fop/examples/embedding/build.sh,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- build.sh  12 Mar 2003 11:14:53 -0000      1.2
  +++ build.sh  27 Feb 2004 19:35:43 -0000      1.3
  @@ -1,8 +1,25 @@
   #!/bin/sh
  +#  Copyright 1999-2004 The Apache Software Foundation
  +#
  +#  Licensed under the Apache License, Version 2.0 (the "License");
  +#  you may not use this file except in compliance with the License.
  +#  You may obtain a copy of the License at
  +#
  +#       http://www.apache.org/licenses/LICENSE-2.0
  +#
  +#  Unless required by applicable law or agreed to in writing, software
  +#  distributed under the License is distributed on an "AS IS" BASIS,
  +#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  +#  See the License for the specific language governing permissions and
  +#  limitations under the License.
  +#
  +#  $Id$
  +
   # This file should be executable.
  +
   echo
  -echo "Fop Build System"
  -echo "----------------"
  +echo "Apache FOP: Build System"
  +echo "--------------------------"
   echo
   
   if [ "$JAVA_HOME" = "" ] ; then
  @@ -12,18 +29,32 @@
     echo "location of the Java Virtual Machine you want to use."
     exit 1
   fi
  -LIBDIR=../../lib
  -LOCALCLASSPATH=$JAVA_HOME/lib/tools.jar:$JAVA_HOME/lib/classes.zip
  -LOCALCLASSPATH=$LOCALCLASSPATH:$LIBDIR/ant.jar
  -LOCALCLASSPATH=$LOCALCLASSPATH:$LIBDIR/xml-apis.jar
  -LOCALCLASSPATH=$LOCALCLASSPATH:$LIBDIR/xercesImpl-2.2.1.jar
  -LOCALCLASSPATH=$LOCALCLASSPATH:$LIBDIR/xalan-2.4.1.jar
   
  -ANT_HOME=$LIBDIR
  +if [ "$ANT_HOME" = "" ] ; then
  +  echo "ERROR: ANT_HOME not found in your environment."
  +  echo
  +  echo "Please install Apache Ant first. FOP uses Ant as its build system."
  +  echo "You can download Apache Ant from http://ant.apache.org";
  +  echo "1. Download and install Ant"
  +  echo "2. Set the ANT_HOME environment variable to the directory where you've"
  +  echo "   placed Ant."
  +  echo "3. Add "\$ANT_HOME/bin" to your PATH so the "ant" script file"
  +  echo "   can be be executed from wherever needed."
  +  echo "4. (optional) Download JUnit and place junit-*.jar in \$ANT_HOME/lib."
  +  echo "   This enables the JUnit test cases."
  +  exit 1
  +fi
   
  -echo
  -echo Building with classpath $LOCALCLASSPATH
  -echo Starting Ant...
  -echo
  +# OS specific support.  $var _must_ be set to either true or false.
  +cygwin=false;
  +case "`uname`" in
  +  CYGWIN*) cygwin=true ;;
  +esac
  +
  +# For Cygwin, ensure paths are in UNIX format before anything is touched
  +if $cygwin ; then
  +  [ -n "$ANT_HOME" ] &&
  +    ANT_HOME=`cygpath --unix "$ANT_HOME"`
  +fi
  +"$ANT_HOME"/bin/ant "$@"
   
  -$JAVA_HOME/bin/java -Dant.home=$ANT_HOME -classpath "$LOCALCLASSPATH" 
org.apache.tools.ant.Main $*
  
  
  
  1.4       +18 -2     xml-fop/examples/embedding/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-fop/examples/embedding/build.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- build.xml 5 Feb 2004 00:31:50 -0000       1.3
  +++ build.xml 27 Feb 2004 19:35:43 -0000      1.4
  @@ -1,8 +1,24 @@
   <?xml version="1.0"?>
  +<!--
  +  Copyright 2002-2004 The Apache Software Foundation
  +
  +  Licensed under the Apache License, Version 2.0 (the "License");
  +  you may not use this file except in compliance with the License.
  +  You may obtain a copy of the License at
  +
  +       http://www.apache.org/licenses/LICENSE-2.0
  +
  +  Unless required by applicable law or agreed to in writing, software
  +  distributed under the License is distributed on an "AS IS" BASIS,
  +  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  +  See the License for the specific language governing permissions and
  +  limitations under the License.
  +-->
  +<!-- $Id$ -->
   <project default="compile" basedir=".">
        <property name="Name" value="Fop Embedding Examples"/>
        <property name="name" value="embedding"/>
  -     <property name="version" value="0.20.5cvs"/>
  +     <property name="version" value="1.0dev"/>
        <!-- compiler switches -->
        <property name="debug" value="on"/>
        <property name="optimize" value="off"/>
  @@ -34,7 +50,7 @@
        <target name="init">
                <tstamp/>
                <filter token="version" value="${version}"/>
  -             <property name="year" value="2002-2003"/>
  +             <property name="year" value="2002-2004"/>
                <echo message="------------------- ${Name} ${version} [${year}] 
----------------"/>
        </target>
        <!-- =================================================================== -->
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to