Return-Path: 
 <commons-dev-return-30264-qmlist-jakarta-archive-commons-dev=nagoya.apache.org@jakarta.apache.org>
Delivered-To: apmail-jakarta-commons-dev-archive@apache.org
Received: (qmail 7648 invoked from network); 5 Jun 2003 18:18:29 -0000
Received: from exchange.sun.com (192.18.33.10)
  by daedalus.apache.org with SMTP; 5 Jun 2003 18:18:29 -0000
Received: (qmail 27400 invoked by uid 97); 5 Jun 2003 18:20:47 -0000
Delivered-To: qmlist-jakarta-archive-commons-dev@nagoya.betaversion.org
Received: (qmail 27393 invoked from network); 5 Jun 2003 18:20:46 -0000
Received: from daedalus.apache.org (HELO apache.org) (208.185.179.12)
  by nagoya.betaversion.org with SMTP; 5 Jun 2003 18:20:46 -0000
Received: (qmail 7443 invoked by uid 500); 5 Jun 2003 18:18:26 -0000
Mailing-List: contact commons-dev-help@jakarta.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:commons-dev-unsubscribe@jakarta.apache.org>
List-Subscribe: <mailto:commons-dev-subscribe@jakarta.apache.org>
List-Help: <mailto:commons-dev-help@jakarta.apache.org>
List-Post: <mailto:commons-dev@jakarta.apache.org>
List-Id: "Jakarta Commons Developers List" <commons-dev.jakarta.apache.org>
Reply-To: "Jakarta Commons Developers List" <commons-dev@jakarta.apache.org>
Delivered-To: mailing list commons-dev@jakarta.apache.org
Received: (qmail 7421 invoked by uid 500); 5 Jun 2003 18:18:26 -0000
Received: (qmail 7417 invoked from network); 5 Jun 2003 18:18:26 -0000
Received: from icarus.apache.org (208.185.179.13)
  by daedalus.apache.org with SMTP; 5 Jun 2003 18:18:26 -0000
Received: (qmail 10626 invoked by uid 1135); 5 Jun 2003 18:18:25 -0000
Date: 5 Jun 2003 18:18:25 -0000
Message-ID: <20030605181825.10625.qmail@icarus.apache.org>
From: remm@apache.org
To: jakarta-commons-sandbox-cvs@apache.org
Subject: cvs commit: jakarta-commons-sandbox/daemon build.xml
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

remm        2003/06/05 11:18:25

  Modified:    daemon   build.xml
  Log:
  - Cleanup: Remove the launcher classes.
  
  Revision  Changes    Path
  1.9       +9 -49     jakarta-commons-sandbox/daemon/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/daemon/build.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- build.xml	30 Apr 2003 19:34:35 -0000	1.8
  +++ build.xml	5 Jun 2003 18:18:25 -0000	1.9
  @@ -204,7 +204,7 @@
     <target name="dist" depends="compile,javadoc"
      description="Create binary distribution">
       <mkdir      dir="${dist.home}"/>
  -    <mkdir      dir="${dist.home}/bin"/>
  +    <mkdir      dir="${dist.home}/bin/unix"/>
       <mkdir      dir="${dist.home}/lib"/>
       <mkdir      dir="${dist.home}/logs"/>
       <copy      file="LICENSE"
  @@ -216,49 +216,14 @@
            <include name="*.exe" />
         </fileset>
       </copy>
  -    <copy      file="${bin.home}/launcher.properties"
  -              todir="${dist.home}/bin"/>
  -    <copy      file="${bin.home}/launcher.xml"
  -              todir="${dist.home}/bin"/>
  -    <fixcrlf srcdir="${bin.home}"
  -           includes="launch-ant.bat"
  -            destdir="${dist.home}/bin"
  -                eol="crlf"/>
  -    <fixcrlf srcdir="${bin.home}"
  -           includes="launch-ant.sh"
  -            destdir="${dist.home}/bin"
  -                eol="lf"/>
  -    <chmod     file="${dist.home}/bin/launch-ant.sh"
  -               perm="a+x"/>
  -    <antcall target="jar"/>
  -    <!-- Bundle Ant jars to support launcher classes and sample scripts -->
  -    <copy     todir="${dist.home}/lib" filtering="off">
  -      <fileset dir="${ant.lib}" includes="${ant.jars.pattern}"/>
  +    <copy     todir="${dist.home}/bin/unix">
  +      <fileset dir="src/native/unix" />
       </copy>
  -    <fixcrlf srcdir="${ant.home}/bin"
  -           includes="antRun.bat"
  -            destdir="${dist.home}/bin"
  -                eol="crlf"/>
  -    <fixcrlf srcdir="${ant.home}/bin"
  -           includes="antRun"
  -            destdir="${dist.home}/bin"
  -                eol="lf"/>
  -    <chmod     file="${dist.home}/bin/antRun"
  -               perm="a+x"/>
  -    <pathconvert property="ant.jar.list" targetos="unix">
  -      <path>
  -        <fileset dir="${dist.home}/lib" includes="*.jar"/>
  -      </path>
  -    </pathconvert>
  -    <pathconvert property="dist.home.converted" targetos="unix">
  -      <path>
  -        <pathelement location="${dist.home}"/>
  -      </path>
  -    </pathconvert>
  -    <replace   file="${dist.home}/bin/launcher.properties">
  -      <replacefilter token="@ANTJARLIST@" value="${ant.jar.list}"/>
  -      <replacefilter token="${dist.home.converted}" value=".."/>
  -    </replace>
  +    <fixcrlf srcdir="${dist.home}/bin/unix" eol="lf" />
  +    <tar compression="gzip" destfile="${dist.home}/bin/jsvc.tar.gz"
  +         basedir="${dist.home}/bin/unix" />
  +    <delete dir="${dist.home}/bin/unix" />
  +    <antcall target="jar"/>
     </target>
   
   
  @@ -273,11 +238,6 @@
               basedir="${build.home}/classes"
              manifest="${build.home}/conf/MANIFEST.MF"
              includes="org/apache/commons/daemon/**"/>
  -    <jar    jarfile="${dist.home}/bin/commons-launcher.jar"
  -            basedir="${build.home}/classes"
  -           includes="org/apache/commons/launcher/**"/>
  -    <copy      file="${build.home}/classes/LauncherBootstrap.class"
  -              todir="${dist.home}/bin"/>
     </target>
   
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org