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

jpackage jpackage at ryu.zarb.org
Mon May 26 21:32:18 CEST 2008


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

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.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** cvs-import.sh	26 May 2008 19:19:53 -0000	1.3
--- cvs-import.sh	26 May 2008 19:32:16 -0000	1.4
***************
*** 158,182 ****
  CreateBranchMakefile() {
      cat >Makefile <<EOF
- # Top level Makefile for module $NAME
- all : CVS/Root common-update
- 	@cvs update
- 
- common-update : common
- 	@cd common && cvs update
- 
- common : CVS/Root
- 	@cvs checkout common
- 
- CVS/Root :
- 	@echo "ERROR: This does not look like a CVS checkout" && exit 1
- 
- clean :
- 	@find . -type f -name *~ -exec rm -fv {} \;
- EOF
- 	    cvs -Q add Makefile import.log
- 	    # handle the module build
- 	    cd devel
- 	    touch sources .cvsignore
- 	    cat >Makefile <<EOF
  # Makefile for source rpm: $NAME
  # \$Id\$
--- 158,161 ----
***************
*** 226,229 ****
--- 205,247 ----
  	    touch import.log
  	    cat >Makefile <<EOF
+ # Top level Makefile for module $NAME
+ all : CVS/Root common-update
+ 	@cvs update
+ 
+ common-update : common
+ 	@cd common && cvs update
+ 
+ common : CVS/Root
+ 	@cvs checkout common
+ 
+ CVS/Root :
+ 	@echo "ERROR: This does not look like a CVS checkout" && exit 1
+ 
+ clean :
+ 	@find . -type f -name *~ -exec rm -fv {} \;
+ EOF
+ 	    cvs -Q add Makefile import.log
+ 	    # handle the module build
+ 	    cd devel
+ 	    touch sources .cvsignore
+ 	    cat >Makefile <<EOF
+ # Makefile for source rpm: $NAME
+ # \$Id\$
+ NAME := $NAME
+ SPECFILE = \$(firstword \$(wildcard *.spec))
+ 
+ include ../common/Makefile.common
+ EOF
+ 	    cvs -Q add Makefile sources .cvsignore
+             # commit all the added stuff
+ 	    cd .. && \
+ 		cvs -Q commit -m "Setup of module $NAME" >/dev/null && \
+ 		cd devel && cvs -Q tag setup-new-module >/dev/null
+ 	    popd >/dev/null
+ 	    rm -rf $TMPDIR/$TOPLEVEL
+ 	} && echo "Entry for module '$NAME' created."
+ else
+     echo "Module '$NAME' already exists..."
+ fi
  
  # Check out the existing module




More information about the JPackage-commits mailing list