forums.ps2dev.org Forum Index forums.ps2dev.org
Homebrew PS2, PSP & PS3 Development Discussions
 
 FAQFAQ   SearchSearch   MemberlistMemberlist   UsergroupsUsergroups   RegisterRegister 
 ProfileProfile   Log in to check your private messagesLog in to check your private messages   Log inLog in 

[PS2] Fix usage of svn keywords

 
Post new topic   Reply to topic    forums.ps2dev.org Forum Index -> Patch Submissions
View previous topic :: View next topic  
Author Message
misfire



Joined: 06 Sep 2004
Posts: 120
Location: Germany

PostPosted: Tue May 18, 2010 12:06 am    Post subject: [PS2] Fix usage of svn keywords Reply with quote

This patch fixes the wrong usage of the svn Id keyword in PS2SDK.

The affected files are:

Code:
iop/tcpip/tcpip131/include/ps2ip.h
iop/tcpip/tcpip131/src/ps2ip_internal.h
iop/tcpip/tcpip131/src/irx_imports.h
iop/tcpip/tcpip131/src/ps2ipexp.s
iop/tcpip/tcpip131/src/sys_arch.c
iop/tcpip/tcpip131/src/ps2ip.c
iop/tcpip/tcpip131/Makefile
iop/tcpip/lwip-1.3.1/src/netif/ppp/ipcp.h
iop/tcpip/lwip-1.3.1/src/netif/ppp/chpms.h
iop/tcpip/lwip-1.3.1/src/netif/ppp/chap.h
iop/tcpip/lwip-1.3.1/src/netif/ppp/lcp.h
iop/tcpip/lwip-1.3.1/src/netif/ppp/vj.h
iop/tcpip/lwip-1.3.1/src/netif/ppp/magic.h
iop/tcpip/lwip-1.3.1/src/netif/ppp/fsm.h
iop/usb/camera/src/irx_imports.h
iop/usb/camera/Makefile
iop/usb/usbd/src/irx_imports.h
iop/usb/usbd/src/driver.c

ps2sdk-fix-keywords.patch.gz (invalid, see below)


Last edited by misfire on Tue May 18, 2010 5:56 pm; edited 1 time in total
Back to top
View user's profile Send private message
jimparis



Joined: 10 Jun 2005
Posts: 1179
Location: Boston

PostPosted: Tue May 18, 2010 8:46 am    Post subject: Reply with quote

That patch doesn't do the right thing (applying it would just edit the files, not change svn keywords). Instead I did
Code:
while read file; do svn propset svn:keywords "Author Date Id Revision" $file ; done

and pasted in the list of files that you provided. I think this is what you intended, and "svn diff" generates the same patch, but please check it.
Back to top
View user's profile Send private message
misfire



Joined: 06 Sep 2004
Posts: 120
Location: Germany

PostPosted: Tue May 18, 2010 5:53 pm    Post subject: Reply with quote

You're right. My patch certainly does not set the svn file properties. Sorry.

So after setting the keyword on a file, svn automatically replaces Id fields that are already expanded?

I found some more files needing the keywords:

Code:
$ grep -r '\$Id\$' . | grep -v svn
./iop/usb/usbd/src/interface.c:# $Id$
./iop/usb/usbd/src/hcd.h:# $Id$
./iop/usb/usbd/src/mem.c:# $Id$
./iop/usb/usbd/src/usbdpriv.h:# $Id$
./iop/usb/usbd/src/usbio.c:# $Id$
./iop/usb/usbd/src/usbio.h:# $Id$
./iop/usb/usbd/src/driver.h:# $Id$
./iop/usb/usbd/src/usbd.c:# $Id$
./iop/usb/usbd/src/mem.h:# $Id$
./iop/usb/usbd/src/hub.c:# $Id$
Back to top
View user's profile Send private message
jimparis



Joined: 10 Jun 2005
Posts: 1179
Location: Boston

PostPosted: Wed May 19, 2010 3:39 am    Post subject: Reply with quote

misfire wrote:
So after setting the keyword on a file, svn automatically replaces Id fields that are already expanded?
Yep
Quote:
I found some more files needing the keywords:
OK, I added the svn:keywords property to those too.
Back to top
View user's profile Send private message
Display posts from previous:   
Post new topic   Reply to topic    forums.ps2dev.org Forum Index -> Patch Submissions All times are GMT + 10 Hours
Page 1 of 1

 
Jump to:  
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


Powered by phpBB © 2001, 2005 phpBB Group