Anonymous avatar Anonymous committed a2e49b3 Merge

Merge branch 'master' of https://bitbucket.org/petsc/petsc

Comments (0)

Files changed (2)

bin/maint/createpatch

   echo "Error: dir $petscrepo does not exist"
   exit
 fi
-if [ ! -d $petscrepo/config/BuildSystem ]; then
-  echo "Error: dir $petscrepo/config/BuildSystem does not exist"
-  exit
-fi
 cd $petscrepo
 
 if [ ! -f include/petscversion.h ]; then
 fi
 
 # check if all files are checked in
-a=`hg status -m | wc -l`
-b=`hg status -m -R config/BuildSystem | wc -l`
-if [ "${a}" != "0" -o "${b}" != "0" ]; then
-  echo "*** Mercurial edited files exist. Cannot proceed! ****"
-  hg status -m
-  hg status -m -R config/BuildSystem
+a=`git status --untracked-files=no --short | wc -l`
+if [ "${a}" != "0" ]; then
+  echo "*** Git edited files exist. Cannot proceed! ****"
+  git status --untracked-files=no --short
   exit
 fi
 
+#git_branch=`git symbolic-ref HEAD 2>/dev/null | cut -d"/" -f 3`
+#if  [ "${git_branch}" != "maint" ]; then
+#  echo "Error: Wrong branch '${git_branch}'! Patchlevel can only be updated for 'maint' branch"
+#  exit
+#fi
+
 version_release=`grep '^#define PETSC_VERSION_RELEASE ' include/petscversion.h |tr -s ' ' | cut -d ' ' -f 3`
 version_major=`grep '^#define PETSC_VERSION_MAJOR ' include/petscversion.h |tr -s ' ' | cut -d ' ' -f 3`
 version_minor=`grep '^#define PETSC_VERSION_MINOR ' include/petscversion.h |tr -s ' ' | cut -d ' ' -f 3`
 version_patch=`grep '^#define PETSC_VERSION_PATCH ' include/petscversion.h |tr -s ' ' | cut -d ' ' -f 3`
 
+
 if  [ ${version_release} = 0 ]; then
-  echo "Error: cannot update patchlevel for petsc-dev."
+  echo "Error: PETSC_VERSION_RELEASE is unset. Not using a 'maint' branch?"
   exit
 fi
 
 /bin/rm -f src/docs/website/download/index.html.bak
 
 # now create a changeset
-hg commit -m"Increase patchlevel to ${newver}" include/petscversion.h src/docs/website/download/index.html
+git commit -m"Increase patchlevel to ${newver}" include/petscversion.h src/docs/website/download/index.html
 echo #########################################################
 echo # Created patch for the following change                #
 echo #########################################################
-hg export tip
+git show HEAD

bin/maint/rebuildtar

 export LC=C
 export LC_ALL=C
 
-RELEASE=3.3
-PETSC_DIR=/home/balay/hg-repo/petsc-release-${RELEASE}
-
-#automatically crankup the patchlevel
-# ${PETSC_DIR}/bin/maint/createpatch
-# /home/balay/spetsc/bin/maint/createpatch
+PETSC_DIR=/home/balay/git-repo/petsc-maint.clone
 
 #create the tarfile
-${PETSC_DIR}/bin/maint/builddist ${PETSC_DIR} maint
+maintdir=`dirname $0`
+${maintdir}/builddist ${PETSC_DIR} maint
 
 #Now copy the generated tarfiles over to the website
 PATCH_VERSION=`grep '^#define PETSC_VERSION_PATCH ' ${PETSC_DIR}/include/petscversion.h |tr -s ' ' | cut -d ' ' -f 3`
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.