You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@openoffice.apache.org by Patricia Shanahan <pa...@acm.org> on 2016/09/30 12:53:11 UTC
Which source files in release?
I am trying to select the files that should go in the zip and tar files
for the source release for 4.1.3.
I did a clean checkout of the 4.1.3 branch, and then deleted the .svn
directories that I know do not belong in the source release.
The 4.1.2 release includes the following dot files:
./aoo-4.1.2/main/extras/unx/source/kde/applnk/.directory
./aoo-4.1.2/main/vos/docu/.html
The 4.1.3 tree contains those, and the following additional dot files:
./AOO413/main/.hgignore
./AOO413/main/.hgtags
./AOO413/test/testassistant/.classpath
./AOO413/test/testassistant/.project
./AOO413/test/testassistant/.settings
./AOO413/test/testassistant.feature/.project
./AOO413/test/testcommon/.classpath
./AOO413/test/testcommon/.project
./AOO413/test/testgui/.classpath
./AOO413/test/testgui/.project
./AOO413/test/testgui/.settings
./AOO413/test/testuno/.classpath_linux
./AOO413/test/testuno/.classpath_win
./AOO413/test/testuno/.externalToolBuilders
./AOO413/test/testuno/.project
The .project and .classpath files may be to do with making it easier to
set up and run the tests under Eclipse.
Opinions?
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@openoffice.apache.org
For additional commands, e-mail: dev-help@openoffice.apache.org
RE: Which source files in release?
Posted by "Dennis E. Hamilton" <de...@acm.org>.
I lost the thread somewhere, and I want to comment on a remark about who signs packages in the release candidates.
I think there is a "requirement", or probably just an
assumption, that the source package be signed by the Release Manager, so
if you want to check the package and then replace the signature with
yours you can just delete the current .asc files and upload the new
ones. If not, I doubt anyone will complain.
I think the signature provided by the committer who constructs any uploaded packages should be retained. It is a matter of signing as the work of the committer who did it. I think the source package should definitely be signed by the RM, because the RM usually provides that much, but it doesn't have to be.
After that, any committer whose public certificate is in the release folder KEYS file, including the RM, can verify the .asc signature(s) and also *add* their own once satisfied by whatever criteria they mean to signify.
Adding signatures is a matter of creating another --detach-sign --armor signature and splicing all of it, including the BEGIN and END markers, onto the end of the existing one. It should still verify and also report both (or more) signatures. Just ensure that the markers are on lines by themselves.
I just added my signature, locally, to the current
Apache_OpenOffice_4.1.3_Win_x86_install_en-US.exe.asc
file. No problem. The attachment, if it comes through, shows what that looks like.
- Dennis
> -----Original Message-----
> From: Patricia Shanahan [mailto:pats@acm.org]
> Sent: Saturday, October 1, 2016 09:35
> To: dev@openoffice.apache.org
> Subject: Re: Which source files in release?
>
>
>
> On 10/1/2016 9:24 AM, Andrea Pescetti wrote:
> > Patricia Shanahan wrote:
> >> The idea is to start from a clean check-out, not configured, move the
> >> LICENSE, NOTICE, and README files, and delete what is not needed.
> "what
> >> is not needed" should be a relatively short list, including the .svn
> >> files and also ext_sources.
> >
> > While I would have gone for Bash too, the ant script in the end does
> the
> > same and it is quite easy to maintain.
> >
> > The trunk version already contains several improvements with respect
> to
> > the one we have in AOO413.
> >
> > I've tried to build a source package for 4.1.3 by applying the two
> > changes I applied to trunk earlier today and that are documented at
> > https://bz.apache.org/ooo/show_bug.cgi?id=126605
> > https://bz.apache.org/ooo/show_bug.cgi?id=127148
> > to a normal 4.1.3 build tree.
> >
> > The results are at
> > http://home.apache.org/~pescetti/openoffice-4.1.3-r1761381-src/
> > and comparison with an SVN export gives the expected results.
> >
> > Patricia: feel free to reuse these packages (you may want to remove my
> > signature and add yours in case, after you check them); I didn't
> upload
> > them to SVN to avoid confusion, but I can of course do so if you are
> > going to reuse these. Otherwise no problem at all if you prefer to
> > package/supply the sources differently.
>
> For 4.1.3, I am in "Don't rock the boat" mode. Anything that gets us to
> release sooner is good. It looks as though you already have the packages
> we need, so please go ahead and SVN them.
>
> Thanks,
>
> Patricia
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@openoffice.apache.org
> For additional commands, e-mail: dev-help@openoffice.apache.org
Re: Which source files in release?
Posted by Andrea Pescetti <pe...@apache.org>.
Patricia Shanahan wrote:
> For 4.1.3, I am in "Don't rock the boat" mode. Anything that gets us to
> release sooner is good. It looks as though you already have the packages
> we need, so please go ahead and SVN them.
OK. Committed to
https://dist.apache.org/repos/dist/dev/openoffice/4.1.3/source/
The directory will probably have to be renamed to 4.1.3-rc1 before we
start the vote.
I confirm that the upload performance in SVN (I got ~180 KBytes/s on
average) is not the best, much slower than home.apache.org even if twice
as faster than Ariel's tests.
Patricia: I think there is a "requirement", or probably just an
assumption, that the source package be signed by the Release Manager, so
if you want to check the package and then replace the signature with
yours you can just delete the current .asc files and upload the new
ones. If not, I doubt anyone will complain.
Regards,
Andrea.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@openoffice.apache.org
For additional commands, e-mail: dev-help@openoffice.apache.org
Re: Which source files in release?
Posted by Patricia Shanahan <pa...@acm.org>.
On 10/1/2016 9:24 AM, Andrea Pescetti wrote:
> Patricia Shanahan wrote:
>> The idea is to start from a clean check-out, not configured, move the
>> LICENSE, NOTICE, and README files, and delete what is not needed. "what
>> is not needed" should be a relatively short list, including the .svn
>> files and also ext_sources.
>
> While I would have gone for Bash too, the ant script in the end does the
> same and it is quite easy to maintain.
>
> The trunk version already contains several improvements with respect to
> the one we have in AOO413.
>
> I've tried to build a source package for 4.1.3 by applying the two
> changes I applied to trunk earlier today and that are documented at
> https://bz.apache.org/ooo/show_bug.cgi?id=126605
> https://bz.apache.org/ooo/show_bug.cgi?id=127148
> to a normal 4.1.3 build tree.
>
> The results are at
> http://home.apache.org/~pescetti/openoffice-4.1.3-r1761381-src/
> and comparison with an SVN export gives the expected results.
>
> Patricia: feel free to reuse these packages (you may want to remove my
> signature and add yours in case, after you check them); I didn't upload
> them to SVN to avoid confusion, but I can of course do so if you are
> going to reuse these. Otherwise no problem at all if you prefer to
> package/supply the sources differently.
For 4.1.3, I am in "Don't rock the boat" mode. Anything that gets us to
release sooner is good. It looks as though you already have the packages
we need, so please go ahead and SVN them.
Thanks,
Patricia
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@openoffice.apache.org
For additional commands, e-mail: dev-help@openoffice.apache.org
Re: Which source files in release?
Posted by Ariel Constenla-Haile <ar...@apache.org>.
On Sat, Oct 01, 2016 at 06:24:50PM +0200, Andrea Pescetti wrote:
> Patricia Shanahan wrote:
> >The idea is to start from a clean check-out, not configured, move the
> >LICENSE, NOTICE, and README files, and delete what is not needed. "what
> >is not needed" should be a relatively short list, including the .svn
> >files and also ext_sources.
>
> While I would have gone for Bash too,
A shell script may not work, the programs needed to create the packages
may vary in different OS, or even in different versions of the same OS;
I guess that ant tasks provide some sort of system abstraction layer.
Regards
--
Ariel Constenla-Haile
Re: Which source files in release?
Posted by Andrea Pescetti <pe...@apache.org>.
Patricia Shanahan wrote:
> The idea is to start from a clean check-out, not configured, move the
> LICENSE, NOTICE, and README files, and delete what is not needed. "what
> is not needed" should be a relatively short list, including the .svn
> files and also ext_sources.
While I would have gone for Bash too, the ant script in the end does the
same and it is quite easy to maintain.
The trunk version already contains several improvements with respect to
the one we have in AOO413.
I've tried to build a source package for 4.1.3 by applying the two
changes I applied to trunk earlier today and that are documented at
https://bz.apache.org/ooo/show_bug.cgi?id=126605
https://bz.apache.org/ooo/show_bug.cgi?id=127148
to a normal 4.1.3 build tree.
The results are at
http://home.apache.org/~pescetti/openoffice-4.1.3-r1761381-src/
and comparison with an SVN export gives the expected results.
Patricia: feel free to reuse these packages (you may want to remove my
signature and add yours in case, after you check them); I didn't upload
them to SVN to avoid confusion, but I can of course do so if you are
going to reuse these. Otherwise no problem at all if you prefer to
package/supply the sources differently.
Regards,
Andrea.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@openoffice.apache.org
For additional commands, e-mail: dev-help@openoffice.apache.org
Re: Which source files in release?
Posted by Patricia Shanahan <pa...@acm.org>.
On 10/1/2016 4:38 AM, Ariel Constenla-Haile wrote:
> On Sat, Oct 01, 2016 at 04:34:48PM +1000, Gavin McDonald wrote:
>> Instead of removing the .svn dirs/files with a script, use the built in 'svn export' which exports the
>> checkout without all the .svn dirs/files.
>>
>> http://svnbook.red-bean.com/en/1.7/svn.ref.svn.c.export.html
>
> I guess that they didn't use svn export before because that will export the
> external sources in ext_sources/, I'm not sure if there is a way to tell svn
> export to ignore tracked folders.
My initial intuition on this, subject to being overridden by my own or
others actual experience, is in favor of a simple shell script with no
dependencies.
The idea is to start from a clean check-out, not configured, move the
LICENSE, NOTICE, and README files, and delete what is not needed. "what
is not needed" should be a relatively short list, including the .svn
files and also ext_sources.
The find-rm line that deletes the .svn files will work without errors,
but do nothing, if there are no .svn directories.
The result will be the content to be archived to make the source files.
I feel this will be more robust than the current approach, which couples
the source release process to the effects of configure on each target
system.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@openoffice.apache.org
For additional commands, e-mail: dev-help@openoffice.apache.org
Re: Which source files in release?
Posted by Ariel Constenla-Haile <ar...@apache.org>.
On Sat, Oct 01, 2016 at 04:34:48PM +1000, Gavin McDonald wrote:
> Instead of removing the .svn dirs/files with a script, use the built in 'svn export' which exports the
> checkout without all the .svn dirs/files.
>
> http://svnbook.red-bean.com/en/1.7/svn.ref.svn.c.export.html
I guess that they didn't use svn export before because that will export the
external sources in ext_sources/, I'm not sure if there is a way to tell svn
export to ignore tracked folders.
Regards
--
Ariel Constenla-Haile
La Plata, Argentina
RE: Which source files in release?
Posted by Gavin McDonald <ga...@16degrees.com.au>.
Instead of removing the .svn dirs/files with a script, use the built in 'svn export' which exports the
checkout without all the .svn dirs/files.
http://svnbook.red-bean.com/en/1.7/svn.ref.svn.c.export.html
Gav...
> -----Original Message-----
> From: Patricia Shanahan [mailto:pats@acm.org]
> Sent: Friday, September 30, 2016 11:28 PM
> To: dev@openoffice.apache.org
> Subject: Re: Which source files in release?
>
> I just saw the bug report
> https://bz.apache.org/ooo/show_bug.cgi?id=126605, "Make sure the source
> package does not contain extra files"
>
> Since our build instructions and processes are based on the result of an svn
> checkout, basing the source package on one seemed obvious to me. The
> only change that seems to me to be absolutely required is removing the .svn
> directories, and that is a one-liner:
>
> find . -type d -name '.svn' -exec rm -fr '{}' ';'
>
> Removing other dot files is a refinement, but I think even without that I am
> closer to what should be packaged than working from the result of a
> configure.
>
> On 9/30/2016 5:53 AM, Patricia Shanahan wrote:
> > I am trying to select the files that should go in the zip and tar
> > files for the source release for 4.1.3.
> >
> > I did a clean checkout of the 4.1.3 branch, and then deleted the .svn
> > directories that I know do not belong in the source release.
> >
> > The 4.1.2 release includes the following dot files:
> >
> > ./aoo-4.1.2/main/extras/unx/source/kde/applnk/.directory
> > ./aoo-4.1.2/main/vos/docu/.html
> >
> > The 4.1.3 tree contains those, and the following additional dot files:
> >
> > ./AOO413/main/.hgignore
> > ./AOO413/main/.hgtags
> > ./AOO413/test/testassistant/.classpath
> > ./AOO413/test/testassistant/.project
> > ./AOO413/test/testassistant/.settings
> > ./AOO413/test/testassistant.feature/.project
> > ./AOO413/test/testcommon/.classpath
> > ./AOO413/test/testcommon/.project
> > ./AOO413/test/testgui/.classpath
> > ./AOO413/test/testgui/.project
> > ./AOO413/test/testgui/.settings
> > ./AOO413/test/testuno/.classpath_linux
> > ./AOO413/test/testuno/.classpath_win
> > ./AOO413/test/testuno/.externalToolBuilders
> > ./AOO413/test/testuno/.project
> >
> > The .project and .classpath files may be to do with making it easier
> > to set up and run the tests under Eclipse.
> >
> > Opinions?
> >
> > ---------------------------------------------------------------------
> > To unsubscribe, e-mail: dev-unsubscribe@openoffice.apache.org
> > For additional commands, e-mail: dev-help@openoffice.apache.org
> >
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@openoffice.apache.org
> For additional commands, e-mail: dev-help@openoffice.apache.org
>
>
>
> -----
> No virus found in this message.
> Checked by AVG - www.avg.com
> Version: 2016.0.7797 / Virus Database: 4664/13120 - Release Date: 09/30/16
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@openoffice.apache.org
For additional commands, e-mail: dev-help@openoffice.apache.org
Re: Which source files in release?
Posted by Patricia Shanahan <pa...@acm.org>.
On 9/30/2016 9:59 AM, Andrea Pescetti wrote:
> Ariel Constenla-Haile wrote:
>> there is no need to reinvent the wheel, I guess ;)
>
> Indeed. I've bumped the bug report just to give visibility to the
> scripts we already had.
>
>> you need to fix the ant build script first, see the bug report
>
> Fixing the script results in a commit. We agree that this is just a tool
> and that we can fix the script on trunk and build the AOO413 source with
> the fixed version without committing it to AOO413, right? Otherwise we
> would (theoretically) have to rebuild releases for a fix in a tool to
> get the same results.
OK, I won't rock the 4.1.3 boat.
When we come to look at this in the trunk and/or 4.1.4, some thought
should be given to the weirdness of running a checkout through a
procedure that is designed to tailor it to a particular system, and
trying to generate the system independent source files from that.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@openoffice.apache.org
For additional commands, e-mail: dev-help@openoffice.apache.org
Re: Which source files in release?
Posted by Andrea Pescetti <pe...@apache.org>.
Ariel Constenla-Haile wrote:
> there is no need to reinvent the wheel, I guess ;)
Indeed. I've bumped the bug report just to give visibility to the
scripts we already had.
> you need to fix the ant build script first, see the bug report
Fixing the script results in a commit. We agree that this is just a tool
and that we can fix the script on trunk and build the AOO413 source with
the fixed version without committing it to AOO413, right? Otherwise we
would (theoretically) have to rebuild releases for a fix in a tool to
get the same results.
Regards,
Andrea.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@openoffice.apache.org
For additional commands, e-mail: dev-help@openoffice.apache.org
Re: Which source files in release?
Posted by Ariel Constenla-Haile <ar...@apache.org>.
On Fri, Sep 30, 2016 at 07:19:25AM -0700, Patricia Shanahan wrote:
>
> > On Sep 30, 2016, at 07:00, Ariel Constenla-Haile <ar...@apache.org> wrote:
> >
> >> On Fri, Sep 30, 2016 at 06:28:01AM -0700, Patricia Shanahan wrote:
> >> I just saw the bug report https://bz.apache.org/ooo/show_bug.cgi?id=126605,
> >> "Make sure the source package does not contain extra files"
> >>
> >> Since our build instructions and processes are based on the result of an svn
> >> checkout, basing the source package on one seemed obvious to me. The only
> >> change that seems to me to be absolutely required is removing the .svn
> >> directories, and that is a one-liner:
> >
> > You better do this inside the build environment:
> >
>
> Why?
Because there is no need to reinvent the wheel, I guess ;)
(you need to fix the ant build script first, see the bug report)
Regards
--
Ariel Constenla-Haile
Re: Which source files in release?
Posted by Patricia Shanahan <pa...@acm.org>.
> On Sep 30, 2016, at 07:00, Ariel Constenla-Haile <ar...@apache.org> wrote:
>
>> On Fri, Sep 30, 2016 at 06:28:01AM -0700, Patricia Shanahan wrote:
>> I just saw the bug report https://bz.apache.org/ooo/show_bug.cgi?id=126605,
>> "Make sure the source package does not contain extra files"
>>
>> Since our build instructions and processes are based on the result of an svn
>> checkout, basing the source package on one seemed obvious to me. The only
>> change that seems to me to be absolutely required is removing the .svn
>> directories, and that is a one-liner:
>
> You better do this inside the build environment:
>
Why?
> cd main
> source <build env. shell script>
> cd instsetoo_native/util/
> dmake aoo_srcrelease
>
> This calls ant with solenv/bin/srcrelease.xml, which has the bug that
> was written for macOS, thus it only excludes MacOSXX86Env.* for example,
> see
> https://svn.apache.org/viewvc/openoffice/branches/AOO413/main/solenv/bin/srcrelease.xml?revision=1760467&view=markup#l32
>
> ant ignores those .svn folders, see
> https://ant.apache.org/manual/dirtasks.html#defaultexcludes
>
>
> Regards
> --
> Ariel Constenla-Haile
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@openoffice.apache.org
For additional commands, e-mail: dev-help@openoffice.apache.org
Re: Which source files in release?
Posted by Ariel Constenla-Haile <ar...@apache.org>.
On Fri, Sep 30, 2016 at 06:28:01AM -0700, Patricia Shanahan wrote:
> I just saw the bug report https://bz.apache.org/ooo/show_bug.cgi?id=126605,
> "Make sure the source package does not contain extra files"
>
> Since our build instructions and processes are based on the result of an svn
> checkout, basing the source package on one seemed obvious to me. The only
> change that seems to me to be absolutely required is removing the .svn
> directories, and that is a one-liner:
You better do this inside the build environment:
cd main
source <build env. shell script>
cd instsetoo_native/util/
dmake aoo_srcrelease
This calls ant with solenv/bin/srcrelease.xml, which has the bug that
was written for macOS, thus it only excludes MacOSXX86Env.* for example,
see
https://svn.apache.org/viewvc/openoffice/branches/AOO413/main/solenv/bin/srcrelease.xml?revision=1760467&view=markup#l32
ant ignores those .svn folders, see
https://ant.apache.org/manual/dirtasks.html#defaultexcludes
Regards
--
Ariel Constenla-Haile
Re: Which source files in release?
Posted by Patricia Shanahan <pa...@acm.org>.
I just saw the bug report
https://bz.apache.org/ooo/show_bug.cgi?id=126605, "Make sure the source
package does not contain extra files"
Since our build instructions and processes are based on the result of an
svn checkout, basing the source package on one seemed obvious to me. The
only change that seems to me to be absolutely required is removing the
.svn directories, and that is a one-liner:
find . -type d -name '.svn' -exec rm -fr '{}' ';'
Removing other dot files is a refinement, but I think even without that
I am closer to what should be packaged than working from the result of a
configure.
On 9/30/2016 5:53 AM, Patricia Shanahan wrote:
> I am trying to select the files that should go in the zip and tar files
> for the source release for 4.1.3.
>
> I did a clean checkout of the 4.1.3 branch, and then deleted the .svn
> directories that I know do not belong in the source release.
>
> The 4.1.2 release includes the following dot files:
>
> ./aoo-4.1.2/main/extras/unx/source/kde/applnk/.directory
> ./aoo-4.1.2/main/vos/docu/.html
>
> The 4.1.3 tree contains those, and the following additional dot files:
>
> ./AOO413/main/.hgignore
> ./AOO413/main/.hgtags
> ./AOO413/test/testassistant/.classpath
> ./AOO413/test/testassistant/.project
> ./AOO413/test/testassistant/.settings
> ./AOO413/test/testassistant.feature/.project
> ./AOO413/test/testcommon/.classpath
> ./AOO413/test/testcommon/.project
> ./AOO413/test/testgui/.classpath
> ./AOO413/test/testgui/.project
> ./AOO413/test/testgui/.settings
> ./AOO413/test/testuno/.classpath_linux
> ./AOO413/test/testuno/.classpath_win
> ./AOO413/test/testuno/.externalToolBuilders
> ./AOO413/test/testuno/.project
>
> The .project and .classpath files may be to do with making it easier to
> set up and run the tests under Eclipse.
>
> Opinions?
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@openoffice.apache.org
> For additional commands, e-mail: dev-help@openoffice.apache.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@openoffice.apache.org
For additional commands, e-mail: dev-help@openoffice.apache.org