[Jpackage-commits] dist/common cvs-import.sh,1.6,1.7

jpackage jpackage at ryu.zarb.org
Mon May 26 22:18:55 CEST 2008


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

Modified Files:
	cvs-import.sh 
Log Message:
Get rid of test dir

Index: cvs-import.sh
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/common/cvs-import.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -C 2 -d -r1.6 -r1.7
*** cvs-import.sh	26 May 2008 20:09:33 -0000	1.6
--- cvs-import.sh	26 May 2008 20:18:53 -0000	1.7
***************
*** 165,194 ****
  }
  
- CreateBranchMakefile() {
-     cat >Makefile <<EOF
- # Makefile for source rpm: $NAME
- # \$Id\$
- NAME := $NAME
- SPECFILE = \$(firstword \$(wildcard *.spec))
- 
- define find-makefile-common
- for d in common ../common ../../common ; do if [ -f \$\$d/Makefile.common ] ; then if [ -f \$\$d/CVS/Root -a -w \$\$/Makefile.common ] ; then cd \$\$d ; cvs -Q update ; fi ; echo "\$\$d/Makefile.common" ; break ; fi ; done
- endef
- 
- MAKEFILE_COMMON := \$(shell \$(find-makefile-common))
- 
- ifeq (\$(MAKEFILE_COMMON),)
- # attept a checkout
- define checkout-makefile-common
- test -f CVS/Root && { cvs -Q -d \$\$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
- endef
- 
- MAKEFILE_COMMON := \$(shell \$(checkout-makefile-common))
- endif
- 
- include \$(MAKEFILE_COMMON)
- EOF
- }
- 
  # First, make sure we track this package accordingly
  cd $MODDIR
--- 165,168 ----
***************
*** 217,222 ****
      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 && \
  	{
--- 191,195 ----
      cvs -Q update && \
  	echo "Creating new module: $NAME" && \
! 	echo -e "$NAME\t\t$TOPLEVEL/$NAME &common" >> modules && \
  	cvs -Q commit -m "Added new module: $NAME" >/dev/null && \
  	{
***************
*** 275,278 ****
--- 248,277 ----
  fi
  
+ CreateBranchMakefile() {
+     cat >Makefile <<EOF
+ # Makefile for source rpm: $NAME
+ # \$Id\$
+ NAME := $NAME
+ SPECFILE = \$(firstword \$(wildcard *.spec))
+ 
+ define find-makefile-common
+ for d in common ../common ../../common ; do if [ -f \$\$d/Makefile.common ] ; then if [ -f \$\$d/CVS/Root -a -w \$\$/Makefile.common ] ; then cd \$\$d ; cvs -Q update ; fi ; echo "\$\$d/Makefile.common" ; break ; fi ; done
+ endef
+ 
+ MAKEFILE_COMMON := \$(shell \$(find-makefile-common))
+ 
+ ifeq (\$(MAKEFILE_COMMON),)
+ # attept a checkout
+ define checkout-makefile-common
+ test -f CVS/Root && { cvs -Q -d \$\$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
+ endef
+ 
+ MAKEFILE_COMMON := \$(shell \$(checkout-makefile-common))
+ endif
+ 
+ include \$(MAKEFILE_COMMON)
+ EOF
+ }
+ 
  # Check out the existing module
  cd $TMPDIR




More information about the JPackage-commits mailing list