You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ibatis.apache.org by cb...@apache.org on 2010/02/15 18:28:53 UTC
svn commit: r910272 - in /ibatis/java/ibatis-3/trunk: build.xml common.xml
version.properties
Author: cbegin
Date: Mon Feb 15 17:28:49 2010
New Revision: 910272
URL: http://svn.apache.org/viewvc?rev=910272&view=rev
Log:
improved distributable packages... proper zip with base directory
Modified:
ibatis/java/ibatis-3/trunk/build.xml
ibatis/java/ibatis-3/trunk/common.xml
ibatis/java/ibatis-3/trunk/version.properties
Modified: ibatis/java/ibatis-3/trunk/build.xml
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/build.xml?rev=910272&r1=910271&r2=910272&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/build.xml (original)
+++ ibatis/java/ibatis-3/trunk/build.xml Mon Feb 15 17:28:49 2010
@@ -3,7 +3,8 @@
<target name="build.migrations">
<property file="version.properties"/>
<property name="build.root" value="./build/migrations"/>
- <property name="migrations.exploded" value="${build.root}/exploded"/>
+ <property name="migrations.exploded" value="${build.root}/exploded/ibatis-3-migrations-${version}.${buildNum}"/>
+ <property name="migrations.tozip" value="${build.root}/exploded"/>
<property name="migrations.dist" value="${build.root}/dist"/>
<delete dir="${build.root}"/>
<mkdir dir="${build.root}"/>
@@ -17,12 +18,12 @@
</copy>
<copy todir="${migrations.exploded}/lib" flatten="true">
<fileset dir="./">
- <include name="build/ibatis-3-core/exploded/*.jar"/>
+ <include name="build/ibatis-3-core/exploded/**/*.jar"/>
</fileset>
</copy>
- <jar jarfile="${migrations.dist}/ibatis-3-migrations-${version}.${buildNum}.zip">
- <fileset dir="${migrations.exploded}"/>
- </jar>
+ <zip zipfile="${migrations.dist}/ibatis-3-migrations-${version}.${buildNum}.zip">
+ <fileset dir="${migrations.tozip}"/>
+ </zip>
</target>
<target name="all">
Modified: ibatis/java/ibatis-3/trunk/common.xml
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/common.xml?rev=910272&r1=910271&r2=910272&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/common.xml (original)
+++ ibatis/java/ibatis-3/trunk/common.xml Mon Feb 15 17:28:49 2010
@@ -15,7 +15,7 @@
<property name="reports.junit" value="${build.root}/reports-junit"/>
<property name="reports.coverage" value="${build.root}/reports-coverage"/>
- <property name="deploy.exploded" value="${build.root}/exploded"/>
+ <property name="deploy.tozip" value="${build.root}/exploded"/>
<property name="deploy.dist" value="${build.root}/dist"/>
<!-- MAVEN -->
@@ -77,7 +77,6 @@
<mkdir dir="${classes.instrumented}"/>
<mkdir dir="${reports.junit}"/>
<mkdir dir="${reports.coverage}"/>
- <mkdir dir="${deploy.exploded}"/>
<mkdir dir="${deploy.dist}"/>
<!-- Prepare Release Docs -->
<propertyfile file="version.properties" comment="Build version info">
@@ -154,6 +153,8 @@
<target name="dist.jar.lib" depends="compile">
<property file="version.properties"/>
+ <property name="deploy.exploded" value="${deploy.tozip}/${module}-${version}.${buildNum}"/>
+ <mkdir dir="${deploy.exploded}"/>
<jar jarfile="${deploy.exploded}/${module}-${version}.${buildNum}.jar">
<manifest>
<attribute name="Built-On" value="${buildDate}"/>
@@ -173,6 +174,8 @@
<target name="dist.jar.src" depends="compile">
<property file="version.properties"/>
+ <property name="deploy.exploded" value="${deploy.tozip}/${module}-${version}.${buildNum}"/>
+ <mkdir dir="${deploy.exploded}"/>
<jar jarfile="${deploy.exploded}/${module}-src-${version}.${buildNum}.zip">
<manifest>
<attribute name="Built-On" value="${buildDate}"/>
@@ -191,6 +194,9 @@
</target>
<target name="dist.assemble" depends="dist.jar.lib,dist.jar.src">
+ <property file="version.properties"/>
+ <property name="deploy.exploded" value="${deploy.tozip}/${module}-${version}.${buildNum}"/>
+ <mkdir dir="${deploy.exploded}"/>
<copy todir="${deploy.exploded}">
<fileset dir="./">
<include name="LICENSE"/>
@@ -201,9 +207,9 @@
<target name="dist" depends="dist.assemble">
<property file="version.properties"/>
- <jar jarfile="${deploy.dist}/${module}-${version}.${buildNum}.zip">
- <fileset dir="${deploy.exploded}"/>
- </jar>
+ <zip zipfile="${deploy.dist}/${module}-${version}.${buildNum}.zip">
+ <fileset dir="${deploy.tozip}"/>
+ </zip>
</target>
<target name="all" depends="test.coverage,dist">
Modified: ibatis/java/ibatis-3/trunk/version.properties
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/version.properties?rev=910272&r1=910271&r2=910272&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/version.properties (original)
+++ ibatis/java/ibatis-3/trunk/version.properties Mon Feb 15 17:28:49 2010
@@ -1,5 +1,5 @@
#Build version info
-#Fri Feb 12 19:52:58 MST 2010
+#Mon Feb 15 10:25:25 MST 2010
version=3.0.0
-buildDate=2010/02/12 19\:52
-buildNum=230
+buildDate=2010/02/15 10\:25
+buildNum=239