| View previous topic :: View next topic |
| Author |
Message |
jjmckenzie51
The Anomaly
Joined: Apr 01, 2005
Posts: 1055
Location: Southeastern Arizona
|
 Posted: Tue Nov 22, 2005 5:11 pm Post subject: Re: NeoOffice 1.2 Alpha code in new branch |
|
| pluby wrote: | | FYI. Since I retagged a few files last night to fix bug 1157, 1158, and 1162, you will need to "cvs update -d makefile vcl" to get my latest changes. Then, delete the build.neo_vcl_patch file and invoke make to rebuild vcl and the installer. |
Ok. This should be nothing that will stop the release. I did view a lengthy PowerPoint Presentation today and it worked fine. Took a few more clicks to get it to run through, and the sounds worked when they should have.
| pluby wrote: |
Note that testing without these changes probably won't affect anything as the bugs that I fixed were very specific and had a low risk of breaking other code (I get very, very nervous making last minute fixes). |
Better they get fixed before a release rather than after. Keeps the number of patches down.
Update: Tried to use cvs update to get the new makefile and here is the error I received:
| Code: |
cvs server: use `cvs add' to create an entry for makefile
|
Looks like an entry needs to be created on the anoncvs server for the makefile.
James |
|
| Back to top |
|
 |
pluby
The Architect
Joined: Jun 16, 2003
Posts: 11949
|
| Posted: Tue Nov 22, 2005 5:38 pm Post subject: Re: NeoOffice 1.2 Alpha code in new branch |
|
| jjmckenzie51 wrote: | Update: Tried to use cvs update to get the new makefile and here is the error I received:
| Code: |
cvs server: use `cvs add' to create an entry for makefile
|
Looks like an entry needs to be created on the anoncvs server for the makefile. |
You need to be in the neojava directory do a cvs update.
Patrick |
|
| Back to top |
|
|
jjmckenzie51
The Anomaly
Joined: Apr 01, 2005
Posts: 1055
Location: Southeastern Arizona
|
| Posted: Tue Nov 22, 2005 7:36 pm Post subject: Re: NeoOffice 1.2 Alpha code in new branch |
|
| pluby wrote: | | jjmckenzie51 wrote: | Update: Tried to use cvs update to get the new makefile and here is the error I received:
| Code: |
cvs server: use `cvs add' to create an entry for makefile
|
Looks like an entry needs to be created on the anoncvs server for the makefile. |
You need to be in the neojava directory do a cvs update. |
I was. I ran cvs -n update -d and it showed the makefile as well as vcl needing to be updated.
James |
|
| Back to top |
|
|
pluby
The Architect
Joined: Jun 16, 2003
Posts: 11949
|
| Posted: Tue Nov 22, 2005 7:44 pm Post subject: Re: NeoOffice 1.2 Alpha code in new branch |
|
| jjmckenzie51 wrote: | | I was. I ran cvs -n update -d and it showed the makefile as well as vcl needing to be updated. |
And removing the "-n" caused the error? Just run "cvs update -d" without any file or directory names then. Since nothing changed other than makefile and vcl, that will have the same effect.
Patrick |
|
| Back to top |
|
|
jjmckenzie51
The Anomaly
Joined: Apr 01, 2005
Posts: 1055
Location: Southeastern Arizona
|
| Posted: Tue Nov 22, 2005 7:53 pm Post subject: Re: NeoOffice 1.2 Alpha code in new branch |
|
| pluby wrote: | | jjmckenzie51 wrote: | | I was. I ran cvs -n update -d and it showed the makefile as well as vcl needing to be updated. |
And removing the "-n" caused the error? Just run "cvs update -d" without any file or directory names then. Since nothing changed other than makefile and vcl, that will have the same effect. |
Interestingly enough, I started getting all of the build directory files but in neojava (these are the files from OpenOffice.) I don't know why they suddenly appeared. Maybe I have a bad cvs checkout. I don't see the file in the CVS directory that states which branch the checkout was from. I think it is named TAG, but I could be incorrect.
James |
|
| Back to top |
|
|
pluby
The Architect
Joined: Jun 16, 2003
Posts: 11949
|
| Posted: Tue Nov 22, 2005 7:56 pm Post subject: Re: NeoOffice 1.2 Alpha code in new branch |
|
| jjmckenzie51 wrote: | | Interestingly enough, I started getting all of the build directory files but in neojava (these are the files from OpenOffice.) I don't know why they suddenly appeared. Maybe I have a bad cvs checkout. I don't see the file in the CVS directory that states which branch the checkout was from. I think it is named TAG, but I could be incorrect. |
You have some screwy CVSROOT issues. You aren't running an OOo CVS tunnel are you?
Patrick |
|
| Back to top |
|
|
jjmckenzie51
The Anomaly
Joined: Apr 01, 2005
Posts: 1055
Location: Southeastern Arizona
|
| Posted: Tue Nov 22, 2005 8:00 pm Post subject: Re: NeoOffice 1.2 Alpha code in new branch |
|
| pluby wrote: | | jjmckenzie51 wrote: | | Interestingly enough, I started getting all of the build directory files but in neojava (these are the files from OpenOffice.) I don't know why they suddenly appeared. Maybe I have a bad cvs checkout. I don't see the file in the CVS directory that states which branch the checkout was from. I think it is named TAG, but I could be incorrect. |
You have some screwy CVSROOT issues. You aren't running an OOo CVS tunnel are you? |
Whazat? I run a straight CVS. My CVSROOT is set to :pserver:anoncvs@anoncvs.neooffice.org:/cvs
However, I think that the build is pointing, for some reason, to HEAD and not NeoOffiice-1_2_Alpha. If I look at the CVS files off of /neojava, they are showing that I downloaded from HEAD (:/cvs). I think that I will redo the build as it is not valid in my opinion.
James |
|
| Back to top |
|
|
pluby
The Architect
Joined: Jun 16, 2003
Posts: 11949
|
| Posted: Tue Nov 22, 2005 8:04 pm Post subject: |
|
Actually, I split off the NeoOffiice-1_2_Alpha branch from HEAD only a couple of days ago. So, if you "cvs update -r NeoOffiice-1_2_Alpha -d" in the neojava directory and you find that only the makefile and a few vcl files are changed, then my original instructions will work.
Patrick |
|
| Back to top |
|
|
jjmckenzie51
The Anomaly
Joined: Apr 01, 2005
Posts: 1055
Location: Southeastern Arizona
|
| Posted: Tue Nov 22, 2005 8:16 pm Post subject: |
|
| pluby wrote: | | Actually, I split off the NeoOffiice-1_2_Alpha branch from HEAD only a couple of days ago. So, if you "cvs update -r NeoOffiice-1_2_Alpha -d" in the neojava directory and you find that only the makefile and a few vcl files are changed, then my original instructions will work. |
Ouch! I think that I did an update against HEAD after the split. I did manage to get rid of all of the files that cvs found were not current. In any case, I will do another build and see if this one works. If not, it is time for another clean build.
James |
|
| Back to top |
|
|
pluby
The Architect
Joined: Jun 16, 2003
Posts: 11949
|
| Posted: Tue Nov 22, 2005 8:29 pm Post subject: |
|
| jjmckenzie51 wrote: | | Ouch! I think that I did an update against HEAD after the split. I did manage to get rid of all of the files that cvs found were not current. In any case, I will do another build and see if this one works. If not, it is time for another clean build. |
But I haven't commited any changes to HEAD since I did the split. The only difference should be the makefile and vcl changes.
Patrick |
|
| Back to top |
|
|
jjmckenzie51
The Anomaly
Joined: Apr 01, 2005
Posts: 1055
Location: Southeastern Arizona
|
| Posted: Tue Nov 22, 2005 8:38 pm Post subject: |
|
| pluby wrote: | | jjmckenzie51 wrote: | | Ouch! I think that I did an update against HEAD after the split. I did manage to get rid of all of the files that cvs found were not current. In any case, I will do another build and see if this one works. If not, it is time for another clean build. |
But I haven't commited any changes to HEAD since I did the split. The only difference should be the makefile and vcl changes. |
Ok. I think I did something else, like update the last build before the 1.2 Alpha announcement.
And I'm still getting weird directories from the Alpha cvs directories on the anonymous server. I will continue to attempt to checkout the files.
Update: Maybe I'm confused, but should you not do the update from the neojava directory? I think something is definately not right with the anoncvs server. Look at the PM I sent you Patrick. It contains a text file with the contents of what happened when I ran the update.
James |
|
| Back to top |
|
|
pluby
The Architect
Joined: Jun 16, 2003
Posts: 11949
|
| Posted: Tue Nov 22, 2005 10:51 pm Post subject: |
|
| jjmckenzie51 wrote: | Ok. I think I did something else, like update the last build before the 1.2 Alpha announcement.
And I'm still getting weird directories from the Alpha cvs directories on the anonymous server. I will continue to attempt to checkout the files. |
If you are seeing a ".directory_history" update for each directory, ignore them as they were created when Ed moved the cvs server. Those files are for cvs and the Neo build does not use them.
| jjmckenzie51 wrote: | | Update: Maybe I'm confused, but should you not do the update from the neojava directory? I think something is definately not right with the anoncvs server. Look at the PM I sent you Patrick. It contains a text file with the contents of what happened when I ran the update. |
I disagree. One of the build steps in the Neo build is to check out the source from anoncvs.neooffice.org, cd into its neojava directory, and then cvs update. My respin this morning did this without a problem and I just executed the following commands in a new directory without a problem:
| Code: | cvs -d :pserver:anoncvs@anoncvs.neooffice.org:/cvs co -r NeoOffice-1_2_Alpha NeoOfficeJ
cd neojava
cvs update -d |
So, the anoncvs server is working fine.
Patrick |
|
| Back to top |
|
|
jjmckenzie51
The Anomaly
Joined: Apr 01, 2005
Posts: 1055
Location: Southeastern Arizona
|
| Posted: Wed Nov 23, 2005 6:09 am Post subject: |
|
| pluby wrote: | I disagree. One of the build steps in the Neo build is to check out the source from anoncvs.neooffice.org, cd into its neojava directory, and then cvs update. My respin this morning did this without a problem and I just executed the following commands in a new directory without a problem:
| Code: | cvs -d :pserver:anoncvs@anoncvs.neooffice.org:/cvs co -r NeoOffice-1_2_Alpha NeoOfficeJ
cd neojava
cvs update -d |
So, the anoncvs server is working fine.
|
Time for me to redo the cvs checkout and build process. I think I know what I did incorrectly and that is easily fixed.
James |
|
| Back to top |
|
|
|
