job000077

norman_morse (Norman Morse)
Norman Morse created this job , modified by Paul Allen
Closed
CVS conversion fails to parse Makefile,v

>> ... Unable to process file: /Users/nmorse/cvs/btc/science/engines/AggDaily/Makefile,v

Throws an "Invocation Target Exception"

In RcsReader.java, parseRcsDeltas():

while (line != null) {
    // block might be delta e.g. 1.1
    if (line.contains(".")) {
        rcsObject.add(RcsSchema.ID, line);
        line = getLine();
        break;
    }

The exception is thrown in rcsObject.add.   

The content of 'line' is:
    $(CLEAN) $(INCL_DEPS) $(OBJS) $(MYLIBS) $(MYLIBS:.so=.a); $(MAKE) -C bin $@@

The Makefile,v which causes this issue is pasted after this line:

-----------------------------------------------------------------
head     1.1;
branch   1.1.1;
access   ;
symbols  EspritV1:1.1.1.1 SAP:1.1.1;
locks    ; strict;
comment  @# @;


1.1
date     2009.12.02.20.07.44;  author I810074;  state Exp;
branches 1.1.1.1;
next     ;
commitid        3d6d4b16c8ec4567;

1.1.1.1
date     2009.12.02.20.07.44;  author I810074;  state Exp;
branches ;
next     ;
commitid        3d6d4b16c8ec4567;


desc
@@



1.1
log
@Initial revision
@
text
@include ../../research.mk

MYLIBS = $(LIB_PATH)/libaggDaily.a
MYEXES = aggDaily

all: $(MYLIBS) $(MYEXES)

include $(TOPLEVEL)/incl_cpp_deps.mk

$(MYLIBS):      $(OBJS)
#       $(MKSO) $(OBJS) -o $(MYLIBS)
        $(MKLIB) $(MYLIBS) $(OBJS)

$(MYEXES): $(MYLIBS)
        $(MAKE) -C bin $@@

install:
        $(MAKE) -C bin $@@

clean :
        $(CLEAN) $(INCL_DEPS) $(OBJS) $(MYLIBS) $(MYLIBS:.so=.a); $(MAKE) -C bin $@@
@


1.1.1.1
log
@CR: 502
Initial check-in
@
text
@@
10774CVS: Updated end of RCS content block detection.

An @ character at the end of the line followed by a blank line could fool the converter into exiting the block early.

Detection now uses original line with expanded @@ and counts odd/even.

Added test case 048
Status
Closed
Project
perforce-software-p4convert
Severity
A
Reported By
Norman Morse
Reported Date
Modified By
Paul Allen
Modified Date