You are viewing a plain text version of this content. The canonical link for it is here.
Posted to solr-commits@lucene.apache.org by yo...@apache.org on 2006/12/16 22:08:43 UTC
svn commit: r487885 - /incubator/solr/trunk/build.xml
Author: yonik
Date: Sat Dec 16 13:08:42 2006
New Revision: 487885
URL: http://svn.apache.org/viewvc?view=rev&rev=487885
Log:
crlf text files in zip archive
Modified:
incubator/solr/trunk/build.xml
Modified: incubator/solr/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/solr/trunk/build.xml?view=diff&rev=487885&r1=487884&r2=487885
==============================================================================
--- incubator/solr/trunk/build.xml (original)
+++ incubator/solr/trunk/build.xml Sat Dec 16 13:08:42 2006
@@ -407,19 +407,7 @@
<copy todir="${build.docs}">
<fileset dir="site" />
</copy>
- <zip destfile="${dist}/${fullnamever}.zip">
- <zipfileset dir="."
- prefix="${fullnamever}"
- includes="LICENSE.txt NOTICE.txt *.txt *.xml lib/** src/** example/**"
- excludes="**/data/ **/logs/ **/classes/" />
- <zipfileset dir="."
- prefix="${fullnamever}"
- includes="dist/*.jar dist/*.war" />
- <zipfileset dir="${build.docs}"
- prefix="${fullnamever}/docs/" />
- </zip>
- <solr-checksum file="${dist}/${fullnamever}.zip"/>
-
+
<tar destfile="${dist}/${fullnamever}.tgz" compression="gzip">
<tarfileset dir="."
prefix="${fullnamever}"
@@ -432,6 +420,20 @@
prefix="${fullnamever}/docs/" />
</tar>
<solr-checksum file="${dist}/${fullnamever}.tgz"/>
+
+ <gunzip src="${dist}/${fullnamever}.tgz" dest="${dest}/${fullnamever}.tar"/>
+ <untar src="${dest}/${fullnamever}.tar" dest="${dest}"/>
+
+ <fixcrlf srcdir="${dest}/${fullnamever}"
+ eol="crlf"
+ includes="**/*.txt **/*.xml **/*.java **/*.html **/*.csv **/*.css **/*.properties **/*.jsp **/*.xsl **/*.py **/*.rb **/*.js **/*.json **/*.pl"
+ />
+
+ <zip destfile="${dist}/${fullnamever}.zip">
+ <zipfileset dir="${dest}/${fullnamever}"
+ prefix="${fullnamever}" />
+ </zip>
+ <solr-checksum file="${dist}/${fullnamever}.zip"/>
</target>
Re: svn commit: r487885 - /incubator/solr/trunk/build.xml
Posted by Yonik Seeley <yo...@apache.org>.
On 12/16/06, Chris Hostetter <ho...@fucit.org> wrote:
> : Not the most efficient, but it works.
>
> when you changed the svn:line-ending props for the scripts, i realized
> that "fixing" the files we put in the zip works as long as the release is
> built by someone on a unix env ... if someone prepares a release on a
> windows box, then the source in the tgz will need fixed.
>
> but as long as we build our first release on a unix machine we should be
> fine ... we can bullet proof the release mechanism later :)
Yeah, I wanted to mess with the fewest things possible to get this out.
BTW, I do build on a windows box, but with cygwin, using the cygwin
version of svn which grabs eol "native" as LF only. vim/gvim also
detect the line endings of text files you are editing and keeps them
the same for lines you change.
-Yonik
Re: svn commit: r487885 - /incubator/solr/trunk/build.xml
Posted by Chris Hostetter <ho...@fucit.org>.
: Not the most efficient, but it works.
when you changed the svn:line-ending props for the scripts, i realized
that "fixing" the files we put in the zip works as long as the release is
built by someone on a unix env ... if someone prepares a release on a
windows box, then the source in the tgz will need fixed.
but as long as we build our first release on a unix machine we should be
fine ... we can bullet proof the release mechanism later :)
-Hoss
Re: svn commit: r487885 - /incubator/solr/trunk/build.xml
Posted by Yonik Seeley <yo...@apache.org>.
Not the most efficient, but it works.
I think we are pretty much ready to go now!
-Yonik
On 12/16/06, yonik@apache.org <yo...@apache.org> wrote:
> Log:
> crlf text files in zip archive
>
> Modified:
> incubator/solr/trunk/build.xml
>
> Modified: incubator/solr/trunk/build.xml
> URL: http://svn.apache.org/viewvc/incubator/solr/trunk/build.xml?view=diff&rev=487885&r1=487884&r2=487885
> ==============================================================================
> --- incubator/solr/trunk/build.xml (original)
> +++ incubator/solr/trunk/build.xml Sat Dec 16 13:08:42 2006
> @@ -407,19 +407,7 @@
> <copy todir="${build.docs}">
> <fileset dir="site" />
> </copy>
> - <zip destfile="${dist}/${fullnamever}.zip">
> - <zipfileset dir="."
> - prefix="${fullnamever}"
> - includes="LICENSE.txt NOTICE.txt *.txt *.xml lib/** src/** example/**"
> - excludes="**/data/ **/logs/ **/classes/" />
> - <zipfileset dir="."
> - prefix="${fullnamever}"
> - includes="dist/*.jar dist/*.war" />
> - <zipfileset dir="${build.docs}"
> - prefix="${fullnamever}/docs/" />
> - </zip>
> - <solr-checksum file="${dist}/${fullnamever}.zip"/>
> -
> +
> <tar destfile="${dist}/${fullnamever}.tgz" compression="gzip">
> <tarfileset dir="."
> prefix="${fullnamever}"
> @@ -432,6 +420,20 @@
> prefix="${fullnamever}/docs/" />
> </tar>
> <solr-checksum file="${dist}/${fullnamever}.tgz"/>
> +
> + <gunzip src="${dist}/${fullnamever}.tgz" dest="${dest}/${fullnamever}.tar"/>
> + <untar src="${dest}/${fullnamever}.tar" dest="${dest}"/>
> +
> + <fixcrlf srcdir="${dest}/${fullnamever}"
> + eol="crlf"
> + includes="**/*.txt **/*.xml **/*.java **/*.html **/*.csv **/*.css **/*.properties **/*.jsp **/*.xsl **/*.py **/*.rb **/*.js **/*.json **/*.pl"
> + />
> +
> + <zip destfile="${dist}/${fullnamever}.zip">
> + <zipfileset dir="${dest}/${fullnamever}"
> + prefix="${fullnamever}" />
> + </zip>
> + <solr-checksum file="${dist}/${fullnamever}.zip"/>
>
> </target>