avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nic...@apache.org
Subject cvs commit: avalon/merlin INSTALL.TXT maven.xml
Date Wed, 05 May 2004 19:54:29 GMT
niclas      2004/05/05 12:54:29

  Modified:    merlin   INSTALL.TXT maven.xml
  Log:
  Fixed the +x flags in the Tar/Zip's and the CRLF problem in nix scripts.
  
  Revision  Changes    Path
  1.22      +96 -96    avalon/merlin/INSTALL.TXT
  
  Index: INSTALL.TXT
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/INSTALL.TXT,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- INSTALL.TXT	25 Apr 2004 20:29:20 -0000	1.21
  +++ INSTALL.TXT	5 May 2004 19:54:29 -0000	1.22
  @@ -1,96 +1,96 @@
  -
  -PROJECT: Merlin @VERSION@
  -====================================================================
  -
  -DESCRIPTION: 
  -------------
  -
  -This directory contains the merlin system installation and related 
  -resources.
  -
  -  /merlin
  -    /bin
  -    /config
  -    /system
  -    README.TXT
  -    LICENSE.TXT
  -    INSTALL.TXT
  -
  -Available development tools related to the maven build system include:
  -
  -    @META_PLUGIN_JAR@
  -    @MERLIN_PLUGIN_JAR@
  -
  -
  -Installing Merlin.
  -------------------
  -
  -To use Merlin command line support or the Merlin NT Service
  -you will need to define the MERLIN_HOME environment
  -variable for your system and include MERLIN_HOME/bin in
  -your system path.  The MERLIN_HOME environment variable
  -should point to the merlin directory.
  -
  -Under Windows you can set environment variables by selecting the 
  -Environment Tab from the System Control Panel.
  -
  -Under Linux you can do this as follows:
  -
  -  $ echo '
  -  > # set location of merlin
  -  > export MERLIN_HOME=/opt/merlin
  -  > # include it in the path
  -  > export PATH=$PATH:$MERLIN_HOME/bin
  -  > ' >> ~/.bash_profile
  -  $ source ~/.bash_profile
  -
  -Versions of Merlin prior to the 3.2-dev 20031210 build maintained 
  -a local repository of jar files under the %MERLIN_HOME%/repository
  -directory.  As of the 20031210 build the repository is maintained 
  -under AVALON_HOME/repository where AVALON_HOME defaults to 
  -${user.home}/.avalon.  To override the AVALON_HOME location you can 
  -either define a AVALON_HOME environment variable or you can add a 
  -merlin.properties file to ${user.home} containing the 
  -"merlin.repository" property key and a value point to you preferred 
  -repository location.
  -
  -To confirm that your environment variables are correct, you
  -should open a new command window and invoke the Merlin
  -CLI application.
  -
  -  $ merlin -version
  -
  -The installation of Merlin is now complete, however, two plugins are
  -provided with the installation supporting merlin development under the 
  -Maven platform.  These plugins should be placed in the Maven plugin 
  -directory (${maven.home.local}\plugins).
  -
  -  [YOUR-MAVEN-HOME]\plugins\@META_PLUGIN_JAR@
  -  [YOUR-MAVEN-HOME]\plugins\@MERLIN_PLUGIN_JAR@
  -
  -Please note that if you are upgrading an existing installation you must
  -delete the following two directories:
  -
  -  [YOUR-MAVEN-HOME]\plugins\avalon-meta-plugin-*
  -  [YOUR-MAVEN-HOME]\plugins\merlin-plugin-* 
  -
  -Replace the existing avalon-meta and merlin plugin jar files with the supplied
  -versions.  Finally, delete all *.cache files in the Maven plugin directory.
  -
  -You now have everything in place to start using the Merlin Tutorial or 
  -building you own components.  If you have any problems, please subscribe
  -and post a message to users@avalon.apache.org.
  -
  -Special Note for JRE 1.3 and earlier.
  --------------------------------------
  -
  -Some applications assume that XML parsing classes are available withing
  -the JRE.  This is not the case with JDK 1.3 and earlier.  To resolve this
  -you can copy the following files to the JAVAHOME/lib/ext directory or 
  -declare an alternative directory as a JVM argument under the 
  -MERLIN_JVM_OPTS environment variable, i.e. -Djava.ext.dir=someDirectory
  -
  -  system/xml-apis/jars/xml-apis-2.0.2.jar
  -  system/xml-apis/jars/xmlParserAPIs-2.0.2.jar
  -  system/xerces/jars/xerces-2.4.0.jar
  -  
  +
  +PROJECT: Merlin @VERSION@
  +====================================================================
  +
  +DESCRIPTION: 
  +------------
  +
  +This directory contains the merlin system installation and related 
  +resources.
  +
  +  /merlin
  +    /bin
  +    /config
  +    /system
  +    README.TXT
  +    LICENSE.TXT
  +    INSTALL.TXT
  +
  +Available development tools related to the maven build system include:
  +
  +    @META_PLUGIN_JAR@
  +    @MERLIN_PLUGIN_JAR@
  +
  +
  +Installing Merlin.
  +------------------
  +
  +To use Merlin command line support or the Merlin NT Service
  +you will need to define the MERLIN_HOME environment
  +variable for your system and include MERLIN_HOME/bin in
  +your system path.  The MERLIN_HOME environment variable
  +should point to the merlin directory.
  +
  +Under Windows you can set environment variables by selecting the 
  +Environment Tab from the System Control Panel.
  +
  +Under Linux you can do this as follows:
  +
  +  $ echo '
  +  > # set location of merlin
  +  > export MERLIN_HOME=/opt/merlin
  +  > # include it in the path
  +  > export PATH=$PATH:$MERLIN_HOME/bin
  +  > ' >> ~/.bash_profile
  +  $ source ~/.bash_profile
  +
  +Versions of Merlin prior to the 3.2-dev 20031210 build maintained 
  +a local repository of jar files under the %MERLIN_HOME%/repository
  +directory.  As of the 20031210 build the repository is maintained 
  +under AVALON_HOME/repository where AVALON_HOME defaults to 
  +${user.home}/.avalon.  To override the AVALON_HOME location you can 
  +either define a AVALON_HOME environment variable or you can add a 
  +merlin.properties file to ${user.home} containing the 
  +"merlin.repository" property key and a value point to you preferred 
  +repository location.
  +
  +To confirm that your environment variables are correct, you
  +should open a new command window and invoke the Merlin
  +CLI application.
  +
  +  $ merlin -version
  +
  +The installation of Merlin is now complete, however, two plugins are
  +provided with the installation supporting merlin development under the 
  +Maven platform.  These plugins should be placed in the Maven plugin 
  +directory (${maven.home.local}\plugins).
  +
  +  [YOUR-MAVEN-HOME]\plugins\@META_PLUGIN_JAR@
  +  [YOUR-MAVEN-HOME]\plugins\@MERLIN_PLUGIN_JAR@
  +
  +Please note that if you are upgrading an existing installation you must
  +delete the following two directories:
  +
  +  [YOUR-MAVEN-HOME]\plugins\avalon-meta-plugin-*
  +  [YOUR-MAVEN-HOME]\plugins\merlin-plugin-* 
  +
  +Replace the existing avalon-meta and merlin plugin jar files with the supplied
  +versions.  Finally, delete all *.cache files in the Maven plugin directory.
  +
  +You now have everything in place to start using the Merlin Tutorial or 
  +building you own components.  If you have any problems, please subscribe
  +and post a message to users@avalon.apache.org.
  +
  +Special Note for JRE 1.3 and earlier.
  +-------------------------------------
  +
  +Some applications assume that XML parsing classes are available withing
  +the JRE.  This is not the case with JDK 1.3 and earlier.  To resolve this
  +you can copy the following files to the JAVAHOME/lib/ext directory or 
  +declare an alternative directory as a JVM argument under the 
  +MERLIN_JVM_OPTS environment variable, i.e. -Djava.ext.dir=someDirectory
  +
  +  system/xml-apis/jars/xml-apis-2.0.2.jar
  +  system/xml-apis/jars/xmlParserAPIs-2.0.2.jar
  +  system/xerces/jars/xerces-2.4.0.jar
  +  
  
  
  
  1.83      +44 -6     avalon/merlin/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/maven.xml,v
  retrieving revision 1.82
  retrieving revision 1.83
  diff -u -r1.82 -r1.83
  --- maven.xml	5 May 2004 19:46:23 -0000	1.82
  +++ maven.xml	5 May 2004 19:54:29 -0000	1.83
  @@ -308,8 +308,6 @@
          <include name="INSTALL.TXT"/>
       </ant:fixcrlf>
       <ant:fixcrlf eol="crlf" srcdir="${merlin.build.inst.dir}/bin">
  -      <include name="merlin"/>
  -      <include name="merlinx"/>
         <include name="merlin.bat"/>
         <include name="merlinx.bat"/>
         <include name="README.TXT"/>
  @@ -322,7 +320,13 @@
         <include name="wrapper.conf"/>
       </ant:fixcrlf>
       <ant:fixcrlf eol="lf" srcdir="${merlin.build.inst.dir}/bin">
  -      <include name="*.sh"/>
  +        <include name="merlin"/>
  +        <include name="merlinx"/>
  +        <include name="internal-cygwin.sh"/>
  +        <include name="internal-unix.sh"/>
  +        <include name="merlin.sh"/>
  +        <include name="merlinx.sh"/>
  +        <include name="merlin-server.sh"/>
       </ant:fixcrlf>
       <ant:chmod file="${merlin.build.inst.dir}/bin/merlin" perm="ugo+rx"/>
       <ant:chmod file="${merlin.build.inst.dir}/bin/merlinx" perm="ugo+rx"/>
  @@ -369,6 +373,24 @@
       <ant:echo>Building zip distribution: ${package.name}</ant:echo>
       <ant:zip zipfile="${maven.build.dir}/${package.name}.zip">
         <zipfileset dir="${merlin.build.inst.dir}" prefix="merlin"/>
  +        <include name="bin/merlin"/>
  +        <include name="bin/merlinx"/>
  +        <include name="bin/internal-cygwin.sh"/>
  +        <include name="bin/internal-unix.sh"/>
  +        <include name="bin/merlin.sh"/>
  +        <include name="bin/merlinx.sh"/>
  +        <include name="bin/merlin-server.sh"/>
  +      </zipfileset>
  +      <zipfileset dir="${merlin.build.inst.dir}" prefix="merlin">
  +        <include name="**" />
  +        <exclude name="bin/merlin"/>
  +        <exclude name="bin/merlinx"/>
  +        <exclude name="bin/internal-cygwin.sh"/>
  +        <exclude name="bin/internal-unix.sh"/>
  +        <exclude name="bin/merlin.sh"/>
  +        <exclude name="bin/merlinx.sh"/>
  +        <exclude name="bin/merlin-server.sh"/>
  +      </zipfileset>
       </ant:zip>
       <checksum file="${maven.build.dir}/${package.name}.zip" fileext=".md5" />
       <j:if test="${maven_gpg_exe != null}">
  @@ -379,11 +401,27 @@
         </ant:exec>
       </j:if>
   
  -    <!-- TODO 755 for .sh files -->
  -
       <ant:echo>Building tar distribution: ${package.name}</ant:echo>
       <ant:tar longfile="gnu" tarfile="${maven.build.dir}/${package.name}.tar">
  -      <tarfileset dir="${merlin.build.inst.dir}" prefix="merlin"/>
  +      <tarfileset dir="${merlin.build.inst.dir}" prefix="merlin" filemode="755" >
  +        <include name="bin/merlin"/>
  +        <include name="bin/merlinx"/>
  +        <include name="bin/internal-cygwin.sh"/>
  +        <include name="bin/internal-unix.sh"/>
  +        <include name="bin/merlin.sh"/>
  +        <include name="bin/merlinx.sh"/>
  +        <include name="bin/merlin-server.sh"/>
  +      </tarfileset>
  +      <tarfileset dir="${merlin.build.inst.dir}" prefix="merlin">
  +        <include name="**" />
  +        <exclude name="bin/merlin"/>
  +        <exclude name="bin/merlinx"/>
  +        <exclude name="bin/internal-cygwin.sh"/>
  +        <exclude name="bin/internal-unix.sh"/>
  +        <exclude name="bin/merlin.sh"/>
  +        <exclude name="bin/merlinx.sh"/>
  +        <exclude name="bin/merlin-server.sh"/>
  +      </tarfileset>
       </ant:tar>
       <ant:gzip 
         zipfile="${maven.build.dir}/${package.name}.tar.gz"
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org


Mime
View raw message