[Jpackage-commits] dist/common cvs-import.sh,1.2,1.3

jpackage jpackage at ryu.zarb.org
Mon May 26 21:19:55 CEST 2008


Update of /home/projects/jpackage/cvs/dist/common
In directory ryu.zarb.org:/tmp/cvs-serv14435

Modified Files:
	cvs-import.sh 
Log Message:
Fix botched merge

Index: cvs-import.sh
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/common/cvs-import.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** cvs-import.sh	26 May 2008 18:55:26 -0000	1.2
--- cvs-import.sh	26 May 2008 19:19:53 -0000	1.3
***************
*** 158,185 ****
  CreateBranchMakefile() {
      cat >Makefile <<EOF
- 
- # Figure out if we need to import a new module
- if [ -z "$(grep ""^$NAME[[:space:]]"" modules 2>/dev/null)" ] ; then
-     # This is a new module, it does not exist
-     cvs -Q update && \
- 	echo "Creating new module: $NAME" && \
- 	echo -e "${NAME}-tests-dir -d ${NAME}-tests tests/${NAME}" >> modules && \
- 	echo -e "$NAME\t\t$TOPLEVEL/$NAME &common &${NAME}-tests-dir" >> modules && \
- 	cvs -Q commit -m "Added new module: $NAME" >/dev/null && \
- 	{
- 	    # Create a new module
- 	    pushd $TMPDIR >/dev/null
- 	    $CVS -Q checkout -l ${TOPLEVEL_TESTS}
- 	    pushd ${TOPLEVEL_TESTS}
- 	    mkdir -p $NAME && cvs -Q add $NAME
- 	    popd
- 	    $CVS -Q checkout -l $TOPLEVEL
- 	    cd $TOPLEVEL >/dev/null
- 	    mkdir -p $NAME/devel && \
- 		cvs -Q add $NAME $NAME/devel
- 	    # handle the top level stuff
- 	    cd $NAME
- 	    touch import.log
- 	    cat >Makefile <<EOF
  # Top level Makefile for module $NAME
  all : CVS/Root common-update
--- 158,161 ----
***************
*** 227,230 ****
--- 203,230 ----
  }
  
+ # Figure out if we need to import a new module
+ if [ -z "$(grep ""^$NAME[[:space:]]"" modules 2>/dev/null)" ] ; then
+     # This is a new module, it does not exist
+     cvs -Q update && \
+ 	echo "Creating new module: $NAME" && \
+ 	echo -e "${NAME}-tests-dir -d ${NAME}-tests tests/${NAME}" >> modules && \
+ 	echo -e "$NAME\t\t$TOPLEVEL/$NAME &common &${NAME}-tests-dir" >> modules && \
+ 	cvs -Q commit -m "Added new module: $NAME" >/dev/null && \
+ 	{
+ 	    # Create a new module
+ 	    pushd $TMPDIR >/dev/null
+ 	    $CVS -Q checkout -l ${TOPLEVEL_TESTS}
+ 	    pushd ${TOPLEVEL_TESTS}
+ 	    mkdir -p $NAME && cvs -Q add $NAME
+ 	    popd
+ 	    $CVS -Q checkout -l $TOPLEVEL
+ 	    cd $TOPLEVEL >/dev/null
+ 	    mkdir -p $NAME/devel && \
+ 		cvs -Q add $NAME $NAME/devel
+ 	    # handle the top level stuff
+ 	    cd $NAME
+ 	    touch import.log
+ 	    cat >Makefile <<EOF
+ 
  # Check out the existing module
  cd $TMPDIR




More information about the JPackage-commits mailing list