Patch was Re: [jsword-devel] nightly build
Joe Walker
joe at eireneh.com
Sun May 9 14:40:30 MST 2004
On the nightly build front, which of the downloads is actually useful?
I would guess that nightly source download is not useful, and neither is
nightly doc d/l.
If you want up-to-date then CVS is a better solution for source, and the
web a better solution for nightly docs.
Nightly binaries sounds more useful because not everyone will want, or
be able to use jnlp.
The release situation is different because I can understand people
wanting more stable sources to be free of constraints like CVS or the
need to be on line (javadoc on the web)
So I propose a slightly updated version that merges gets rid of all doc
and sources nightlies. Given that do we still need to split tools and
binaries?
I'll take OSIS in another mail!
Joe.
DM Smith wrote:
> I am attaching a patch to jsword-web/build.xml that does the following.
> Take a look at it and modify it as you see fit.
>
> Since I am using a different mail server and program, I am merely
> attaching the file. Let me know if it is corrupted.
>
> DM Smith wrote:
>
>> I was looking at the nightly build and I have a few suggestions:
>> 1) Since the 3rd party jars don't change frequently, zip them to a
>> tools-${version}-bin.zip. This can be built daily until we figure out
>> how to do it only when we upgrade a version of a tool. By doing this a
>> user can download the tools.zip occasionally.
>>
>> Or let people get them from the official location.
>>
>> 2) Also publish an osis-${version}-bin.zip and
>> osis-${version}-src.zip. Again, this does not change much but they are
>> huge. Joe, you have noted that it may be best to migrate from jaxb, so
>> this may become a moot point.
>>
>> 3) In jsword-${version}-bin.zip only include the following jars
>> common.jar, jsword.jar, bibledesktop.jar and maybe jsword-web.jar.
>>
>> 4) In the jsword-${version}-src.zip only include the source for
>> common, jsword, bibledesktop and maybe jsword-web. This includes the
>> contents of their resource directory. I could go either way on whether
>> it should contain test source. The idea behind this is that if a
>> person wants more than this they can get it via CVS.
>>
>> And of course build the corresponding tar.gz versions.
>>
>> Currently the last set of zips had the following sizes:
>> jsword-${version}-bin.zip 13.17M (Note that almost every jar appears 2x)
>> jsword-${version}-src.zip 14.34M (Note that this contains the jars too)
>>
>> With the changes above:
>> jsword-${version}-bin.zip 0.92M (does not include jsword-web.jar)
>> jsword-${version}-src.zip 1.03M (does not include test code)
>> osis-${version}-bin.zip 1.13M
>> osis-${version}-src.zip 0.82M
>> tools-${version}-bin.zip 2.15M
>>
>> These numbers are based on a quick hack (may be missing a few files,
>> such as *.sh and *.jnlp), but should give the right idea as to the size.
>>
>> Note that if we fix the redundancy but don't break it out then
>> jsword-${version}-bin.jar should have been 4.20M.
>> _______________________________________________
>> jsword-devel mailing list
>> jsword-devel at crosswire.org
>> http://www.crosswire.org/mailman/listinfo/jsword-devel
>>
>
> ------------------------------------------------------------------------
>
> Index: build.xml
> ===================================================================
> RCS file: /cvs/jsword/jsword-web/build.xml,v
> retrieving revision 1.7
> diff -u -r1.7 build.xml
> --- build.xml 6 May 2004 16:42:08 -0000 1.7
> +++ build.xml 7 May 2004 21:47:38 -0000
> @@ -45,6 +45,23 @@
> <patternset refid="pattern.alljava"/>
> </fileset>
>
> + <patternset id="pattern.zipsrc" >
> + <include name="*/java/**"/>
> + <include name="*/resource/**"/>
> + <exclude name="**/*test*/**"/>
> + <exclude name="*/java/**/*html"/>
> + <exclude name="jsword-support/**"/>
> + </patternset>
> + <patternset id="pattern.zipbin" >
> + <include name="**/bibledesktop.jar"/>
> + <include name="**/jsword.jar"/>
> + <include name="**/common.jar"/>
> + <include name="**/*.sh"/>
> + <include name="**/*.bat"/>
> + <include name="**/*.jnlp"/>
> + </patternset>
> +
> +
> <!--=======================================================================-->
> <target name="files" depends="build" description="Build an unpacked war file">
> <mkdir dir="${target.web}"/>
> @@ -111,23 +128,75 @@
> <!-- source packages -->
> <mkdir dir="${directory}"/>
> <zip zipfile="${directory}/jsword-${version}-src.zip">
> - <zipfileset prefix="jsword" dir="../jsword" excludes="target/**"/>
> - <zipfileset prefix="common" dir="../common" excludes="target/**"/>
> - <zipfileset prefix="bibledesktop" dir="../bibledesktop" excludes="target/**"/>
> - </zip>
> - <tar tarfile="${directory}/jsword-${version}-src.tar.gz" compression="gzip">
> - <tarfileset prefix="jsword" dir="../jsword" excludes="target/**"/>
> - <tarfileset prefix="common" dir="../common" excludes="target/**"/>
> - <tarfileset prefix="bibledesktop" dir="../bibledesktop" excludes="target/**"/>
> + <fileset dir="..">
> + <patternset refid="pattern.zipsrc"/>
> + </fileset>
> + </zip>
> + <tar tarfile="${directory}/jsword-${version}-src.tar.gz" compression="gzip">
> + <tarfileset dir="..">
> + <patternset refid="pattern.zipsrc"/>
> + </tarfileset>
> + </tar>
> + <zip zipfile="${directory}/osis-${version}-src.zip">
> + <fileset dir=".." includes="*/target/osis/src/**"/>
> + </zip>
> + <tar tarfile="${directory}/osis-${version}-src.tar.gz" compression="gzip">
> + <tarfileset dir=".." includes="*/target/osis/src/**"/>
> </tar>
> - <!-- binary packages -->
> + <!-- This is one big zip
> + <zip zipfile="${directory}/jsword-${version}-src.zip">
> + <fileset dir="..">
> + <patternset refid="pattern.zipsrc"/>
> + </fileset>
> + <fileset dir=".." includes="*/target/osis/src/**"/>
> + </zip>
> + <tar tarfile="${directory}/jsword-${version}-bin.tar.gz" compression="gzip">
> + <tarfileset dir="..">
> + <patternset refid="pattern.zipsrc"/>
> + </tarfileset>
> + <tarfileset dir=".." includes="*/target/osis/src/**"/>
> + </tar>
> + -->
> + <!-- binary packages -->
> + <!-- This is one big zip
> <zip zipfile="${directory}/jsword-${version}-bin.zip">
> <zipfileset prefix="jsword-${version}" dir="../bibledesktop/target/ant/installed"/>
> </zip>
> <tar tarfile="${directory}/jsword-${version}-bin.tar.gz" compression="gzip">
> <tarfileset prefix="jsword-${version}" dir="../bibledesktop/target/ant/installed"/>
> - </tar>
> - <!-- documentation packages -->
> + </tar>
> + -->
> + <zip zipfile="${directory}/jsword-${version}-bin.zip">
> + <zipfileset prefix="jsword-${version}" dir="../bibledesktop/target/ant/installed">
> + <patternset refid="pattern.zipbin"/>
> + </zipfileset>
> + </zip>
> + <tar tarfile="${directory}/jsword-${version}-bin.tar.gz" compression="gzip">
> + <tarfileset prefix="jsword-${version}" dir="../bibledesktop/target/ant/installed">
> + <patternset refid="pattern.zipbin"/>
> + </tarfileset>
> + </tar>
> + <zip zipfile="${directory}/osis-${version}-bin.zip">
> + <zipfileset dir="../bibledesktop/target/ant/installed">
> + <include name="**/jsword-osis.jar"/>
> + </zipfileset>
> + </zip>
> + <tar tarfile="${directory}/osis-${version}-bin.tar.gz" compression="gzip">
> + <tarfileset dir="../bibledesktop/target/ant/installed">
> + <include name="**/jsword-osis.jar"/>
> + </tarfileset>
> + </tar>
> + <zip zipfile="${directory}/tools-${version}-bin.zip">
> + <zipfileset dir="../bibledesktop/target/ant/installed">
> + <patternset refid="external.runtime.jars"/>
> + </zipfileset>
> + </zip>
> + <tar tarfile="${directory}/tools-${version}-bin.tar.gz" compression="gzip">
> + <tarfileset dir="../bibledesktop/target/ant/installed">
> + <patternset refid="external.runtime.jars"/>
> + </tarfileset>
> + </tar>
> + <!-- documentation packages -->
> <zip zipfile="${directory}/jsword-${version}-doc.zip">
> <zipfileset prefix="jsword-${version}" dir="${target.web}/api"/>
> </zip>
>
>
> ------------------------------------------------------------------------
>
> _______________________________________________
> jsword-devel mailing list
> jsword-devel at crosswire.org
> http://www.crosswire.org/mailman/listinfo/jsword-devel
More information about the jsword-devel
mailing list