Menu
▾
▴
[Springframework-cvs] spring build.xml, 1.313, 1.314 project.properties, 1.159, 1.160
|
From: Arjen J.W. P. <po...@us...> - 2008-10-23 22:37:29
|
Update of /cvsroot/springframework/spring In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv23976 Modified Files: build.xml project.properties Log Message: Integrated bundlor in the build Index: project.properties =================================================================== RCS file: /cvsroot/springframework/spring/project.properties,v retrieving revision 1.159 retrieving revision 1.160 diff -C2 -d -r1.159 -r1.160 *** project.properties 17 Sep 2008 17:21:03 -0000 1.159 --- project.properties 23 Oct 2008 22:37:22 -0000 1.160 *************** *** 179,180 **** --- 179,182 ---- spring-bundle-prefix=org.springframework.bundle.spring + + bundlor.mf.dir=${basedir}/osgi/bundlor/ Index: build.xml =================================================================== RCS file: /cvsroot/springframework/spring/build.xml,v retrieving revision 1.313 retrieving revision 1.314 diff -C2 -d -r1.313 -r1.314 *** build.xml 23 Oct 2008 16:19:07 -0000 1.313 --- build.xml 23 Oct 2008 22:37:22 -0000 1.314 *************** *** 15,19 **** --> ! <project name="spring-core" default="usage" basedir="." xmlns:maven="antlib:org.apache.maven.artifact.ant"> <property file="build.properties"/> --- 15,21 ---- --> ! <project name="spring-core" default="usage" basedir="." xmlns:maven="antlib:org.apache.maven.artifact.ant" ! xmlns:bundlor="antlib:com.springsource.bundlor.ant"> ! <property file="build.properties"/> *************** *** 41,44 **** --- 43,53 ---- </condition> + <condition property="bundlor.available"> + <and> + <istrue value="${tiger.available}"/> + <available file="${lib.dir}/bundlor" type="dir"/> + </and> + </condition> + <path id="all-libs"> *************** *** 47,50 **** --- 56,60 ---- <include name="**/*.jar"/> <exclude name="aspectj/aspectjtools.jar"/> + <exclude name="bundlor/*.jar"/> <exclude name="junit/*.jar"/> </fileset> *************** *** 664,667 **** --- 674,752 ---- + <target name="bundlor" depends="modulejars,weavingjars" description="Run jars through Bundlor" if="bundlor.available"> + <path id="bundlor-classpath"> + + <fileset dir="${lib.dir}/bundlor"> + <include name="**/*.jar"/> + </fileset> + + </path> + + <taskdef resource="com/springsource/bundlor/ant/antlib.xml" uri="antlib:com.springsource.bundlor.ant" + classpathref="bundlor-classpath"/> + + <bundlor:bundlor bundlePath="${dist.dir}/modules/spring-aop.jar" outputPath="${dist.dir}/modules/spring-aop.jar" + mergeExistingHeaders="true" bundleVersion="${spring-version-osgi}" + manifestTemplatePath="${bundlor.mf.dir}/org.springframework.aop.mf"/> + + <bundlor:bundlor bundlePath="${dist.dir}/weaving/spring-aspects.jar" outputPath="${dist.dir}/weaving/spring-aspects.jar" + mergeExistingHeaders="true" bundleVersion="${spring-version-osgi}" + manifestTemplatePath="${bundlor.mf.dir}/org.springframework.aspects.mf"/> + + <bundlor:bundlor bundlePath="${dist.dir}/modules/spring-beans.jar" outputPath="${dist.dir}/modules/spring-beans.jar" + mergeExistingHeaders="true" bundleVersion="${spring-version-osgi}" + manifestTemplatePath="${bundlor.mf.dir}/org.springframework.beans.mf"/> + + <bundlor:bundlor bundlePath="${dist.dir}/modules/spring-context.jar" outputPath="${dist.dir}/modules/spring-context.jar" + mergeExistingHeaders="true" bundleVersion="${spring-version-osgi}" + manifestTemplatePath="${bundlor.mf.dir}/org.springframework.context.mf"/> + + <bundlor:bundlor bundlePath="${dist.dir}/modules/spring-context-support.jar" outputPath="${dist.dir}/modules/spring-context-support.jar" + mergeExistingHeaders="true" bundleVersion="${spring-version-osgi}" + manifestTemplatePath="${bundlor.mf.dir}/org.springframework.context.support.mf"/> + + <bundlor:bundlor bundlePath="${dist.dir}/modules/spring-core.jar" outputPath="${dist.dir}/modules/spring-core.jar" + mergeExistingHeaders="true" bundleVersion="${spring-version-osgi}" + manifestTemplatePath="${bundlor.mf.dir}/org.springframework.core.mf"/> + + <bundlor:bundlor bundlePath="${dist.dir}/modules/spring-jdbc.jar" outputPath="${dist.dir}/modules/spring-jdbc.jar" + mergeExistingHeaders="true" bundleVersion="${spring-version-osgi}" + manifestTemplatePath="${bundlor.mf.dir}/org.springframework.jdbc.mf"/> + + <bundlor:bundlor bundlePath="${dist.dir}/modules/spring-jms.jar" outputPath="${dist.dir}/modules/spring-jms.jar" + mergeExistingHeaders="true" bundleVersion="${spring-version-osgi}" + manifestTemplatePath="${bundlor.mf.dir}/org.springframework.jms.mf"/> + + <bundlor:bundlor bundlePath="${dist.dir}/modules/spring-orm.jar" outputPath="${dist.dir}/modules/spring-orm.jar" + mergeExistingHeaders="true" bundleVersion="${spring-version-osgi}" + manifestTemplatePath="${bundlor.mf.dir}/org.springframework.orm.mf"/> + + <bundlor:bundlor bundlePath="${dist.dir}/modules/spring-test.jar" outputPath="${dist.dir}/modules/spring-test.jar" + mergeExistingHeaders="true" bundleVersion="${spring-version-osgi}" + manifestTemplatePath="${bundlor.mf.dir}/org.springframework.test.mf"/> + + <bundlor:bundlor bundlePath="${dist.dir}/modules/spring-tx.jar" outputPath="${dist.dir}/modules/spring-tx.jar" + mergeExistingHeaders="true" bundleVersion="${spring-version-osgi}" + manifestTemplatePath="${bundlor.mf.dir}/org.springframework.transaction.mf"/> + + <bundlor:bundlor bundlePath="${dist.dir}/modules/spring-web.jar" outputPath="${dist.dir}/modules/spring-web.jar" + mergeExistingHeaders="true" bundleVersion="${spring-version-osgi}" + manifestTemplatePath="${bundlor.mf.dir}/org.springframework.web.mf"/> + + <bundlor:bundlor bundlePath="${dist.dir}/modules/spring-webmvc-portlet.jar" outputPath="${dist.dir}/modules/spring-webmvc-portlet.jar" + mergeExistingHeaders="true" bundleVersion="${spring-version-osgi}" + manifestTemplatePath="${bundlor.mf.dir}/org.springframework.web.portlet.mf"/> + + <bundlor:bundlor bundlePath="${dist.dir}/modules/spring-webmvc.jar" outputPath="${dist.dir}/modules/spring-webmvc.jar" + mergeExistingHeaders="true" bundleVersion="${spring-version-osgi}" + manifestTemplatePath="${bundlor.mf.dir}/org.springframework.web.servlet.mf"/> + + <bundlor:bundlor bundlePath="${dist.dir}/modules/spring-webmvc-struts.jar" outputPath="${dist.dir}/modules/spring-webmvc-struts.jar" + mergeExistingHeaders="true" bundleVersion="${spring-version-osgi}" + manifestTemplatePath="${bundlor.mf.dir}/org.springframework.web.struts.mf"/> + + </target> + + <target name="modulesources" depends="initdist" description="Create module-specific source JAR files"> <delete> *************** *** 1015,1019 **** ! <target name="alljars" depends="fulljar,fullsources,modulejars,modulesources,weavingjars,weavingsources" description="Create all JAR files"/> --- 1100,1104 ---- ! <target name="alljars" depends="fulljar,fullsources,modulejars,modulesources,weavingjars,weavingsources,bundlor" description="Create all JAR files"/> |
