You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hivemind.apache.org by hl...@apache.org on 2005/05/09 23:18:17 UTC
cvs commit: jakarta-hivemind/hivebuild dist.xml
hlship 2005/05/09 14:18:17
Modified: . status.xml
hivebuild dist.xml
Log:
HIVEMIND-119: Distribution .zip doesn't contain project directory
Revision Changes Path
1.137 +1 -0 jakarta-hivemind/status.xml
Index: status.xml
===================================================================
RCS file: /home/cvs/jakarta-hivemind/status.xml,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- status.xml 5 May 2005 21:07:32 -0000 1.136
+++ status.xml 9 May 2005 21:18:17 -0000 1.137
@@ -40,6 +40,7 @@
<action type="add" dev="JC" fixes-bug="HIVEMIND-112" >Add getServiceIds() Method to Registry Interface.</action>
<action type="fix" dev="JC" fixes-bug="HIVEMIND-115" >Bean services cannot implement RegistryShutdownListener.</action>
<action type="update" dev="HLS" due-to="Vjeran Marcinko"> Much improved CSS for HiveDoc. </action>
+ <action type="fix" dev="HLS" fixes-bug="HIVEMIND-119"> Distribution .zip doesn't contain project directory </action>
</release>
<release version="1.1-beta-1" date="Apr 29 2005">
<action type="fix" dev="JC" fixes-bug="HIVEMIND-108" >Bean services could not be autowired into other services.</action>
1.8 +29 -4 jakarta-hivemind/hivebuild/dist.xml
Index: dist.xml
===================================================================
RCS file: /home/cvs/jakarta-hivemind/hivebuild/dist.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- dist.xml 18 Jan 2005 13:14:00 -0000 1.7
+++ dist.xml 9 May 2005 21:18:17 -0000 1.8
@@ -35,7 +35,7 @@
<tar destfile="${dist.basefile}.tar.gz"
compression="gzip">
- <tarfileset id="dist.src.set" dir="." prefix="${dist.base.name}" excludes="${dist.project.excludes}">
+ <tarfileset dir="." prefix="${dist.base.name}" excludes="${dist.project.excludes}">
<exclude name="**/target/**"/>
<!-- Left around by Forrest -->
@@ -56,7 +56,7 @@
<!-- Pick up the packaged libraries. -->
- <tarfileset id="dist.bin.set" dir="${target.dir}" prefix="${dist.base.name}">
+ <tarfileset dir="${target.dir}" prefix="${dist.base.name}">
<include name="*.jar"/>
</tarfileset>
</tar>
@@ -64,8 +64,33 @@
<announce message="Assembling binary/src distribution (.zip format) ..."/>
<zip destfile="${dist.basefile}.zip">
- <zipfileset refid="dist.src.set"/>
- <zipfileset refid="dist.bin.set"/>
+ <zipfileset dir="." prefix="${dist.base.name}/" excludes="${dist.project.excludes}">
+ <exclude name="**/target/**"/>
+
+ <!-- Sorry about the cut-n-paste. zip task just doesn't understand the prefix attribute
+ of tarfileset, even though zipfileset has a prefix attribute as well. -->
+
+ <!-- Left around by Forrest -->
+
+ <exclude name="build/**"/>
+ <exclude name="target/**"/>
+ <exclude name="ext-package/**"/>
+
+ <!-- These are all related to Eclipse. -->
+ <exclude name="bin/**"/>
+ <exclude name=".*/**"/>
+
+ <!-- These are left around by PaintShopPro and Windows Explorer -->
+
+ <exclude name="**/Thumbs.db"/>
+ <exclude name="**/pspbrwse.jbf"/>
+ </zipfileset>
+
+ <!-- Pick up the packaged libraries. -->
+
+ <zipfileset dir="${target.dir}" prefix="${dist.base.name}/">
+ <include name="*.jar"/>
+ </zipfileset>
</zip>
<announce message="Assembling documentation distribution ..."/>
---------------------------------------------------------------------
To unsubscribe, e-mail: hivemind-cvs-unsubscribe@jakarta.apache.org
For additional commands, e-mail: hivemind-cvs-help@jakarta.apache.org