Update of /cvsroot/metamorphosis/antlets/java/src
In directory sc8-pr-cvs1:/tmp/cvs-serv3312/java/src
Modified Files:
xbuild.xml
Log Message:
Only use project.name and project.version.
Index: xbuild.xml
===================================================================
RCS file: /cvsroot/metamorphosis/antlets/java/src/xbuild.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** xbuild.xml 23 Dec 2003 22:32:15 -0000 1.2
--- xbuild.xml 22 Jan 2004 07:48:41 -0000 1.3
***************
*** 95,99 ****
description="Generates the core jar packages">
! <jar jarfile="${project.build.dir}/${project.version.package-jar}">
<fileset dir="${project.build.dir}/classes">
<include name="**"/>
--- 95,99 ----
description="Generates the core jar packages">
! <jar jarfile="${project.build.dir}/${project.name}-${project.version}.jar">
<fileset dir="${project.build.dir}/classes">
<include name="**"/>
***************
*** 105,112 ****
<section name="${viprom:/module/project[@name=$project.name]/package}">
<attribute name="Specification-Title" value="${project.name}" />
! <attribute name="Specification-Version" value="${project.version.package-short.version}" />
<attribute name="Specification-Vendor" value="${viprom:/module/vendor}" />
<attribute name="Implementation-Title" value="${project.name}" />
! <attribute name="Implementation-Version" value="${project.version.package-version}" />
<attribute name="Implementation-Vendor" value="${viprom:/module/vendor}" />
</section>
--- 105,112 ----
<section name="${viprom:/module/project[@name=$project.name]/package}">
<attribute name="Specification-Title" value="${project.name}" />
! <attribute name="Specification-Version" value="${project.version}" />
<attribute name="Specification-Vendor" value="${viprom:/module/vendor}" />
<attribute name="Implementation-Title" value="${project.name}" />
! <attribute name="Implementation-Version" value="${project.version}" />
<attribute name="Implementation-Vendor" value="${viprom:/module/vendor}" />
</section>
***************
*** 182,188 ****
<target name="dist-src-zip" depends="dist-src"
description="Generates the source distribution as a .zip file">
! <zip zipfile="${dist.dir}/${project.name}-${project.version.package-name-suffix}-src.zip">
<zipfileset dir="${java.antlet:dist.source.dir}"
! prefix="${project.name}-${project.version.package-name-suffix}" >
<include name="**"/>
</zipfileset>
--- 182,188 ----
<target name="dist-src-zip" depends="dist-src"
description="Generates the source distribution as a .zip file">
! <zip zipfile="${dist.dir}/${project.name}-${project.version}-src.zip">
<zipfileset dir="${java.antlet:dist.source.dir}"
! prefix="${project.name}-${project.version}" >
<include name="**"/>
</zipfileset>
***************
*** 196,210 ****
<target name="dist-src-tgz" depends="dist-src"
description="Generates the source distribution as a .tar.gz file">
! <tar tarfile="${dist.dir}/${project.name}-${project.version.package-name-suffix}-src.tar"
longfile="gnu">
<tarfileset dir="${java.antlet:dist.source.dir}"
! prefix="${project.name}-${project.version.package-name-suffix}">
<include name="**"/>
</tarfileset>
</tar>
! <gzip zipfile="${dist.dir}/${project.name}-${project.version.package-name-suffix}-src.tar.gz"
! src="${dist.dir}/${project.name}-${project.version.package-name-suffix}-src.tar"/>
! <delete file="${dist.dir}/${project.name}-${project.version.package-name-suffix}-src.tar"
quiet="true"
failonerror="false" />
--- 196,210 ----
<target name="dist-src-tgz" depends="dist-src"
description="Generates the source distribution as a .tar.gz file">
! <tar tarfile="${dist.dir}/${project.name}-${project.version}-src.tar"
longfile="gnu">
<tarfileset dir="${java.antlet:dist.source.dir}"
! prefix="${project.name}-${project.version}">
<include name="**"/>
</tarfileset>
</tar>
! <gzip zipfile="${dist.dir}/${project.name}-${project.version}-src.tar.gz"
! src="${dist.dir}/${project.name}-${project.version}-src.tar"/>
! <delete file="${dist.dir}/${project.name}-${project.version}-src.tar"
quiet="true"
failonerror="false" />
***************
*** 235,239 ****
<fileset dir="${project.build.dir}" casesensitive="no">
<patternset>
! <include name="${project.version.package-jar}"/>
</patternset>
</fileset>
--- 235,239 ----
<fileset dir="${project.build.dir}" casesensitive="no">
<patternset>
! <include name="${project.name}-${project.version}.jar"/>
</patternset>
</fileset>
***************
*** 287,293 ****
<target name="dist-bin-zip" depends="dist-bin"
description="Generates the binary distribution as a .zip file">
! <zip zipfile="${dist.dir}/${project.name}-${project.version.package-name-suffix}-bin.zip">
<zipfileset dir="${java.antlet:dist.bin.dir}"
! prefix="${project.name}-${project.version.package-name-suffix}" >
<include name="**"/>
</zipfileset>
--- 287,293 ----
<target name="dist-bin-zip" depends="dist-bin"
description="Generates the binary distribution as a .zip file">
! <zip zipfile="${dist.dir}/${project.name}-${project.version}-bin.zip">
<zipfileset dir="${java.antlet:dist.bin.dir}"
! prefix="${project.name}-${project.version}" >
<include name="**"/>
</zipfileset>
***************
*** 302,315 ****
<target name="dist-bin-tgz" depends="dist-bin"
description="Generates the binary distribution as a .tar.gz file">
! <tar tarfile="${dist.dir}/${project.name}-${project.version.package-name-suffix}-bin.tar"
longfile="gnu">
<tarfileset dir="${java.antlet:dist.bin.dir}"
! prefix="${project.name}-${project.version.package-name-suffix}">
<include name="**"/>
</tarfileset>
</tar>
! <gzip zipfile="${dist.dir}/${project.name}-${project.version.package-name-suffix}-bin.tar.gz"
! src="${dist.dir}/${project.name}-${project.version.package-name-suffix}-bin.tar"/>
! <delete file="${dist.dir}/${project.name}-${project.version.package-name-suffix}-bin.tar"
quiet="true" failonerror="false"/>
</target>
--- 302,315 ----
<target name="dist-bin-tgz" depends="dist-bin"
description="Generates the binary distribution as a .tar.gz file">
! <tar tarfile="${dist.dir}/${project.name}-${project.version}-bin.tar"
longfile="gnu">
<tarfileset dir="${java.antlet:dist.bin.dir}"
! prefix="${project.name}-${project.version}">
<include name="**"/>
</tarfileset>
</tar>
! <gzip zipfile="${dist.dir}/${project.name}-${project.version}-bin.tar.gz"
! src="${dist.dir}/${project.name}-${project.version}-bin.tar"/>
! <delete file="${dist.dir}/${project.name}-${project.version}-bin.tar"
quiet="true" failonerror="false"/>
</target>
***************
*** 325,329 ****
<fileset dir="${project.build.dir}" casesensitive="no">
<patternset>
! <include name="${project.version.package-jar}"/>
</patternset>
</fileset>
--- 325,329 ----
<fileset dir="${project.build.dir}" casesensitive="no">
<patternset>
! <include name="${project.name}-${project.version}.jar"/>
</patternset>
</fileset>
***************
*** 351,355 ****
description="Generates all distributions (source/binary)">
<echo>Finished build a distribution of
! ${project.name} ${project.version.package-name-suffix}
The files are in ${dist.dir}
</echo>
--- 351,355 ----
description="Generates all distributions (source/binary)">
<echo>Finished build a distribution of
! ${project.name} ${project.version}
The files are in ${dist.dir}
</echo>
-------------------------------------------------------
The SF.Net email is sponsored by EclipseCon 2004
Premiere Conference on Open Tools Development and Integration
See the breadth of Eclipse activity. February 3-5 in Anaheim, CA.
http://www.eclipsecon.org/osdn
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.