You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2014/03/15 21:26:50 UTC
svn commit: r1577934 -
/httpcomponents/httpclient-android/trunk/src/main/resources/build.gradle
Author: olegk
Date: Sat Mar 15 20:26:49 2014
New Revision: 1577934
URL: http://svn.apache.org/r1577934
Log:
Updated build script
Modified:
httpcomponents/httpclient-android/trunk/src/main/resources/build.gradle
Modified: httpcomponents/httpclient-android/trunk/src/main/resources/build.gradle
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/trunk/src/main/resources/build.gradle?rev=1577934&r1=1577933&r2=1577934&view=diff
==============================================================================
--- httpcomponents/httpclient-android/trunk/src/main/resources/build.gradle (original)
+++ httpcomponents/httpclient-android/trunk/src/main/resources/build.gradle Sat Mar 15 20:26:49 2014
@@ -93,7 +93,7 @@ android.libraryVariants.all { variant ->
from variant.javaCompile.destinationDir
from 'NOTICE.txt'
from 'LICENSE.txt'
- rename '(NOTICE|LICENSE).txt', '$1'
+ rename '(NOTICE|LICENSE).txt', 'META-INF/$1'
manifest {
from sharedManifest
@@ -105,7 +105,7 @@ android.libraryVariants.all { variant ->
from variant.javaCompile.source
from 'NOTICE.txt'
from 'LICENSE.txt'
- rename '(NOTICE|LICENSE).txt', '$1'
+ rename '(NOTICE|LICENSE).txt', 'META-INF/$1'
classifier = 'source'
manifest {
@@ -124,7 +124,7 @@ android.libraryVariants.all { variant ->
from createAndroidJavadoc.destinationDir
from 'NOTICE.txt'
from 'LICENSE.txt'
- rename '(NOTICE|LICENSE).txt', '$1'
+ rename '(NOTICE|LICENSE).txt', 'META-INF/$1'
classifier = 'javadoc'
manifest {
@@ -186,6 +186,28 @@ def askCredentials(MavenDeployer mavenDe
}
}
+task archiveSrcWin(type: Zip) {
+ with archiveSources
+ filter(['eol': org.apache.tools.ant.filters.FixCrLfFilter.CrLf.newInstance('crlf')],
+ org.apache.tools.ant.filters.FixCrLfFilter)
+ into "httpcomponents-client-android-$project.version"
+ classifier = 'scr'
+ baseName = 'httpcomponents-client-android'
+ version = project.version
+}
+
+task archiveSrcUnix(type: Tar) {
+ with archiveSources
+ into "httpcomponents-client-android-$project.version"
+ filter(['eol': org.apache.tools.ant.filters.FixCrLfFilter.CrLf.newInstance('lf')],
+ org.apache.tools.ant.filters.FixCrLfFilter)
+ classifier = 'scr'
+ baseName = 'httpcomponents-client-android'
+ version = project.version
+ extension = 'tar.gz'
+ compression = Compression.GZIP
+}
+
task uploadDist(type: Upload) {
configuration = configurations.dist
repositories {
Re: svn commit: r1577934 - /httpcomponents/httpclient-android/trunk/src/main/resources/build.gradle
Posted by sebb <se...@gmail.com>.
On 15 March 2014 20:26, <ol...@apache.org> wrote:
> Author: olegk
> Date: Sat Mar 15 20:26:49 2014
> New Revision: 1577934
>
> URL: http://svn.apache.org/r1577934
> Log:
> Updated build script
>
> Modified:
> httpcomponents/httpclient-android/trunk/src/main/resources/build.gradle
>
> Modified: httpcomponents/httpclient-android/trunk/src/main/resources/build.gradle
> URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/trunk/src/main/resources/build.gradle?rev=1577934&r1=1577933&r2=1577934&view=diff
> ==============================================================================
> --- httpcomponents/httpclient-android/trunk/src/main/resources/build.gradle (original)
> +++ httpcomponents/httpclient-android/trunk/src/main/resources/build.gradle Sat Mar 15 20:26:49 2014
> @@ -93,7 +93,7 @@ android.libraryVariants.all { variant ->
> from variant.javaCompile.destinationDir
> from 'NOTICE.txt'
> from 'LICENSE.txt'
> - rename '(NOTICE|LICENSE).txt', '$1'
> + rename '(NOTICE|LICENSE).txt', 'META-INF/$1'
>
> manifest {
> from sharedManifest
> @@ -105,7 +105,7 @@ android.libraryVariants.all { variant ->
> from variant.javaCompile.source
> from 'NOTICE.txt'
> from 'LICENSE.txt'
> - rename '(NOTICE|LICENSE).txt', '$1'
> + rename '(NOTICE|LICENSE).txt', 'META-INF/$1'
> classifier = 'source'
>
> manifest {
> @@ -124,7 +124,7 @@ android.libraryVariants.all { variant ->
> from createAndroidJavadoc.destinationDir
> from 'NOTICE.txt'
> from 'LICENSE.txt'
> - rename '(NOTICE|LICENSE).txt', '$1'
> + rename '(NOTICE|LICENSE).txt', 'META-INF/$1'
> classifier = 'javadoc'
>
> manifest {
> @@ -186,6 +186,28 @@ def askCredentials(MavenDeployer mavenDe
> }
> }
>
> +task archiveSrcWin(type: Zip) {
> + with archiveSources
> + filter(['eol': org.apache.tools.ant.filters.FixCrLfFilter.CrLf.newInstance('crlf')],
> + org.apache.tools.ant.filters.FixCrLfFilter)
> + into "httpcomponents-client-android-$project.version"
> + classifier = 'scr'
That looks wrong - should it be 'src' ?
> + baseName = 'httpcomponents-client-android'
> + version = project.version
> +}
> +
> +task archiveSrcUnix(type: Tar) {
> + with archiveSources
> + into "httpcomponents-client-android-$project.version"
> + filter(['eol': org.apache.tools.ant.filters.FixCrLfFilter.CrLf.newInstance('lf')],
> + org.apache.tools.ant.filters.FixCrLfFilter)
> + classifier = 'scr'
Ditto
> + baseName = 'httpcomponents-client-android'
> + version = project.version
> + extension = 'tar.gz'
> + compression = Compression.GZIP
> +}
> +
> task uploadDist(type: Upload) {
> configuration = configurations.dist
> repositories {
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@hc.apache.org
For additional commands, e-mail: dev-help@hc.apache.org