Update of /cvsroot/alsa/alsa-kernel/scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv25995
Modified Files:
ksync
Log Message:
More and better comments for cvsps-merge
Index: ksync
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/scripts/ksync,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ksync 25 Sep 2003 18:55:43 -0000 1.25
+++ ksync 1 Dec 2003 09:39:29 -0000 1.26
@@ -80,6 +80,7 @@
# Comment mapping
COMMENT_MAP = [
('/drivers/mpu401' ,'MPU401 UART'),
+ ('/include/asound_fm.h' ,'Raw OPL FM'),
('/drivers/opl3' ,'OPL3'),
('/drivers/opl4' ,'OPL4'),
('/drivers/vx' ,'Digigram VX core'),
@@ -98,11 +99,13 @@
('/isa/gus/gusmax.c' ,'GUS MAX driver'),
('/isa/gus/interwave.*' ,'AMD InterWave driver'),
('/isa/gus' ,'GUS drivers'),
+ ('/include/sb.h' ,'SB drivers'),
('/isa/sb/es968.c' ,'ES968 driver'),
('/isa/sb/emu8000.*' ,'EMU8000 driver'),
('/isa/sb/sb16.*' ,'SB16/AWE driver'),
('/isa/sb/sb8.*' ,'SB8 driver'),
('/isa/sb' ,'SB drivers'),
+ ('/isa/opti9xx' ,'Opti9xx drivers'),
('/isa/wavefront' ,'Wavefront drivers'),
('/isa/als100.c' ,'ALS100 driver'),
('/isa/azt2320.c' ,'AZT2320 driver'),
@@ -111,6 +114,7 @@
('/isa/es18xx.c' ,'ES18xx driver'),
('/isa/opl3sa2.c' ,'OPL3SA2 driver'),
('/isa/sgalaxy.c' ,'Sound Galaxy driver'),
+ ('/include/sscape_ioctl.h','Sound Scape driver'),
('/isa/sscape.c' ,'Sound Scape driver'),
('/isa' ,'ERROR'),
('/pci/ac97/ak4531_codec.c','AK4531 codec'),
@@ -126,10 +130,15 @@
('/pci/ice1712' ,'ICE1712 driver'),
('/pci/korg1212' ,'KORG1212 driver'),
('/pci/nm256' ,'NM256 driver'),
+ ('/include/hdsp.h' ,'RME HDSP driver'),
('/pci/rme9652/hdsp.c' ,'RME HDSP driver'),
('/pci/rme9652' ,'RME9652 driver'),
+ ('/include/ymfpci.h' ,'YMFPCI driver'),
+ ('/pci/ymfpci' ,'YMFPCI driver'),
+ ('/include/trident.h' ,'Trident driver'),
('/pci/trident' ,'Trident driver'),
('/pci/vx222' ,'Digigram VX222 driver'),
+ ('/include/cs46xx.h' ,'CS46xx driver'),
('/pci/cs46xx' ,'CS46xx driver'),
('/pci/als4000.c' ,'ALS4000 driver'),
('/pci/azt3328.c' ,'AZT3328 driver'),
@@ -158,10 +167,13 @@
('/ppc' ,'ERROR'),
('/i2c/l3' ,'L3 drivers'),
('/i2c/other' ,'Serial BUS drivers'),
+ ('/include/i2c.h' ,'I2C lib core'),
+ ('/i2c/i2c.c' ,'I2C lib core'),
('/i2c' ,'ERROR'),
('/parisc' ,'ERROR'),
('/sparc' ,'ERROR'),
('/pcmcia/vx' ,'Digigram VX Pocket driver'),
+ ('/pcmcia/Kconfig' ,'PCMCIA Kconfig'),
('/pcmcia' ,'ERROR'),
('/usb/usbaudio.(c|h)' ,'USB generic driver'),
('/usb/usbmixer.(c|h)' ,'USB generic driver'),
@@ -177,18 +189,29 @@
('/core/sgbuf.*' ,'Memalloc module'),
('/core/rtctimer.*' ,'RTC timer driver'),
('/core/timer.*' ,'Timer Midlevel'),
+ ('/include/rawmidi.*' ,'RawMidi Midlevel'),
('/core/rawmidi.*' ,'RawMidi Midlevel'),
+ ('/include/pcm.*' ,'PCM Midlevel'),
('/core/pcm.*' ,'PCM Midlevel'),
+ ('/include/hwdep.*' ,'HWDEP Midlevel'),
('/core/hwdep.*' ,'HWDEP Midlevel'),
+ ('/include/control.*' ,'Control Midlevel'),
('/core/control.*' ,'Control Midlevel'),
('/include/asound.h' ,'ALSA Core'),
+ ('/include/version.h' ,'ALSA Version'),
+ ('/include/initval.h' ,'ALSA Core'),
+ ('/include/minors.h' ,'ALSA Minor Numbers'),
+ ('/include/sndmagic.h' ,'ALSA Core'),
+ ('/include/info.h' ,'ALSA Core'),
('/core/info.*' ,'ALSA Core'),
('/core/control.*' ,'ALSA Core'),
('/core/init.*' ,'ALSA Core'),
('/core/sound.*' ,'ALSA Core'),
+ ('/core/memory.*' ,'ALSA Core'),
('/core' ,'ERROR'),
('/Documentation' ,'Documentation'),
('/include' ,'ERROR'),
+ ('/sound_core.c' ,'OSS device core'),
('/' ,'ERROR')
]
@@ -493,7 +516,7 @@
print_file(fp, lines)
fp.close()
-def do_alsa_kernel_diff(alsa, kernel, from_cvs_time, to_cvs_time):
+def do_alsa_kernel_diff(alsa, kernel, from_cvs_time, to_cvs_time, ofile=sys.stdout):
global FATAL_LSYNC_ERROR
ncvsflag = 0
nbkflag = 0
@@ -558,7 +581,7 @@
FATAL_LSYNC_ERROR = 1
os.remove(tmpfile)
else:
- print_file(sys.stdout, lines)
+ print_file(ofile, lines)
if ncvsflag:
os.remove(afile)
if nbkflag:
@@ -940,15 +963,32 @@
print 'Trying merge patch ' + f
ff = get_cvs_root() + '/scripts/changesets/' + f
fp = open(ff, 'r')
- lines = fp.readlines()
+ diffs = fp.readlines()
fp.close()
+ files = []
+ for line in diffs:
+ if line[0:3] == '+++':
+ xx1 = string.split(line, ' ')
+ xx1 = string.split(xx1[1], '\t')
+ xx2 = string.split(xx1[0], '/')
+ a = 0
+ file = ''
+ for i in xx2:
+ a += 1
+ if a < 2:
+ continue
+ if file != '':
+ file = file + '/' + i
+ else:
+ file = i
+ files.append(file)
log = []
members = []
ok = 0
idx = 0
author = ''
date = ''
- for line in lines:
+ for line in diffs:
if line[:-1] == 'Log:':
ok = 1
elif line[:-1] == 'Members: ':
@@ -969,6 +1009,10 @@
while log[len(log)-1] == '\n':
del log[len(log)-1]
lines = 'ALSA CVS update\n'
+ if author != '':
+ nlines = 'ALSA CVS update' + ' - ' + author + '\n'
+ else:
+ nlines = lines
if date != '':
lines = lines + 'D:' + date + '\n'
changes = cvsps_merge_members(members)
@@ -976,20 +1020,31 @@
lines = lines + 'C:' + i + '\n'
if author != '':
lines = lines + 'A:' + author + '\n'
+ for i in changes:
+ nlines = nlines + i + '\n'
for i in members:
lines = lines + 'F:' + i
for i in log:
lines = lines + 'L:' + i
+ nlines = nlines + i
if t:
print lines
return
- while os.system('bk import -tpatch -C -y"' + lines + '" ' + ff + ' .'):
+ while os.system('bk import -tpatch -C -y"' + nlines + '" ' + ff + ' .'):
print 'BK patch import error, xterm? (any key to continue or Control-C
to abort)'
sys.stdin.readline()
- xterm
- if os.system('bk commit -y"' + lines + '"'):
+ os.system("xterm")
+ if os.system('bk commit -y"' + nlines + '"'):
print 'BK commit failed'
sys.exit(1)
+ for file in files:
+ os.system('bk get %s' % file)
+ if not os.path.exists(file):
+ continue
+ if os.system('bk comment -y"' + lines + '" %s' % file):
+ print 'BK comment change failed'
+ sys.exit(1)
+ #sys.exit(1)
def cvsps_merge():
os.chdir(get_bk_root())
@@ -999,6 +1054,15 @@
file, suff = string.split(f, '.')
if suff == 'patch':
cvsps_merge1(f, t=1)
+ print 'Is this ok? Press Ctrl-C to abort...'
+ sys.stdin.readline()
+ get_cvs_files(get_cvs_root(), '/')
+ update_cvs_file('include/version.h')
+ modify_version_file()
+ do_alsa_kernel_diff('/include/version.h', '/include/sound/version.h', 0, 0)
+ os.remove(get_cvs_root() + '/include/version.h')
+ update_cvs_file('include/version.h')
+ os.chdir(get_bk_root())
print 'Is this ok? Press Ctrl-C to abort...'
sys.stdin.readline()
for f in l:
-------------------------------------------------------
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive? Does it
help you create better code? SHARE THE LOVE, and help us help
YOU! Click Here: http://sourceforge.net/donate/
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
