[GEM-cvs] SF.net SVN: pd-gem:[3424] trunk/Gem/src
Brought to you by:
zmoelnig
From: <zmo...@us...> - 2010-07-02 19:33:38
|
Revision: 3424 http://pd-gem.svn.sourceforge.net/pd-gem/?rev=3424&view=rev Author: zmoelnig Date: 2010-07-02 19:33:32 +0000 (Fri, 02 Jul 2010) Log Message: ----------- renamed gemversion.sh to pkgversion.sh Modified Paths: -------------- trunk/Gem/src/Makefile trunk/Gem/src/version.h.in Added Paths: ----------- trunk/Gem/src/pkgversion.sh trunk/Gem/src/pkgversion.txt Removed Paths: ------------- trunk/Gem/src/gemversion.sh Modified: trunk/Gem/src/Makefile =================================================================== --- trunk/Gem/src/Makefile 2010-07-02 19:16:04 UTC (rev 3423) +++ trunk/Gem/src/Makefile 2010-07-02 19:33:32 UTC (rev 3424) @@ -25,7 +25,7 @@ Gem: Gem.$(EXT) version.h: version.h.in FORCE - ${SHELL} ./gemversion.sh version.h + ${SHELL} ./pkgversion.sh version.h strip: Gem.$(EXT) Deleted: trunk/Gem/src/gemversion.sh =================================================================== --- trunk/Gem/src/gemversion.sh 2010-07-02 19:16:04 UTC (rev 3423) +++ trunk/Gem/src/gemversion.sh 2010-07-02 19:33:32 UTC (rev 3424) @@ -1,89 +0,0 @@ -#!/bin/sh - -VERSIONFILE=gem.version -if test -e "${VERSIONFILE}"; then - . "${VERSIONFILE}" -fi - -if test "x${GEM_VERSION_MAJOR}" = "x"; then - GEM_VERSION_MAJOR="0" -fi -if test "x${GEM_VERSION_MINOR}" = "x"; then - GEM_VERSION_MINOR="93" -fi - -subversion_version () { - if [ -d .svn ]; then - GEM_VERSION_BUGFIX="SVN" - if which svnversion 2>&1 > /dev/null; then - GEM_VERSION_CODENAME="rev$(svnversion .)" - else - GEM_VERSION_CODENAME="unknown" - fi - else - return 1 - fi -} - -git_version () { - local version - if version=$(git describe --always --abbrev=0 2>/dev/null); then - GEM_VERSION_BUGFIX="git" - GEM_VERSION_CODENAME="${version}" - else - return 1 - fi -} - - -fullversion() { - if test "x${GEM_VERSION_BUGFIX}" = "x"; then - echo "${GEM_VERSION_MAJOR}.${GEM_VERSION_MINOR} ${GEM_VERSION_CODENAME}" - else - echo "${GEM_VERSION_MAJOR}.${GEM_VERSION_MINOR}.${GEM_VERSION_BUGFIX} ${GEM_VERSION_CODENAME}" - fi -} - -substitute_file() { - local INFILE - local OUTFILE - OUTFILE=$1 - INFILE=${OUTFILE}.in - - if [ -e "${INFILE}" ]; then - sed -e "s|@GEM_VERSION_MAJOR@|${GEM_VERSION_MAJOR}|g" \ - -e "s|@GEM_VERSION_MINOR@|${GEM_VERSION_MINOR}|g" \ - -e "s|@GEM_VERSION_BUGFIX@|${GEM_VERSION_BUGFIX}|g" \ - -e "s|@GEM_VERSION_CODENAME@|${GEM_VERSION_CODENAME}|g" \ - ${INFILE} > ${OUTFILE} - else - echo "${INFILE} not found!" 1>&2 - fi -} - -if test "x${GEM_VERSION_BUGFIX}" = "x"; then -## try to autodetect the current version - git_version || subversion_version -fi - -if test "x$1" = "x"; then - fullversion -else - case $1 in - --major) - echo ${GEM_VERSION_MAJOR} - ;; - --minor) - echo ${GEM_VERSION_MINOR} - ;; - --bugfix) - echo ${GEM_VERSION_BUGFIX} - ;; - --codename) - echo ${GEM_VERSION_CODENAME} - ;; - *) - substitute_file $1 - ;; - esac -fi Copied: trunk/Gem/src/pkgversion.sh (from rev 3422, trunk/Gem/src/gemversion.sh) =================================================================== --- trunk/Gem/src/pkgversion.sh (rev 0) +++ trunk/Gem/src/pkgversion.sh 2010-07-02 19:33:32 UTC (rev 3424) @@ -0,0 +1,98 @@ +#!/bin/sh + +VERSIONFILE=pkgversion.txt +if test -e "${VERSIONFILE}"; then + . ./${VERSIONFILE} +fi + +if test "x${PKGVERSION_MAJOR}" = "x"; then + PKGVERSION_MAJOR="0" +fi +if test "x${PKGVERSION_MINOR}" = "x"; then + PKGVERSION_MINOR="0" +fi + +pkgversion_cvs () { + if [ -d CVS ]; then + PKGVERSION_BUGFIX="CVS" + PKGVERSION_CODENAME= + else + return -1 + fi +} + +pkgversion_svn () { + if [ -d .svn ]; then + PKGVERSION_BUGFIX="SVN" + if which svnversion 2>&1 > /dev/null; then + PKGVERSION_CODENAME="rev$(svnversion .)" + else + PKGVERSION_CODENAME="unknown" + fi + else + return 1 + fi +} + +pkgversion_git () { + local version + if version=$(git describe --always --abbrev=0 2>/dev/null); then + PKGVERSION_BUGFIX="git" + PKGVERSION_CODENAME="${version}" + else + return 1 + fi +} + + +fullversion() { + if test "x${PKGVERSION_BUGFIX}" = "x"; then + echo "${PKGVERSION_MAJOR}.${PKGVERSION_MINOR} ${PKGVERSION_CODENAME}" + else + echo "${PKGVERSION_MAJOR}.${PKGVERSION_MINOR}.${PKGVERSION_BUGFIX} ${PKGVERSION_CODENAME}" + fi +} + +substitute_file() { + local INFILE + local OUTFILE + OUTFILE=$1 + INFILE=${OUTFILE}.in + + if [ -e "${INFILE}" ]; then + sed -e "s|@PKGVERSION_MAJOR@|${PKGVERSION_MAJOR}|g" \ + -e "s|@PKGVERSION_MINOR@|${PKGVERSION_MINOR}|g" \ + -e "s|@PKGVERSION_BUGFIX@|${PKGVERSION_BUGFIX}|g" \ + -e "s|@PKGVERSION_CODENAME@|${PKGVERSION_CODENAME}|g" \ + ${INFILE} > ${OUTFILE} + else + echo "${INFILE} not found!" 1>&2 + fi +} + +if test "x${PKGVERSION_BUGFIX}" = "x"; then +## try to autodetect the current version + pkgversion_git || pkgversion_svn || pkgversion_cvs +fi + +if test "x$1" = "x"; then + fullversion +else + case $1 in + --major) + echo ${PKGVERSION_MAJOR} + ;; + --minor) + echo ${PKGVERSION_MINOR} + ;; + --bugfix) + echo ${PKGVERSION_BUGFIX} + ;; + --codename) + echo ${PKGVERSION_CODENAME} + ;; + *) + substitute_file $1 + ;; + esac +fi Added: trunk/Gem/src/pkgversion.txt =================================================================== --- trunk/Gem/src/pkgversion.txt (rev 0) +++ trunk/Gem/src/pkgversion.txt 2010-07-02 19:33:32 UTC (rev 3424) @@ -0,0 +1,8 @@ +PKGVERSION_MAJOR=0 +PKGVERSION_MINOR=93 + +## by default, pkgversion.sh will try to find out bugfix-version and codename +## based on the versioning system used. +### e.g. +#PKGVERSION_BUGFIX=SVN +#PKGVERSION_CODENAME=diamond Modified: trunk/Gem/src/version.h.in =================================================================== --- trunk/Gem/src/version.h.in 2010-07-02 19:16:04 UTC (rev 3423) +++ trunk/Gem/src/version.h.in 2010-07-02 19:33:32 UTC (rev 3424) @@ -1,3 +1,3 @@ -#define GEM_VERSION_BUGFIX @GEM_VERSION_BUGFIX@ -#define GEM_VERSION_CODENAME @GEM_VERSION_CODENAME@ +#define GEM_VERSION_BUGFIX @PKGVERSION_BUGFIX@ +#define GEM_VERSION_CODENAME @PKGVERSION_CODENAME@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |