Author: drazzib Date: 2010-08-24 22:33:50 +0000 (Tue, 24 Aug 2010) New Revision: 12940
Added: tags/spring-build/2.5.2~git3be7d52-1/ tags/spring-build/2.5.2~git3be7d52-1/debian/changelog tags/spring-build/2.5.2~git3be7d52-1/debian/control tags/spring-build/2.5.2~git3be7d52-1/debian/copyright tags/spring-build/2.5.2~git3be7d52-1/debian/orig-tar.exclude tags/spring-build/2.5.2~git3be7d52-1/debian/orig-tar.sh tags/spring-build/2.5.2~git3be7d52-1/debian/patches/ivy_artifact.diff tags/spring-build/2.5.2~git3be7d52-1/debian/patches/ivy_aspectj.diff tags/spring-build/2.5.2~git3be7d52-1/debian/patches/ivy_local_only.diff tags/spring-build/2.5.2~git3be7d52-1/debian/rules Removed: tags/spring-build/2.5.2~git3be7d52-1/debian/changelog tags/spring-build/2.5.2~git3be7d52-1/debian/control tags/spring-build/2.5.2~git3be7d52-1/debian/copyright tags/spring-build/2.5.2~git3be7d52-1/debian/orig-tar.exclude tags/spring-build/2.5.2~git3be7d52-1/debian/orig-tar.sh tags/spring-build/2.5.2~git3be7d52-1/debian/patches/ivy_artifact.diff tags/spring-build/2.5.2~git3be7d52-1/debian/patches/ivy_aspectj.diff tags/spring-build/2.5.2~git3be7d52-1/debian/patches/ivy_local_only.diff tags/spring-build/2.5.2~git3be7d52-1/debian/rules Log: [svn-buildpackage] Tagging spring-build 2.5.2~git3be7d52-1 Deleted: tags/spring-build/2.5.2~git3be7d52-1/debian/changelog =================================================================== --- trunk/spring-build/debian/changelog 2010-08-23 20:53:24 UTC (rev 12937) +++ tags/spring-build/2.5.2~git3be7d52-1/debian/changelog 2010-08-24 22:33:50 UTC (rev 12940) @@ -1,7 +0,0 @@ -spring-build (2.5.1~svn715-1) UNRELEASED; urgency=low - - WAIT-FOR: http://jira.springframework.org/browse/SPR-7352 - - * Initial release. (Closes: #586523) - - -- Damien Raude-Morvan <[email protected]> Wed, 14 Jul 2010 14:00:32 +0200 Copied: tags/spring-build/2.5.2~git3be7d52-1/debian/changelog (from rev 12938, trunk/spring-build/debian/changelog) =================================================================== --- tags/spring-build/2.5.2~git3be7d52-1/debian/changelog (rev 0) +++ tags/spring-build/2.5.2~git3be7d52-1/debian/changelog 2010-08-24 22:33:50 UTC (rev 12940) @@ -0,0 +1,5 @@ +spring-build (2.5.2~git3be7d52-1) experimental; urgency=low + + * Initial release. (Closes: #586523) + + -- Damien Raude-Morvan <[email protected]> Tue, 24 Aug 2010 22:10:27 +0200 Deleted: tags/spring-build/2.5.2~git3be7d52-1/debian/control =================================================================== --- trunk/spring-build/debian/control 2010-08-23 20:53:24 UTC (rev 12937) +++ tags/spring-build/2.5.2~git3be7d52-1/debian/control 2010-08-24 22:33:50 UTC (rev 12940) @@ -1,33 +0,0 @@ -Source: spring-build -Section: java -Priority: optional -Build-Depends: debhelper (>= 7), cdbs, default-jdk, ant (>= 1.8.0), - maven-repo-helper, ivy, libecj-java, libcommons-net-java, - libcommons-httpclient-java, libjets3t-java, libequinox-osgi-java, - libspring-build-java -Maintainer: Damien Raude-Morvan <[email protected]> -Standards-Version: 3.9.0 -Homepage: http://www.springsource.org/ -Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/spring-build/ -Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/spring-build/ - -Package: libspring-build-java -Architecture: all -Depends: ${misc:Depends}, libecj-java -Recommends: libcommons-net-java, libcommons-httpclient-java, libjets3t-java, - libequinox-osgi-java -Description: Ant tasks for Spring Build module - Spring projects are built using a combination of Ant and Ivy that is refered - to simply as 'Spring Build'. - . - This package contains small Ant tasks used by Spring Build module. - -Package: spring-build-scripts -Architecture: all -Depends: ${misc:Depends}, libspring-build-java (= ${source:Version}) -Suggests: ruby, groovy -Description: Ant scripts snippets for Spring Build module - Spring projects are built using a combination of Ant and Ivy that is refered - to simply as 'Spring Build'. - . - This package contains small Ant scripts snippets for Spring Build module. Copied: tags/spring-build/2.5.2~git3be7d52-1/debian/control (from rev 12938, trunk/spring-build/debian/control) =================================================================== --- tags/spring-build/2.5.2~git3be7d52-1/debian/control (rev 0) +++ tags/spring-build/2.5.2~git3be7d52-1/debian/control 2010-08-24 22:33:50 UTC (rev 12940) @@ -0,0 +1,33 @@ +Source: spring-build +Section: java +Priority: optional +Build-Depends: debhelper (>= 7), cdbs, default-jdk, ant (>= 1.8.0), + maven-repo-helper, ivy, libecj-java, libcommons-net-java, + libcommons-httpclient-java, libjets3t-java, libequinox-osgi-java, + libspring-build-java +Maintainer: Damien Raude-Morvan <[email protected]> +Standards-Version: 3.9.1 +Homepage: http://www.springsource.org/ +Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/spring-build/ +Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/spring-build/ + +Package: libspring-build-java +Architecture: all +Depends: ${misc:Depends}, libecj-java +Recommends: libcommons-net-java, libcommons-httpclient-java, libjets3t-java, + libequinox-osgi-java +Description: Ant tasks for Spring Build module + Spring projects are built using a combination of Ant and Ivy that is refered + to simply as 'Spring Build'. + . + This package contains small Ant tasks used by Spring Build module. + +Package: spring-build-scripts +Architecture: all +Depends: ${misc:Depends}, libspring-build-java (= ${source:Version}) +Suggests: ruby, groovy +Description: Ant scripts snippets for Spring Build module + Spring projects are built using a combination of Ant and Ivy that is refered + to simply as 'Spring Build'. + . + This package contains small Ant scripts snippets for Spring Build module. Deleted: tags/spring-build/2.5.2~git3be7d52-1/debian/copyright =================================================================== --- trunk/spring-build/debian/copyright 2010-08-23 20:53:24 UTC (rev 12937) +++ tags/spring-build/2.5.2~git3be7d52-1/debian/copyright 2010-08-24 22:33:50 UTC (rev 12940) @@ -1,55 +0,0 @@ -Format-Specification: http://dep.debian.net/deps/dep5/ -Name: Spring Build -Maintainer: SpringSource -Source: https://src.springframework.org/svn/spring-build/ - - -Files: * -Copyright: 2008-2010, the original author or authors -License: Apache-2.0 - -Files: org.springframework.build.osgi/src/main/java/org/springframework/build/osgi/validator/ValidationFailedException.java, - org.springframework.build.osgi/src/main/java/org/springframework/build/osgi/validator/BundleResolutionValidator.java -Copyright: Copyright (C) 2008 SpringSource Inc. -License: GPL-3+ - -Files: debian/* -Copyright: 2010, Damien Raude-Morvan <[email protected]> -License: Apache-2.0 - - -License: Apache-2.0 - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - On Debian systems the full text of the Apache License can be found - in the `/usr/share/common-licenses/Apache-2.0' file. - - -License: GPL-3+ - The SpringSource dm Server is free software: you can redistribute it and/or - modify it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or (at your - option) any later version. - - The SpringSource dm Server is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - more details. - - You should have received a copy of the GNU General Public License along with - the SpringSource dm Server. If not, see <http://www.gnu.org/licenses/>. - - On Debian systems, the full text of the GNU General Public - License version 3 can be found in the file - `/usr/share/common-licenses/GPL-3'. - Copied: tags/spring-build/2.5.2~git3be7d52-1/debian/copyright (from rev 12938, trunk/spring-build/debian/copyright) =================================================================== --- tags/spring-build/2.5.2~git3be7d52-1/debian/copyright (rev 0) +++ tags/spring-build/2.5.2~git3be7d52-1/debian/copyright 2010-08-24 22:33:50 UTC (rev 12940) @@ -0,0 +1,34 @@ +Format-Specification: http://dep.debian.net/deps/dep5/ +Name: Spring Build +Maintainer: SpringSource +Source: git://git.springsource.org/spring-build/spring-build.git + git://git.springsource.org/spring-build/misc-ant.git + git://git.springsource.org/spring-build/aws-ant.git + git://git.springsource.org/spring-build/aws-ivy.git + git://git.springsource.org/spring-build/osgi-ant.git + + +Files: * +Copyright: 2008-2010, the original author or authors +License: Apache-2.0 + +Files: debian/* +Copyright: 2010, Damien Raude-Morvan <[email protected]> +License: Apache-2.0 + + +License: Apache-2.0 + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + On Debian systems the full text of the Apache License can be found + in the `/usr/share/common-licenses/Apache-2.0' file. Deleted: tags/spring-build/2.5.2~git3be7d52-1/debian/orig-tar.exclude =================================================================== --- trunk/spring-build/debian/orig-tar.exclude 2010-08-23 20:53:24 UTC (rev 12937) +++ tags/spring-build/2.5.2~git3be7d52-1/debian/orig-tar.exclude 2010-08-24 22:33:50 UTC (rev 12940) @@ -1 +0,0 @@ -project-build/lib/*.jar Copied: tags/spring-build/2.5.2~git3be7d52-1/debian/orig-tar.exclude (from rev 12938, trunk/spring-build/debian/orig-tar.exclude) =================================================================== --- tags/spring-build/2.5.2~git3be7d52-1/debian/orig-tar.exclude (rev 0) +++ tags/spring-build/2.5.2~git3be7d52-1/debian/orig-tar.exclude 2010-08-24 22:33:50 UTC (rev 12940) @@ -0,0 +1,3 @@ +project-build/lib/*.jar +.gitmodules +spring-build Deleted: tags/spring-build/2.5.2~git3be7d52-1/debian/orig-tar.sh =================================================================== --- trunk/spring-build/debian/orig-tar.sh 2010-08-23 20:53:24 UTC (rev 12937) +++ tags/spring-build/2.5.2~git3be7d52-1/debian/orig-tar.sh 2010-08-24 22:33:50 UTC (rev 12940) @@ -1,25 +0,0 @@ -#!/bin/sh -e - -# $1 version -TAR=../spring-build_$1.orig.tar.gz -DIR=spring-build-$1.orig -VERSION=`echo $1 | sed -e 's/[+~].*//g' | sed -e 's/\./_/g'` -REVISION=`echo $1 | sed -e 's/.*svn//'` -TAG=release-$VERSION -SVN_ROOT=https://src.springframework.org/svn/spring-build/trunk/ -SVN_OPTS=--ignore-externals - -# clean up the upstream tarball -svn export $SVN_OPTS -r $REVISION $SVN_ROOT $DIR -GZIP=--best tar -c -z -f $TAR -X debian/orig-tar.exclude $DIR -rm -rf $DIR - -# move to directory 'tarballs' -if [ -r .svn/deb-layout ]; then - . .svn/deb-layout - mv $TAR $origDir - echo "moved $TAR to $origDir" -fi - -exit 0 - Copied: tags/spring-build/2.5.2~git3be7d52-1/debian/orig-tar.sh (from rev 12938, trunk/spring-build/debian/orig-tar.sh) =================================================================== --- tags/spring-build/2.5.2~git3be7d52-1/debian/orig-tar.sh (rev 0) +++ tags/spring-build/2.5.2~git3be7d52-1/debian/orig-tar.sh 2010-08-24 22:33:50 UTC (rev 12940) @@ -0,0 +1,35 @@ +#!/bin/sh -e + +# $1 version +TAR=../spring-build_$1.orig.tar.gz +DIR=spring-build-$1.orig +VERSION=`echo $1 | sed -e 's/[+~].*//g'` +TAG=$VERSION + +GIT_ROOT=git://git.springsource.org/spring-build +GIT_MODULES="misc-ant aws-ant aws-ivy osgi-ant" + +mkdir orig_tmp +(cd orig_tmp && \ +mkdir $DIR && \ +git clone ${GIT_ROOT}/spring-build.git && \ +(cd spring-build; git archive --prefix=project-build/ --format=tar $TAG | tar -C ../$DIR -xf -) && \ +for git_module in $GIT_MODULES; do \ + git clone ${GIT_ROOT}/${git_module}.git && \ + (cd ${git_module}; git archive --format=tar HEAD | tar -C ../$DIR -xf -); \ +done +) + +GZIP=--best tar -C orig_tmp -c -z -f $TAR -X debian/orig-tar.exclude $DIR + +rm -rf orig_tmp + +# move to directory 'tarballs' +if [ -r .svn/deb-layout ]; then + . .svn/deb-layout + mv $TAR $origDir + echo "moved $TAR to $origDir" +fi + +exit 0 + Deleted: tags/spring-build/2.5.2~git3be7d52-1/debian/patches/ivy_artifact.diff =================================================================== --- trunk/spring-build/debian/patches/ivy_artifact.diff 2010-08-23 20:53:24 UTC (rev 12937) +++ tags/spring-build/2.5.2~git3be7d52-1/debian/patches/ivy_artifact.diff 2010-08-24 22:33:50 UTC (rev 12940) @@ -1,144 +0,0 @@ -Description: Don't use Ivy for Spring Build own dependencies - resolution. Use explicit classpath references. -Author: Damien Raude-Morvan <[email protected]> -Forwarded: not-needed -Last-Update: 2010-06-19 ---- a/org.springframework.build.ant/ivy.xml -+++ b/org.springframework.build.ant/ivy.xml -@@ -19,8 +19,10 @@ - </publications> - - <dependencies> -- <dependency org="org.apache.ant" name="com.springsource.org.apache.tools.ant" rev="1.7.0" conf="provided->compile"/> -- <dependency org="org.apache.commons" name="com.springsource.org.apache.commons.net" rev="1.4.1" conf="provided->compile"/> -+<!-- -+ <dependency org="org.apache.ant" name="ant" rev="debian" conf="provided->compile"/> -+ <dependency org="commons-net" name="commons-net" rev="2.x" conf="provided->compile"/> -+--> - </dependencies> - - </ivy-module> ---- a/project-build/standard/artifact.xml -+++ b/project-build/standard/artifact.xml -@@ -7,13 +7,25 @@ - - <!-- Other targets --> - <target name="compile.init" depends="ivy.init"> -+<!-- - <ivy:cachepath resolveId="spring.ant.classpath" pathid="spring.ant.classpath" - organisation="org.springframework.build" module="org.springframework.build.ant" - revision="${org.springframework.build.ant.version}" conf="runtime" type="jar" inline="true" - log="download-only"/> -+--> -+ <path id="spring.ant.classpath"> -+ <pathelement path="${spring.ant.classpath}"/> -+ </path> -+<!-- - <ivy:cachepath resolveId="ecj.classpath" pathid="ecj.classpath" organisation="org.eclipse.jdt" - module="com.springsource.org.eclipse.jdt.core.compiler.batch" revision="${org.eclipse.jdt.core.compiler.batch.version}" - conf="runtime" type="jar" inline="true" log="download-only"/> -+--> -+ -+ <path id="ecj.classpath"> -+ <pathelement path="${ecj.classpath}"/> -+ </path> -+ - <taskdef resource="org/springframework/build/ant/antlib.xml" uri="antlib:org.springframework.build"> - <classpath> - <path refid="spring.ant.classpath"/> -@@ -22,4 +34,4 @@ - </taskdef> - </target> - --</project> -\ No newline at end of file -+</project> ---- a/project-build/weaving-external/artifact.xml -+++ b/project-build/weaving-external/artifact.xml -@@ -42,9 +42,14 @@ - organisation="org.springframework.build" module="org.springframework.build.ant" - revision="${org.springframework.build.ant.version}" conf="runtime" type="jar" inline="true" - log="download-only"/> -+<!-- - <ivy:cachepath resolveId="ecj.classpath" pathid="ecj.classpath" organisation="org.eclipse.jdt" - module="com.springsource.org.eclipse.jdt.core.compiler.batch" revision="${org.eclipse.jdt.core.compiler.batch.version}" - conf="runtime" type="jar" inline="true" log="download-only"/> -+--> -+ <path id="ecj.classpath"> -+ <pathelement path="${ecj.classpath}"/> -+ </path> - <taskdef resource="org/springframework/build/ant/antlib.xml" uri="antlib:org.springframework.build"> - <classpath> - <path refid="spring.ant.classpath"/> -@@ -64,4 +69,4 @@ - </bundlor:bundlor> - </target> - --</project> -\ No newline at end of file -+</project> ---- a/project-build/war/artifact.xml -+++ b/project-build/war/artifact.xml -@@ -44,9 +44,14 @@ - organisation="org.springframework.build" module="org.springframework.build.ant" - revision="${org.springframework.build.ant.version}" conf="runtime" type="jar" inline="true" - log="download-only"/> -+<!-- - <ivy:cachepath resolveId="ecj.classpath" pathid="ecj.classpath" organisation="org.eclipse.jdt" - module="com.springsource.org.eclipse.jdt.core.compiler.batch" revision="${org.eclipse.jdt.core.compiler.batch.version}" - conf="runtime" type="jar" inline="true" log="download-only"/> -+--> -+ <path id="ecj.classpath"> -+ <pathelement path="${ecj.classpath}"/> -+ </path> - <taskdef resource="org/springframework/build/ant/antlib.xml" uri="antlib:org.springframework.build"> - <classpath> - <path refid="spring.ant.classpath"/> -@@ -66,4 +71,4 @@ - </bundlor:bundlor> - </target> - --</project> -\ No newline at end of file -+</project> ---- a/org.springframework.build.aws.ant/ivy.xml -+++ b/org.springframework.build.aws.ant/ivy.xml -@@ -19,8 +19,10 @@ - </publications> - - <dependencies> -+<!-- - <dependency org="org.apache.ant" name="com.springsource.org.apache.tools.ant" rev="1.7.0" conf="provided->compile"/> - <dependency org="org.jets3t" name="com.springsource.org.jets3t" rev="0.6.1" conf="compile->compile;runtime->runtime"/> -+--> - </dependencies> - - </ivy-module> ---- a/org.springframework.build.aws.ivy/ivy.xml -+++ b/org.springframework.build.aws.ivy/ivy.xml -@@ -19,9 +19,11 @@ - </publications> - - <dependencies> -+<!-- - <dependency org="org.jets3t" name="com.springsource.org.jets3t" rev="0.6.0" conf="compile->default;runtime->runtime"/> - <dependency org="org.apache.ant" name="com.springsource.org.apache.ivy" rev="2.0.0.beta2" conf="compile->compile"/> - <dependency org="org.apache.commons" name="com.springsource.org.apache.commons.httpclient" rev="3.1.0" conf="runtime->runtime"/> -+--> - </dependencies> - - </ivy-module> ---- a/org.springframework.build.osgi/ivy.xml -+++ b/org.springframework.build.osgi/ivy.xml -@@ -19,9 +19,11 @@ - </publications> - - <dependencies> -+<!-- - <dependency org="org.apache.ant" name="com.springsource.org.apache.tools.ant" rev="1.7.0" conf="provided->runtime"/> - <dependency org="org.eclipse.osgi" name="org.eclipse.osgi" rev="3.5.0.v20090311-1300" conf="compile->runtime"/> - <dependency org="org.junit" name="com.springsource.org.junit" rev="4.4.0" conf="test->runtime"/> -+--> - </dependencies> - - </ivy-module> Copied: tags/spring-build/2.5.2~git3be7d52-1/debian/patches/ivy_artifact.diff (from rev 12938, trunk/spring-build/debian/patches/ivy_artifact.diff) =================================================================== --- tags/spring-build/2.5.2~git3be7d52-1/debian/patches/ivy_artifact.diff (rev 0) +++ tags/spring-build/2.5.2~git3be7d52-1/debian/patches/ivy_artifact.diff 2010-08-24 22:33:50 UTC (rev 12940) @@ -0,0 +1,144 @@ +Description: Don't use Ivy for Spring Build own dependencies + resolution. Use explicit classpath references. +Author: Damien Raude-Morvan <[email protected]> +Forwarded: not-needed +Last-Update: 2010-06-19 +--- a/org.springframework.build.ant/ivy.xml ++++ b/org.springframework.build.ant/ivy.xml +@@ -19,8 +19,10 @@ + </publications> + + <dependencies> +- <dependency org="org.apache.ant" name="com.springsource.org.apache.tools.ant" rev="1.7.0" conf="provided->compile"/> +- <dependency org="org.apache.commons" name="com.springsource.org.apache.commons.net" rev="1.4.1" conf="provided->compile"/> ++<!-- ++ <dependency org="org.apache.ant" name="ant" rev="debian" conf="provided->compile"/> ++ <dependency org="commons-net" name="commons-net" rev="2.x" conf="provided->compile"/> ++--> + </dependencies> + + </ivy-module> +--- a/project-build/standard/artifact.xml ++++ b/project-build/standard/artifact.xml +@@ -22,13 +22,25 @@ + + <!-- Other targets --> + <target name="compile.init" depends="ivy.init"> ++<!-- + <ivy:cachepath resolveId="spring.ant.classpath" pathid="spring.ant.classpath" + organisation="org.springframework.build" module="org.springframework.build.ant" + revision="${org.springframework.build.ant.version}" conf="runtime" type="jar" inline="true" + log="download-only"/> ++--> ++ <path id="spring.ant.classpath"> ++ <pathelement path="${spring.ant.classpath}"/> ++ </path> ++<!-- + <ivy:cachepath resolveId="ecj.classpath" pathid="ecj.classpath" organisation="org.eclipse.jdt" + module="com.springsource.org.eclipse.jdt.core.compiler.batch" revision="${org.eclipse.jdt.core.compiler.batch.version}" + conf="runtime" type="jar" inline="true" log="download-only"/> ++--> ++ ++ <path id="ecj.classpath"> ++ <pathelement path="${ecj.classpath}"/> ++ </path> ++ + <taskdef resource="org/springframework/build/ant/antlib.xml" uri="antlib:org.springframework.build"> + <classpath> + <path refid="spring.ant.classpath"/> +@@ -37,4 +49,4 @@ + </taskdef> + </target> + +-</project> +\ No newline at end of file ++</project> +--- a/project-build/weaving-external/artifact.xml ++++ b/project-build/weaving-external/artifact.xml +@@ -58,9 +58,14 @@ + organisation="org.springframework.build" module="org.springframework.build.ant" + revision="${org.springframework.build.ant.version}" conf="runtime" type="jar" inline="true" + log="download-only"/> ++<!-- + <ivy:cachepath resolveId="ecj.classpath" pathid="ecj.classpath" organisation="org.eclipse.jdt" + module="com.springsource.org.eclipse.jdt.core.compiler.batch" revision="${org.eclipse.jdt.core.compiler.batch.version}" + conf="runtime" type="jar" inline="true" log="download-only"/> ++--> ++ <path id="ecj.classpath"> ++ <pathelement path="${ecj.classpath}"/> ++ </path> + <taskdef resource="org/springframework/build/ant/antlib.xml" uri="antlib:org.springframework.build"> + <classpath> + <path refid="spring.ant.classpath"/> +@@ -80,4 +85,4 @@ + </bundlor:bundlor> + </target> + +-</project> +\ No newline at end of file ++</project> +--- a/project-build/war/artifact.xml ++++ b/project-build/war/artifact.xml +@@ -60,9 +60,14 @@ + organisation="org.springframework.build" module="org.springframework.build.ant" + revision="${org.springframework.build.ant.version}" conf="runtime" type="jar" inline="true" + log="download-only"/> ++<!-- + <ivy:cachepath resolveId="ecj.classpath" pathid="ecj.classpath" organisation="org.eclipse.jdt" + module="com.springsource.org.eclipse.jdt.core.compiler.batch" revision="${org.eclipse.jdt.core.compiler.batch.version}" + conf="runtime" type="jar" inline="true" log="download-only"/> ++--> ++ <path id="ecj.classpath"> ++ <pathelement path="${ecj.classpath}"/> ++ </path> + <taskdef resource="org/springframework/build/ant/antlib.xml" uri="antlib:org.springframework.build"> + <classpath> + <path refid="spring.ant.classpath"/> +@@ -82,4 +87,4 @@ + </bundlor:bundlor> + </target> + +-</project> +\ No newline at end of file ++</project> +--- a/org.springframework.build.aws.ant/ivy.xml ++++ b/org.springframework.build.aws.ant/ivy.xml +@@ -19,8 +19,10 @@ + </publications> + + <dependencies> ++<!-- + <dependency org="org.apache.ant" name="com.springsource.org.apache.tools.ant" rev="1.7.0" conf="provided->compile"/> + <dependency org="org.jets3t" name="com.springsource.org.jets3t" rev="0.6.1" conf="compile->compile;runtime->runtime"/> ++--> + </dependencies> + + </ivy-module> +--- a/org.springframework.build.aws.ivy/ivy.xml ++++ b/org.springframework.build.aws.ivy/ivy.xml +@@ -19,9 +19,11 @@ + </publications> + + <dependencies> ++<!-- + <dependency org="org.jets3t" name="com.springsource.org.jets3t" rev="0.7.0" conf="compile->compile;runtime->runtime"/> + <dependency org="org.apache.ant" name="com.springsource.org.apache.ivy" rev="2.0.0.beta2" conf="compile->compile"/> + <dependency org="org.apache.commons" name="com.springsource.org.apache.commons.httpclient" rev="3.1.0" conf="runtime->runtime"/> ++--> + </dependencies> + + </ivy-module> +--- a/org.springframework.build.osgi/ivy.xml ++++ b/org.springframework.build.osgi/ivy.xml +@@ -19,9 +19,11 @@ + </publications> + + <dependencies> ++<!-- + <dependency org="org.apache.ant" name="com.springsource.org.apache.tools.ant" rev="1.7.0" conf="provided->runtime"/> + <dependency org="org.eclipse.osgi" name="org.eclipse.osgi" rev="3.5.0.v20090311-1300" conf="compile->runtime"/> + <dependency org="org.junit" name="com.springsource.org.junit" rev="4.4.0" conf="test->runtime"/> ++--> + </dependencies> + + </ivy-module> Deleted: tags/spring-build/2.5.2~git3be7d52-1/debian/patches/ivy_aspectj.diff =================================================================== --- trunk/spring-build/debian/patches/ivy_aspectj.diff 2010-08-23 20:53:24 UTC (rev 12937) +++ tags/spring-build/2.5.2~git3be7d52-1/debian/patches/ivy_aspectj.diff 2010-08-24 22:33:50 UTC (rev 12940) @@ -1,122 +0,0 @@ -Description: Fix aspectj ant tasks. -Author: Damien Raude-Morvan <[email protected]> -Forwarded: not-needed -Last-Update: 2010-06-19 ---- a/project-build/aspect/artifact.xml -+++ b/project-build/aspect/artifact.xml -@@ -9,10 +9,16 @@ - - <!-- Other targets --> - <target name="compile.init" depends="ivy.init"> -+<!-- - <ivy:cachepath resolveId="ajc.classpath" pathid="ajc.classpath" organisation="org.aspectj" - module="com.springsource.org.aspectj.tools" revision="${org.aspectj.tools.version}" conf="runtime" - type="jar" inline="true" log="download-only"/> -+--> -+ <path id="ajc.classpath"> -+ <pathelement path="${ajc.classpath}"/> -+ </path> -+ - <taskdef resource="org/aspectj/tools/ant/taskdefs/aspectjTaskdefs.properties" classpathref="ajc.classpath"/> - </target> - --</project> -\ No newline at end of file -+</project> ---- a/project-build/weaving-external/artifact.xml -+++ b/project-build/weaving-external/artifact.xml -@@ -17,7 +17,8 @@ - <delete quiet="true" file="${source-jar.output.file}"/> - <mkdir dir="${source-jar.output.dir}"/> - -- <iajc inPathRef="external.classpath" aspectPathRef="aspects.classpath" classpathRef="compile.classpath" -+ <property name="internal.compile.classpath" refid="compile.classpath"/> -+ <iajc inPathRef="external.classpath" aspectPathRef="aspects.classpath" classpath="${internal.compile.classpath}:/usr/share/java/aspectjrt.jar" - outJar="${jar.output.file}" source="${source.version}" checkRuntimeVersion="false" X="${aspectj.x}"/> - <antcall target="bundlor"/> - <copy tofile="${source-jar.output.file}"> -@@ -33,9 +34,14 @@ - - <!-- Other targets --> - <target name="compile.init" depends="ivy.init"> -+<!-- - <ivy:cachepath resolveId="ajc.classpath" pathid="ajc.classpath" organisation="org.aspectj" - module="com.springsource.org.aspectj.tools" revision="${org.aspectj.tools.version}" conf="runtime" - type="jar" inline="true" log="download-only"/> -+--> -+ <path id="ajc.classpath"> -+ <pathelement path="${ajc.classpath}"/> -+ </path> - <taskdef resource="org/aspectj/tools/ant/taskdefs/aspectjTaskdefs.properties" classpathref="ajc.classpath"/> - - <ivy:cachepath resolveId="spring.ant.classpath" pathid="spring.ant.classpath" ---- a/project-build/weaving/artifact.xml -+++ b/project-build/weaving/artifact.xml -@@ -10,9 +10,15 @@ - - <!-- Other targets --> - <target name="compile.init" depends="ivy.init"> -+<!-- - <ivy:cachepath resolveId="ajc.classpath" pathid="ajc.classpath" organisation="org.aspectj" - module="com.springsource.org.aspectj.tools" revision="${org.aspectj.tools.version}" conf="runtime" - type="jar" inline="true" log="download-only"/> -+--> -+ <path id="ajc.classpath"> -+ <pathelement path="${ajc.classpath}"/> -+ </path> -+ - <taskdef resource="org/aspectj/tools/ant/taskdefs/aspectjTaskdefs.properties" classpathref="ajc.classpath"/> - - <ivy:cachepath resolveId="spring.ant.classpath" pathid="spring.ant.classpath" -@@ -41,4 +47,4 @@ - </bundlor:bundlor> - </target> - --</project> -\ No newline at end of file -+</project> ---- a/project-build/aspect/common.xml -+++ b/project-build/aspect/common.xml -@@ -10,7 +10,8 @@ - <attribute name="output.dir"/> - <attribute name="resources.dir"/> - <sequential> -- <iajc sourceroots="@{input.dir}" destDir="@{output.dir}" classpathRef="@{classpath.id}" source="${source.version}" -+ <property name="internal.classpath" refid="@{classpath.id}"/> -+ <iajc sourceroots="@{input.dir}" destDir="@{output.dir}" classpath="${internal.classpath}:/usr/share/java/aspectjrt.jar" source="${source.version}" - debug="${compile.debug}" debugLevel="${compile.debug.level}" checkRuntimeVersion="false" - aspectPathRef="aspects.classpath" X="${aspectj.x}"/> - <copy todir="@{output.dir}"> -@@ -27,4 +28,4 @@ - </sequential> - </macrodef> - --</project> -\ No newline at end of file -+</project> ---- a/project-build/aspect/quality.xml -+++ b/project-build/aspect/quality.xml -@@ -16,7 +16,8 @@ - </path> - <test-compile classpath.id="test.compile.classpath" input.dir="${test.java.dir}" output.dir="${test.output.dir}" - resources.dir="${test.resources.dir}"/> -- <iajc inPath="${test.output.dir}" aspectPathRef="test.aspect.path" classpathRef="test.compile.classpath" -+ <property name="internal.test.compile.classpath" refid="test.compile.classpath"/> -+ <iajc inPath="${test.output.dir}" aspectPathRef="test.aspect.path" classpath="${internal.test.compile.classpath}:/usr/share/java/aspectjrt.jar" - destDir="${test.output.dir}" source="${source.version}" checkRuntimeVersion="false" X="${aspectj.x}"/> - - <path id="test.run.classpath"> -@@ -51,9 +52,10 @@ - </path> - <test-compile classpath.id="test.compile.classpath" input.dir="${test.clover.dir}" output.dir="${test.output.dir}" - resources.dir="${test.resources.dir}"/> -- <iajc inPath="${test.output.dir}" aspectPathRef="test.aspect.path" classpathRef="test.compile.classpath" -+ <property name="internal.test.compile.classpath" refid="test.compile.classpath"/> -+ <iajc inPath="${test.output.dir}" aspectPathRef="test.aspect.path" classpath="${internal.test.compile.classpath}:/usr/share/java/aspectjrt.jar" - destDir="${test.output.dir}" source="${source.version}" checkRuntimeVersion="false" X="${aspectj.x}"/> - <delete dir="${clover.staging.dir}" quiet="true"/> - </target> - --</project> -\ No newline at end of file -+</project> Copied: tags/spring-build/2.5.2~git3be7d52-1/debian/patches/ivy_aspectj.diff (from rev 12938, trunk/spring-build/debian/patches/ivy_aspectj.diff) =================================================================== --- tags/spring-build/2.5.2~git3be7d52-1/debian/patches/ivy_aspectj.diff (rev 0) +++ tags/spring-build/2.5.2~git3be7d52-1/debian/patches/ivy_aspectj.diff 2010-08-24 22:33:50 UTC (rev 12940) @@ -0,0 +1,122 @@ +Description: Fix aspectj ant tasks. +Author: Damien Raude-Morvan <[email protected]> +Forwarded: not-needed +Last-Update: 2010-06-19 +--- a/project-build/aspect/artifact.xml ++++ b/project-build/aspect/artifact.xml +@@ -24,10 +24,16 @@ + + <!-- Other targets --> + <target name="compile.init" depends="ivy.init"> ++<!-- + <ivy:cachepath resolveId="ajc.classpath" pathid="ajc.classpath" organisation="org.aspectj" + module="com.springsource.org.aspectj.tools" revision="${org.aspectj.tools.version}" conf="runtime" + type="jar" inline="true" log="download-only"/> ++--> ++ <path id="ajc.classpath"> ++ <pathelement path="${ajc.classpath}"/> ++ </path> ++ + <taskdef resource="org/aspectj/tools/ant/taskdefs/aspectjTaskdefs.properties" classpathref="ajc.classpath"/> + </target> + +-</project> +\ No newline at end of file ++</project> +--- a/project-build/weaving-external/artifact.xml ++++ b/project-build/weaving-external/artifact.xml +@@ -32,7 +32,8 @@ + <delete quiet="true" file="${source-jar.output.file}"/> + <mkdir dir="${source-jar.output.dir}"/> + +- <iajc inPathRef="external.classpath" aspectPathRef="aspects.classpath" classpathRef="compile.classpath" ++ <property name="internal.compile.classpath" refid="compile.classpath"/> ++ <iajc inPathRef="external.classpath" aspectPathRef="aspects.classpath" classpath="${internal.compile.classpath}:/usr/share/java/aspectjrt.jar" + outJar="${jar.output.file}" source="${source.version}" checkRuntimeVersion="false" X="${aspectj.x}"/> + <antcall target="bundlor"/> + <copy tofile="${source-jar.output.file}"> +@@ -49,9 +50,14 @@ + + <!-- Other targets --> + <target name="compile.init" depends="ivy.init"> ++<!-- + <ivy:cachepath resolveId="ajc.classpath" pathid="ajc.classpath" organisation="org.aspectj" + module="com.springsource.org.aspectj.tools" revision="${org.aspectj.tools.version}" conf="runtime" + type="jar" inline="true" log="download-only"/> ++--> ++ <path id="ajc.classpath"> ++ <pathelement path="${ajc.classpath}"/> ++ </path> + <taskdef resource="org/aspectj/tools/ant/taskdefs/aspectjTaskdefs.properties" classpathref="ajc.classpath"/> + + <ivy:cachepath resolveId="spring.ant.classpath" pathid="spring.ant.classpath" +--- a/project-build/weaving/artifact.xml ++++ b/project-build/weaving/artifact.xml +@@ -25,9 +25,15 @@ + + <!-- Other targets --> + <target name="compile.init" depends="ivy.init"> ++<!-- + <ivy:cachepath resolveId="ajc.classpath" pathid="ajc.classpath" organisation="org.aspectj" + module="com.springsource.org.aspectj.tools" revision="${org.aspectj.tools.version}" conf="runtime" + type="jar" inline="true" log="download-only"/> ++--> ++ <path id="ajc.classpath"> ++ <pathelement path="${ajc.classpath}"/> ++ </path> ++ + <taskdef resource="org/aspectj/tools/ant/taskdefs/aspectjTaskdefs.properties" classpathref="ajc.classpath"/> + + <ivy:cachepath resolveId="spring.ant.classpath" pathid="spring.ant.classpath" +@@ -56,4 +62,4 @@ + </bundlor:bundlor> + </target> + +-</project> +\ No newline at end of file ++</project> +--- a/project-build/aspect/common.xml ++++ b/project-build/aspect/common.xml +@@ -25,7 +25,8 @@ + <attribute name="output.dir"/> + <attribute name="resources.dir"/> + <sequential> +- <iajc sourceroots="@{input.dir}" destDir="@{output.dir}" classpathRef="@{classpath.id}" source="${source.version}" ++ <property name="internal.classpath" refid="@{classpath.id}"/> ++ <iajc sourceroots="@{input.dir}" destDir="@{output.dir}" classpath="${internal.classpath}:/usr/share/java/aspectjrt.jar" source="${source.version}" + debug="${compile.debug}" debugLevel="${compile.debug.level}" checkRuntimeVersion="false" + aspectPathRef="aspects.classpath" X="${aspectj.x}"/> + <copy todir="@{output.dir}"> +@@ -42,4 +43,4 @@ + </sequential> + </macrodef> + +-</project> +\ No newline at end of file ++</project> +--- a/project-build/aspect/quality.xml ++++ b/project-build/aspect/quality.xml +@@ -31,7 +31,8 @@ + </path> + <test-compile classpath.id="test.compile.classpath" input.dir="${test.java.dir}" output.dir="${test.output.dir}" + resources.dir="${test.resources.dir}"/> +- <iajc inPath="${test.output.dir}" aspectPathRef="test.aspect.path" classpathRef="test.compile.classpath" ++ <property name="internal.test.compile.classpath" refid="test.compile.classpath"/> ++ <iajc inPath="${test.output.dir}" aspectPathRef="test.aspect.path" classpath="${internal.test.compile.classpath}:/usr/share/java/aspectjrt.jar" + destDir="${test.output.dir}" source="${source.version}" checkRuntimeVersion="false" X="${aspectj.x}"/> + + <path id="test.run.classpath"> +@@ -66,9 +67,10 @@ + </path> + <test-compile classpath.id="test.compile.classpath" input.dir="${test.clover.dir}" output.dir="${test.output.dir}" + resources.dir="${test.resources.dir}"/> +- <iajc inPath="${test.output.dir}" aspectPathRef="test.aspect.path" classpathRef="test.compile.classpath" ++ <property name="internal.test.compile.classpath" refid="test.compile.classpath"/> ++ <iajc inPath="${test.output.dir}" aspectPathRef="test.aspect.path" classpath="${internal.test.compile.classpath}:/usr/share/java/aspectjrt.jar" + destDir="${test.output.dir}" source="${source.version}" checkRuntimeVersion="false" X="${aspectj.x}"/> + <delete dir="${clover.staging.dir}" quiet="true"/> + </target> + +-</project> +\ No newline at end of file ++</project> Deleted: tags/spring-build/2.5.2~git3be7d52-1/debian/patches/ivy_local_only.diff =================================================================== --- trunk/spring-build/debian/patches/ivy_local_only.diff 2010-08-23 20:53:24 UTC (rev 12937) +++ tags/spring-build/2.5.2~git3be7d52-1/debian/patches/ivy_local_only.diff 2010-08-24 22:33:50 UTC (rev 12940) @@ -1,60 +0,0 @@ -Description: Only use local Ivy repository (no download) -Author: Damien Raude-Morvan <[email protected]> -Forwarded: not-needed -Last-Update: 2010-06-19 ---- a/project-build/common/ivysettings.xml -+++ b/project-build/common/ivysettings.xml -@@ -1,8 +1,6 @@ - <?xml version="1.0" encoding="UTF-8"?> - <ivysettings> - -- <typedef name="s3" classname="org.springframework.aws.ivy.S3Resolver"/> -- - <settings defaultResolver="external-lookup" defaultLatestStrategy="latest-lexico"/> - - <caches resolutionCacheDir="${ivy.cache.dir}/resolution" repositoryCacheDir="${ivy.cache.dir}/repository" -@@ -36,32 +34,31 @@ - - <!-- Lookup repositories --> - <chain name="external-lookup" returnFirst="true"> -- <localrepo name="local-external-repository"/> -- <s3repo name="bundle-external-repository" bucket="repository.springsource.com" artifact.type="bundles" release.type="external"/> -- <s3repo name="library-external-repository" bucket="repository.springsource.com" artifact.type="libraries" release.type="external"/> -+ <filesystem name="local-maven-repo" m2compatible="true" local="true"> -+ <ivy pattern="/usr/share/maven-repo/[organisation]/[module]/[revision]/[module]-[revision](-[classifier]).pom"/> -+ <artifact pattern="/usr/share/maven-repo/[organisation]/[module]/[revision]/[module]-[revision](-[classifier]).jar"/> -+ </filesystem> -+<!-- -+ <filesystem name="local-java" local="true"> -+ <artifact pattern="/usr/share/java/[module].jar"/> -+ </filesystem> -+--> - </chain> - - <chain name="spring-portfolio-lookup" returnFirst="true"> - <resolver ref="integration"/> - <localrepo name="local"/> -- <s3repo name="bundle-release-repository" bucket="repository.springsource.com" artifact.type="bundles" release.type="release"/> -- <s3repo name="bundle-milestone-repository" bucket="repository.springsource.com" artifact.type="bundles" release.type="milestone"/> -- <s3repo name="bundle-snapshot-repository" bucket="repository.springsource.com" artifact.type="bundles" release.type="snapshot"/> -- <s3repo name="library-release-repository" bucket="repository.springsource.com" artifact.type="libraries" release.type="release"/> -- <s3repo name="library-milestone-repository" bucket="repository.springsource.com" artifact.type="libraries" release.type="milestone"/> -- <s3repo name="library-snapshot-repository" bucket="repository.springsource.com" artifact.type="libraries" release.type="snapshot"/> -+ <resolver ref="external-lookup"/> - </chain> - - <!-- Publishing repositories --> -- <s3repo name="ebr-bundle-publish" bucket="${publish.bucket}" artifact.type="bundles" release.type="${adjusted.release.type}"/> -- <s3repo name="ebr-library-publish" bucket="${publish.bucket}" artifact.type="libraries" release.type="${adjusted.release.type}"/> - <localrepo name="local-bundle-publish"/> - <localrepo name="local-library-publish"/> - </resolvers> - - <modules> -- <module organisation="org.springframework.*" name="*" resolver="spring-portfolio-lookup"/> -- <module organisation="com.springsource.*" name="*" resolver="spring-portfolio-lookup"/> -+ <module organisation="org.springframework.*" name="*" resolver="spring-portfolio-lookup"/> -+ <module organisation="com.springsource.*" name="*" resolver="spring-portfolio-lookup"/> - </modules> - - </ivysettings> Copied: tags/spring-build/2.5.2~git3be7d52-1/debian/patches/ivy_local_only.diff (from rev 12938, trunk/spring-build/debian/patches/ivy_local_only.diff) =================================================================== --- tags/spring-build/2.5.2~git3be7d52-1/debian/patches/ivy_local_only.diff (rev 0) +++ tags/spring-build/2.5.2~git3be7d52-1/debian/patches/ivy_local_only.diff 2010-08-24 22:33:50 UTC (rev 12940) @@ -0,0 +1,60 @@ +Description: Only use local Ivy repository (no download) +Author: Damien Raude-Morvan <[email protected]> +Forwarded: not-needed +Last-Update: 2010-06-19 +--- a/project-build/common/ivysettings.xml ++++ b/project-build/common/ivysettings.xml +@@ -16,8 +16,6 @@ + --> + <ivysettings> + +- <typedef name="s3" classname="org.springframework.aws.ivy.S3Resolver"/> +- + <settings defaultResolver="external-lookup" defaultLatestStrategy="latest-lexico"/> + + <caches resolutionCacheDir="${ivy.cache.dir}/resolution" repositoryCacheDir="${ivy.cache.dir}/repository" +@@ -51,32 +49,31 @@ + + <!-- Lookup repositories --> + <chain name="external-lookup" returnFirst="true"> +- <localrepo name="local-external-repository"/> +- <s3repo name="bundle-external-repository" bucket="repository.springsource.com" artifact.type="bundles" release.type="external"/> +- <s3repo name="library-external-repository" bucket="repository.springsource.com" artifact.type="libraries" release.type="external"/> ++ <filesystem name="local-maven-repo" m2compatible="true" local="true"> ++ <ivy pattern="/usr/share/maven-repo/[organisation]/[module]/[revision]/[module]-[revision](-[classifier]).pom"/> ++ <artifact pattern="/usr/share/maven-repo/[organisation]/[module]/[revision]/[module]-[revision](-[classifier]).jar"/> ++ </filesystem> ++<!-- ++ <filesystem name="local-java" local="true"> ++ <artifact pattern="/usr/share/java/[module].jar"/> ++ </filesystem> ++--> + </chain> + + <chain name="spring-portfolio-lookup" returnFirst="true"> + <resolver ref="integration"/> + <localrepo name="local"/> +- <s3repo name="bundle-release-repository" bucket="repository.springsource.com" artifact.type="bundles" release.type="release"/> +- <s3repo name="bundle-milestone-repository" bucket="repository.springsource.com" artifact.type="bundles" release.type="milestone"/> +- <s3repo name="bundle-snapshot-repository" bucket="repository.springsource.com" artifact.type="bundles" release.type="snapshot"/> +- <s3repo name="library-release-repository" bucket="repository.springsource.com" artifact.type="libraries" release.type="release"/> +- <s3repo name="library-milestone-repository" bucket="repository.springsource.com" artifact.type="libraries" release.type="milestone"/> +- <s3repo name="library-snapshot-repository" bucket="repository.springsource.com" artifact.type="libraries" release.type="snapshot"/> ++ <resolver ref="external-lookup"/> + </chain> + + <!-- Publishing repositories --> +- <s3repo name="ebr-bundle-publish" bucket="${publish.bucket}" artifact.type="bundles" release.type="${adjusted.release.type}"/> +- <s3repo name="ebr-library-publish" bucket="${publish.bucket}" artifact.type="libraries" release.type="${adjusted.release.type}"/> + <localrepo name="local-bundle-publish"/> + <localrepo name="local-library-publish"/> + </resolvers> + + <modules> +- <module organisation="org.springframework.*" name="*" resolver="spring-portfolio-lookup"/> +- <module organisation="com.springsource.*" name="*" resolver="spring-portfolio-lookup"/> ++ <module organisation="org.springframework.*" name="*" resolver="spring-portfolio-lookup"/> ++ <module organisation="com.springsource.*" name="*" resolver="spring-portfolio-lookup"/> + </modules> + + </ivysettings> Deleted: tags/spring-build/2.5.2~git3be7d52-1/debian/rules =================================================================== --- trunk/spring-build/debian/rules 2010-08-23 20:53:24 UTC (rev 12937) +++ tags/spring-build/2.5.2~git3be7d52-1/debian/rules 2010-08-24 22:33:50 UTC (rev 12940) @@ -1,36 +0,0 @@ -#!/usr/bin/make -f - -include /usr/share/cdbs/1/class/ant.mk -include /usr/share/cdbs/1/rules/debhelper.mk - -JAVA_HOME := /usr/lib/jvm/default-java -DEB_JARS := ivy commons-net commons-httpclient jets3t org.eclipse.osgi -DEB_ANT_BUILDFILE := debian/build.xml - -MODULES = ant aws.ant aws.ivy osgi -PRJ_ROOT = org.springframework.build -ARTIFACT_ROOT = target/artifacts/org.springframework.build - -makebuilddir:: - -for MYMOD in $(MODULES); do \ - (cd org.springframework.build.$$MYMOD; ln -s ../project-build spring-build); \ - done - -binary-post-install/libspring-build-java:: - for MYMOD in $(MODULES); do \ - POM=`echo debian/poms/$$MYMOD.xml`; \ - JAR=`echo $(PRJ_ROOT).$$MYMOD/$(ARTIFACT_ROOT).$$MYMOD.jar`; \ - mh_installpom -plibspring-build-java $$POM ; \ - mh_installjar -plibspring-build-java -l $$POM $$JAR ; \ - done - -clean:: - -for MYMOD in $(MODULES); do \ - rm org.springframework.build.$$MYMOD/spring-build; \ - done - -rm project-build/project-build - mh_clean - -get-orig-source: - sh debian/orig-tar.sh $(DEB_UPSTREAM_VERSION) - Copied: tags/spring-build/2.5.2~git3be7d52-1/debian/rules (from rev 12938, trunk/spring-build/debian/rules) =================================================================== --- tags/spring-build/2.5.2~git3be7d52-1/debian/rules (rev 0) +++ tags/spring-build/2.5.2~git3be7d52-1/debian/rules 2010-08-24 22:33:50 UTC (rev 12940) @@ -0,0 +1,37 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/class/ant.mk +include /usr/share/cdbs/1/rules/debhelper.mk + +JAVA_HOME := /usr/lib/jvm/default-java +DEB_JARS := ivy commons-net commons-httpclient jets3t org.eclipse.osgi +DEB_ANT_BUILDFILE := debian/build.xml + +MODULES = ant aws.ant aws.ivy osgi +PRJ_ROOT = org.springframework.build +ARTIFACT_ROOT = target/artifacts/org.springframework.build + +pre-build:: + -ln -s project-build spring-build + -for MYMOD in $(MODULES); do \ + (cd org.springframework.build.$$MYMOD; ln -s ../project-build spring-build); \ + done + +binary-post-install/libspring-build-java:: + for MYMOD in $(MODULES); do \ + POM=`echo debian/poms/$$MYMOD.xml`; \ + JAR=`echo $(PRJ_ROOT).$$MYMOD/$(ARTIFACT_ROOT).$$MYMOD.jar`; \ + mh_installpom -plibspring-build-java $$POM ; \ + mh_installjar -plibspring-build-java -l $$POM $$JAR ; \ + done + +clean:: + -for MYMOD in $(MODULES); do \ + rm org.springframework.build.$$MYMOD/spring-build; \ + done + -rm spring-build + mh_clean + +get-orig-source: + sh debian/orig-tar.sh $(DEB_UPSTREAM_VERSION) + _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
