Welcome to NeoOffice developer notes and announcements
NeoOffice
Developer notes and announcements
 
 

This website is an archive and is no longer active
NeoOffice announcements have moved to the NeoOffice News website


Support
· Forums
· NeoOffice Support
· NeoWiki


Announcements
· Twitter @NeoOffice


Downloads
· Download NeoOffice


  
NeoOffice :: View topic - Finished initial import of 1.1 source
Finished initial import of 1.1 source
 
   NeoOffice Forum Index -> NeoOffice/C Development
View previous topic :: View next topic  
Author Message
OPENSTEP
The One
The One


Joined: May 25, 2003
Posts: 4752
Location: Santa Barbara, CA
PostPosted: Fri Oct 03, 2003 10:36 am    Post subject: Finished initial import of 1.1 source
OK, I believe all of the source is now properly in the Neo CVS repository from OpenOffice.org 1.1. It will not compile!!! If you want something that compiles, get the Pre11Source tag.

Right now only half of the modules properly have the old 1.0 Neo patches incorporated into them, and of course we need to update VCL.

It is recommended that if you're going to be doing 1.1 work that you do a fresh checkout to get all of the new modules.

Later on I'll post a list of modules that still need to be patched and put up a set of patchfiles on the FTP server. Basically, we need to patch each module by hand, check the rejects and conflicts, adn resolve as appropriate. A lot of this is due to the fact the base quartz build support has steadily been creeping into the mainline, so some of the patches are redundant now in 11...but patch still lists them as rejects.

For those who have the ooo101toneo101 patch set, this is the list of modules that have already been patched, so no further work should need to be done on these:

autdoc
automation
basctl
basic
bridges
codemaker
configmgr
connectivity
cosv
cppu
cppuhelper
cpputools
dbaccess
desktop
drafts (no longer exists)
dtrans
extensions
external
forms
freetype
goodies
inet (no longer exists)
javaunohelper
lingucomponent
moz
nas
padmin
registry
res
sc
scptools
sfx2
shell
sj2
so3
sot
toolkit
tools
xmlhelp
xmloff
MathMLDTD
UnoControls
XmlSearch

ed
Back to top
OPENSTEP
The One
The One


Joined: May 25, 2003
Posts: 4752
Location: Santa Barbara, CA
PostPosted: Mon Oct 06, 2003 10:33 pm    Post subject:
OK, update...over the weekend Dan finished applying all of the patches for the rest of the modules except VCL, so I guess the second part of that post is irrelevant Smile

ed
Back to top
OPENSTEP
The One
The One


Joined: May 25, 2003
Posts: 4752
Location: Santa Barbara, CA
PostPosted: Mon Oct 06, 2003 10:37 pm    Post subject:
For those who are curious, here was the rough list of commands used to migrate the repository over. The files "101to11_removed_files.txt" contained a listing of files generated from a find . | xargs -n 1 csh -c 'test ! -e /Volmes/perdition/ooo11rc/$1 && echo $1' and similarly the reverse for the "101to11_new_files.txt".

This is more for historical reference since I'm sure I'll lose it off of my computer at some point in time and may need to do this type of migration again. It also betrays that I love find | xargs.

Code:

cat /Volumes/abyss/ooo101to11changes/101to11/101to11_removed_files.txt | perl -e 'while(<>) { $s=$_; if ( ! m/CVS/ ) { print $s; } }' | xargs -n 1 csh -c 'test -f $1 && echo Removing `echo -n $1 | sed s%./%%` && rm $1 && cvs remove `echo -n $1 | sed s%./%%`'

# spelling errors

find apiwww/commmon -type f | perl -e 'while(<>) { $s=$_; if ( ! m/CVS/ ) { print $s; } }' | xargs -n 1 csh -c 'test -f $1 && echo Removing $1 && rm $1 && cvs remove $1'

# old makefile.rc

find drafts -type f | perl -e 'while(<>) { $s=$_; if ( ! m/CVS/ ) { print $s; } }' | xargs -n 1 csh -c 'test -f $1 && echo Removing $1 && rm $1 && cvs remove $1'

find external/expat -type f | perl -e 'while(<>) { $s=$_; if ( ! m/CVS/ ) { print $s; } }' | xargs -n 1 csh -c 'test -f $1 && echo Removing $1 && rm $1 && cvs remove $1'

find external/freetype -type f | perl -e 'while(<>) { $s=$_; if ( ! m/CVS/ ) { print $s; } }' | xargs -n 1 csh -c 'test -f $1 && echo Removing $1 && rm $1 && cvs remove $1'

find external/jpeg -type f | perl -e 'while(<>) { $s=$_; if ( ! m/CVS/ ) { print $s; } }' | xargs -n 1 csh -c 'test -f $1 && echo Removing $1 && rm $1 && cvs remove $1'

find external/neon -type f | perl -e 'while(<>) { $s=$_; if ( ! m/CVS/ ) { print $s; } }' | xargs -n 1 csh -c 'test -f $1 && echo Removing $1 && rm $1 && cvs remove $1'

find external/npsdk -type f | perl -e 'while(<>) { $s=$_; if ( ! m/CVS/ ) { print $s; } }' | xargs -n 1 csh -c 'test -f $1 && echo Removing $1 && rm $1 && cvs remove $1'

find external/pgp -type f | perl -e 'while(<>) { $s=$_; if ( ! m/CVS/ ) { print $s; } }' | xargs -n 1 csh -c 'test -f $1 && echo Removing $1 && rm $1 && cvs remove $1'

find external/twain -type f | perl -e 'while(<>) { $s=$_; if ( ! m/CVS/ ) { print $s; } }' | xargs -n 1 csh -c 'test -f $1 && echo Removing $1 && rm $1 && cvs remove $1'

