Permalink
Browse files

Release Engineering: Update master to 2.3.0-DEVELOPMENT

  • Loading branch information...
1 parent ed1bfcb commit d8e83bc2070b1cff9f40cf0fffb4e256d350064a Matthew Dillon committed Feb 5, 2009
Showing with 33 additions and 57 deletions.
  1. +25 −24 Makefile
  2. +2 −32 sys/conf/newvers.sh
  3. +3 −0 sys/conf/subvers-DEVELOPMENT_2_3
  4. +3 −1 sys/sys/param.h
View
49 Makefile
@@ -190,32 +190,33 @@ upgrade: upgrade_etc
upgrade_etc:
@cd ${.CURDIR}/etc; make -m ${.CURDIR}/share/mk upgrade_etc
+## Remove obsolete CVS commands, we are using GIT now.
+##
+## Convenient targets for use by the CVS repository meister.
+##
+#update_preview_tag: iamoncrater
+# cvs -d /cvs rtag -a -F DragonFly_Preview src
#
-# Convenient targets for use by the CVS repository meister.
+#update_release1_2_slip_tag: iamoncrater
+# cvs -d /cvs rtag -a -F -rDragonFly_RELEASE_1_2 DragonFly_RELEASE_1_2_Slip src
#
-update_preview_tag: iamoncrater
- cvs -d /cvs rtag -a -F DragonFly_Preview src
-
-update_release1_2_slip_tag: iamoncrater
- cvs -d /cvs rtag -a -F -rDragonFly_RELEASE_1_2 DragonFly_RELEASE_1_2_Slip src
-
-update_release1_4_slip_tag: iamoncrater
- cvs -d /cvs rtag -a -F -rDragonFly_RELEASE_1_4 DragonFly_RELEASE_1_4_Slip src
-
-update_release1_6_slip_tag: iamoncrater
- cvs -d /cvs rtag -a -F -rDragonFly_RELEASE_1_6 DragonFly_RELEASE_1_6_Slip src
-
-update_release1_8_slip_tag: iamoncrater
- cvs -d /cvs rtag -a -F -rDragonFly_RELEASE_1_8 DragonFly_RELEASE_1_8_Slip src
-
-update_release1_10_slip_tag: iamoncrater
- cvs -d /cvs rtag -a -F -rDragonFly_RELEASE_1_10 DragonFly_RELEASE_1_10_Slip src
-
-update_release1_12_slip_tag: iamoncrater
- cvs -d /cvs rtag -a -F -rDragonFly_RELEASE_1_12 DragonFly_RELEASE_1_12_Slip src
-
-update_release2_0_slip_tag: iamoncrater
- cvs -d /cvs rtag -a -F -rDragonFly_RELEASE_2_0 DragonFly_RELEASE_2_0_Slip src
+#update_release1_4_slip_tag: iamoncrater
+# cvs -d /cvs rtag -a -F -rDragonFly_RELEASE_1_4 DragonFly_RELEASE_1_4_Slip src
+#
+#update_release1_6_slip_tag: iamoncrater
+# cvs -d /cvs rtag -a -F -rDragonFly_RELEASE_1_6 DragonFly_RELEASE_1_6_Slip src
+#
+#update_release1_8_slip_tag: iamoncrater
+# cvs -d /cvs rtag -a -F -rDragonFly_RELEASE_1_8 DragonFly_RELEASE_1_8_Slip src
+#
+#update_release1_10_slip_tag: iamoncrater
+# cvs -d /cvs rtag -a -F -rDragonFly_RELEASE_1_10 DragonFly_RELEASE_1_10_Slip src
+#
+#update_release1_12_slip_tag: iamoncrater
+# cvs -d /cvs rtag -a -F -rDragonFly_RELEASE_1_12 DragonFly_RELEASE_1_12_Slip src
+#
+#update_release2_0_slip_tag: iamoncrater
+# cvs -d /cvs rtag -a -F -rDragonFly_RELEASE_2_0 DragonFly_RELEASE_2_0_Slip src
iamoncrater:
@ [ "`hostname`" = "crater.dragonflybsd.org" ] || \
View
34 sys/conf/newvers.sh
@@ -35,39 +35,9 @@
# $FreeBSD: src/sys/conf/newvers.sh,v 1.44.2.30 2003/04/04 07:02:46 murray Exp $
# $DragonFly: src/sys/conf/newvers.sh,v 1.23 2008/07/14 04:01:44 dillon Exp $
-tag="\$Name: $"
-
-# Extract the tag name, if any.
-#
-BRANCH=$(echo $tag | awk '{ print $2; }')
-
-# Remove any DragonFly_ prefix or _Slip suffix. Release branches are
-# typically extracted using a slip tag rather than the branch tag in order
-# to guarentee that the subversion file is synchronized with the files being
-# extracted.
+# Set the branch
#
-BRANCH=${BRANCH#DragonFly_}
-BRANCH=${BRANCH%_Slip}
-
-# This case occurs if we have checked out without a tag (i.e. HEAD), either
-# implicitly or explicitly.
-#
-if [ "X${BRANCH}" = "X$" ]; then
- BRANCH="DEVELOPMENT_2_1"
-fi
-if [ "X${BRANCH}" = "XHEAD" ]; then
- BRANCH="DEVELOPMENT_2_1"
-fi
-if [ "X${BRANCH}" = "XPreview" ]; then
- BRANCH="PREVIEW_2_1"
- SHORTTAG="DEVELOPMENT_2_1"
-fi
-
-# This case occurs if the $Name: $ field has not been expanded.
-#
-if [ "X${BRANCH}" = "X" ]; then
- BRANCH="UNKNOWN"
-fi
+BRANCH="DEVELOPMENT_2_3"
TYPE="DragonFly"
View
3 sys/conf/subvers-DEVELOPMENT_2_3
@@ -0,0 +1,3 @@
+# Subversion control for DragonFly 2.3.X-DEVELOPMENT
+#
+0 -
View
4 sys/sys/param.h
@@ -62,9 +62,11 @@
* 200000 - 2.0 branch
* 200100 - base development version after 2.0 branch
* 200101 - lchflags syscall
+ * 200200 - 2.2 branch
+ * 200201 - base development version after 2.2 branch
*/
#undef __DragonFly_version
-#define __DragonFly_version 200101 /* Master, propagated to newvers */
+#define __DragonFly_version 200201 /* Master, propagated to newvers */
#ifdef __FreeBSD__
/*

0 comments on commit d8e83bc

Please sign in to comment.