From 84f9d8f7f0828da2004842c793422de8c4e63848 Mon Sep 17 00:00:00 2001 From: theli Date: Tue, 24 May 2005 09:02:04 +0000 Subject: [PATCH] *) migrating ant build files to generate a single extension tar per default This is buildconfigureable by changing the extensionTarget Property in the build.properties file *) Trying to solve "yacy.java template replacement / ant build failed" bug git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@169 6c8d7289-2bf4-0310-a012-ef5d649a1542 --- build.properties | 10 ++- build.xml | 65 ++++++++++++------- source/de/anomic/plasma/parser/bzip/build.xml | 15 ++++- source/de/anomic/plasma/parser/doc/build.xml | 14 +++- source/de/anomic/plasma/parser/gzip/build.xml | 13 +++- .../anomic/plasma/parser/mimeType/build.xml | 14 +++- source/de/anomic/plasma/parser/pdf/build.xml | 22 ++++--- source/de/anomic/plasma/parser/rss/build.xml | 13 +++- source/de/anomic/plasma/parser/rtf/build.xml | 13 +++- source/de/anomic/plasma/parser/tar/build.xml | 14 +++- source/de/anomic/plasma/parser/zip/build.xml | 11 +++- source/de/anomic/soap/build.xml | 16 ++++- .../yacy/seedUpload/yacySeedUploadScp.xml | 24 ++++++- 13 files changed, 189 insertions(+), 55 deletions(-) diff --git a/build.properties b/build.properties index f4a5fa20f..90ef83163 100644 --- a/build.properties +++ b/build.properties @@ -6,4 +6,12 @@ javacTarget=1.4 releaseVersion=0.375 releaseFile=yacy_dev_v${releaseVersion}_${DSTAMP}_${releaseNr}.tar.gz releaseDir=yacy_v${releaseVersion}_${DSTAMP}_${releaseNr} -releaseNr=$Revision$ \ No newline at end of file +releaseNr=$Revision$ + +# defining some file/directory access rights +accessRightsDir=755 +accessRightsFile=644 + +# Extension Configuration: zip|copy +extensionTarget=copy +extensionFile=yacy_libx_v${releaseVersion}_${DSTAMP}_${releaseNr}.tar.gz \ No newline at end of file diff --git a/build.xml b/build.xml index 89a111306..0912e1fca 100644 --- a/build.xml +++ b/build.xml @@ -49,11 +49,11 @@ # Contributions and changes to the program code must be marked as such. --> + - @@ -65,6 +65,7 @@ + @@ -76,6 +77,10 @@ + + + + @@ -93,11 +98,9 @@ - - - + @@ -111,41 +114,47 @@ + + + + + source="${javacSource}" target="${javacTarget}"> + + source="${javacSource}" target="${javacTarget}"/> - + source="${javacSource}" target="${javacTarget}"/> + source="${javacSource}" target="${javacTarget}"/> - - + - + @@ -160,7 +169,7 @@ - + @@ -176,7 +185,7 @@ - + @@ -185,19 +194,29 @@ - - - - - - + + + + + + + + + + + + + + + + - + @@ -279,7 +298,7 @@ - + diff --git a/source/de/anomic/plasma/parser/bzip/build.xml b/source/de/anomic/plasma/parser/bzip/build.xml index 30e7f30d8..9ba908ffa 100644 --- a/source/de/anomic/plasma/parser/bzip/build.xml +++ b/source/de/anomic/plasma/parser/bzip/build.xml @@ -11,7 +11,6 @@ - @@ -22,7 +21,6 @@ - + + + + + + + + + + + + + diff --git a/source/de/anomic/plasma/parser/doc/build.xml b/source/de/anomic/plasma/parser/doc/build.xml index 7e53a630e..4dbffa870 100644 --- a/source/de/anomic/plasma/parser/doc/build.xml +++ b/source/de/anomic/plasma/parser/doc/build.xml @@ -11,7 +11,6 @@ - @@ -24,7 +23,6 @@ - + + + + + + + + + + + + diff --git a/source/de/anomic/plasma/parser/gzip/build.xml b/source/de/anomic/plasma/parser/gzip/build.xml index 29d72e740..bea341b0d 100644 --- a/source/de/anomic/plasma/parser/gzip/build.xml +++ b/source/de/anomic/plasma/parser/gzip/build.xml @@ -11,7 +11,6 @@ - @@ -21,7 +20,6 @@ - - + + + + + + + + + + diff --git a/source/de/anomic/plasma/parser/mimeType/build.xml b/source/de/anomic/plasma/parser/mimeType/build.xml index 0dba9b2f5..2de9d55f9 100644 --- a/source/de/anomic/plasma/parser/mimeType/build.xml +++ b/source/de/anomic/plasma/parser/mimeType/build.xml @@ -11,7 +11,6 @@ - @@ -27,7 +26,6 @@ - + + + + + + + + + + + + diff --git a/source/de/anomic/plasma/parser/pdf/build.xml b/source/de/anomic/plasma/parser/pdf/build.xml index 72aeaa6f0..088090c4c 100644 --- a/source/de/anomic/plasma/parser/pdf/build.xml +++ b/source/de/anomic/plasma/parser/pdf/build.xml @@ -11,7 +11,6 @@ - @@ -27,16 +26,11 @@ - - @@ -46,7 +40,19 @@ - + + + + + + + + + + + + + diff --git a/source/de/anomic/plasma/parser/rss/build.xml b/source/de/anomic/plasma/parser/rss/build.xml index b4038b356..d258a5d35 100644 --- a/source/de/anomic/plasma/parser/rss/build.xml +++ b/source/de/anomic/plasma/parser/rss/build.xml @@ -12,7 +12,6 @@ - @@ -29,7 +28,6 @@ - + + + + + + + + + + + diff --git a/source/de/anomic/plasma/parser/rtf/build.xml b/source/de/anomic/plasma/parser/rtf/build.xml index 9671e91b3..507c30e53 100644 --- a/source/de/anomic/plasma/parser/rtf/build.xml +++ b/source/de/anomic/plasma/parser/rtf/build.xml @@ -11,7 +11,6 @@ - @@ -21,7 +20,6 @@ - - + + + + + + + + + + diff --git a/source/de/anomic/plasma/parser/tar/build.xml b/source/de/anomic/plasma/parser/tar/build.xml index 0dadf4501..c5c0b22cd 100644 --- a/source/de/anomic/plasma/parser/tar/build.xml +++ b/source/de/anomic/plasma/parser/tar/build.xml @@ -11,7 +11,6 @@ - @@ -23,7 +22,6 @@ - + + + + + + + + + + + + diff --git a/source/de/anomic/plasma/parser/zip/build.xml b/source/de/anomic/plasma/parser/zip/build.xml index 2d4c98b39..61aad81ac 100644 --- a/source/de/anomic/plasma/parser/zip/build.xml +++ b/source/de/anomic/plasma/parser/zip/build.xml @@ -11,7 +11,6 @@ - @@ -21,7 +20,6 @@ - + + + + + + + + + diff --git a/source/de/anomic/soap/build.xml b/source/de/anomic/soap/build.xml index 476a079af..49de30801 100644 --- a/source/de/anomic/soap/build.xml +++ b/source/de/anomic/soap/build.xml @@ -11,7 +11,6 @@ - @@ -30,7 +29,6 @@ - - + + + + + + + + + + + + + diff --git a/source/de/anomic/yacy/seedUpload/yacySeedUploadScp.xml b/source/de/anomic/yacy/seedUpload/yacySeedUploadScp.xml index b48c63d99..77ca11dcd 100644 --- a/source/de/anomic/yacy/seedUpload/yacySeedUploadScp.xml +++ b/source/de/anomic/yacy/seedUpload/yacySeedUploadScp.xml @@ -11,7 +11,6 @@ - @@ -25,7 +24,6 @@ - + + + + + + + + + + + + + + + + + + + + + +