find jtools -type f | perl -e 'while(<>) { $s=$_; if ( ! m/CVS/ ) { print $s; } }' | xargs -n 1 csh -c 'test -f $1 && echo Removing $1 && rm $1 && cvs remove $1'

find ldapber -type f | perl -e 'while(<>) { $s=$_; if ( ! m/CVS/ ) { print $s; } }' | xargs -n 1 csh -c 'test -f $1 && echo Removing $1 && rm $1 && cvs remove $1'

find lingu -type f | perl -e 'while(<>) { $s=$_; if ( ! m/CVS/ ) { print $s; } }' | xargs -n 1 csh -c 'test -f $1 && echo Removing $1 && rm $1 && cvs remove $1'

find odk/examples/java/com -type f | perl -e 'while(<>) { $s=$_; if ( ! m/CVS/ ) { print $s; } }' | xargs -n 1 csh -c 'test -f $1 && echo Removing $1 && rm $1 && cvs remove $1'

find odk/examples/java/DocumentConverter -type f | perl -e 'while(<>) { $s=$_; if ( ! m/CVS/ ) { print $s; } }' | xargs -n 1 csh -c 'test -f $1 && echo Removing $1 && rm $1 && cvs remove $1'

find product -type f | perl -e 'while(<>) { $s=$_; if ( ! m/CVS/ ) { print $s; } }' | xargs -n 1 csh -c 'test -f $1 && echo Removing $1 && rm $1 && cvs remove $1'

# makefile.rc and test directory

find inet -type f | perl -e 'while(<>) { $s=$_; if ( ! m/CVS/ ) { print $s; } }' | xargs -n 1 csh -c 'test -f $1 && echo Removing $1 && rm $1 && cvs remove $1'

# not all files in 101

find sysui/unix -type f | perl -e 'while(<>) { $s=$_; if ( ! m/CVS/ ) { print $s; } }' | xargs -n 1 csh -c 'test -f $1 && echo Removing $1 && rm $1 && cvs remove $1'

# final directory removal

cat /Volumes/abyss/ooo101to11changes/101to11/101to11_removed_files.txt | perl -e 'while(<>) { $s=$_; if ( ! m/CVS/ ) { print $s; } }' | xargs -n 1 csh -c 'test -d $1 && echo Removing `echo -n $1 | sed s%./%%` && cvs remove `echo -n $1 | sed s%./%%`'

#
# STARTING 1.1 IMPORT
#

cd /path/to/ooo11rc4

# remove CVS crud pointing to OOo cvs

find . -type d -name CVS | xargs -n 1 csh -c 'echo Removing $1 && rm -rf $1'

# move in CVS stuff from the neo checkout

cd /path/to/intermediate/neo

find . -type d -name CVS | perl -e 'while (<>) { s/\.\/(.*?)$/$1/; print; };' | xargs -n 1 csh -c 'test -d /Volumes/abyss/openoffice-11rc4/`dirname $1` && echo Processing $1... && cp -r $1 /Volumes/abyss/openoffice-11rc4/`dirname $1`'

# move in exising aqua

cd /path/to/ooo11
rm -rf vcl/aqua
cp -r /path/to/neo/vcl/aqua .

#
# begin addition of new files
#

# start by adding the directory structure first

cat /Volumes/abyss/ooo101to11changes/101to11/101to11_new_files.txt | perl -e 'while(<>) { $s=$_; if ( ! m/CVS/ ) { print $s; } }' | xargs -n 1 csh -c 'test -d $1 && echo Adding $1 && cvs add `echo -n $1 | sed s%./%%`'
#add bitmaps

cat /Volumes/abyss/ooo101to11changes/101to11/101to11_new_files.txt | perl -e 'while(<>) { $s=$_; if ( m/\.bmp/ ) { print $s; } }' | xargs -n 1 csh -c 'test -f $1 && echo Adding $1 && cvs add -kb `echo -n $1 | sed s%./%%`'

# now add the text files in

cat /Volumes/abyss/ooo101to11changes/101to11/101to11_new_files.txt | perl -e 'while(<>) { $s=$_; if ( ! m/CVS/ ) { print $s; } }' | xargs -n 1 csh -c 'test -f $1 && echo Adding $1 && cvs add `echo -n $1 | sed s%./%%`'

# copy in the Neo bitmaps

cd /path/to/ooo

find . -name \*.bmp | xargs -n 1 csh -c 'test -e /Volumes/abyss/openoffice-11rc4/`echo -n $1 | sed s%./%%` && echo Copying $1 && cp -f $1 /Volumes/abyss/openoffice-11rc4/`echo -n $1 | sed s%./%%`'

# and commit

cd /path/to/ooo11
ls | cvs commit -m 'Adding 1.1 files, partial Neo patches'


ed
Back to top
Display posts from previous:   
   NeoOffice Forum Index -> NeoOffice/C Development All times are GMT - 7 Hours
Page 1 of 1

 
 You cannot post new topics in this forum
You cannot reply to topics in this forum
You cannot edit your posts in this forum
You cannot delete your posts in this forum
You cannot vote in polls in this forum
You cannot attach files in this forum
You cannot download files in this forum

Powered by phpBB © 2001, 2005 phpBB Group

All logos and trademarks in this site are property of their respective owner. The comments are property of their posters, all the rest © Planamesa Inc.
NeoOffice is a registered trademark of Planamesa Inc. and may not be used without permission.
PHP-Nuke Copyright © 2005 by Francisco Burzi. This is free software, and you may redistribute it under the GPL. PHP-Nuke comes with absolutely no warranty, for details, see the license.