Re: svn commit: r1293202 - /tomcat/native/branches/1.1.x/jnirelease.sh

2012-02-27 Thread Mladen Turk

On 02/26/2012 04:58 PM, Rainer Jung wrote:

On 24.02.2012 13:09, mt...@apache.org wrote:

JKJNISVN=$SVNBASE/${JKJNIEXT}
if [ "x$JKJNIEXT" = "xtrunk" ]; then
- JKJNIVER=`svn info ${JKJNISVN} | awk '$1 == "Revision:" {print $2}'`
-elif [ $USE_BRANCH -eq 1 ]; then
- JKJNIBRANCH=${JKJNIEXT}
- JKJNISVN=$SVNBASE/branches/${JKJNIBRANCH}
- JKJNIVER=${JKJNIBRANCH}-`svn info ${JKJNISVN} | awk '$1 == "Revision:" {print 
$2}'`
+ i="`svn info`"
+ JKJNIVER=`echo "$i" | awk '$1 == "Revision:" {print $2}'`
+ JKJNISVN=`echo "$i" | awk '$1 == "URL:" {print $2}'`


Just in case you didn't notice: before you could run the script without having a 
workspace checked out. Now this needs a local workspace to run "svn info" on 
it. Before it ran the info on the URL computed.



Yes I did that intentionally to simplify the release script.

Note that layouts in trunk and 1.1.x branch are already different so you
cannot release arbitrary tag/branch with it.
This one is specific for 1.1.x branch.
For trunk all branch mechanism should be removed as well because
the premise of branches is that they are different so you will
at least need to run jnirelease.sh from the target branch.



Regards
--
^TM

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: svn commit: r1293202 - /tomcat/native/branches/1.1.x/jnirelease.sh

2012-02-26 Thread Rainer Jung

On 24.02.2012 13:09, mt...@apache.org wrote:

Author: mturk
Date: Fri Feb 24 12:09:43 2012
New Revision: 1293202

URL: http://svn.apache.org/viewvc?rev=1293202&view=rev
Log:
Simpplify release script. Get url from svn info

Modified:
 tomcat/native/branches/1.1.x/jnirelease.sh

Modified: tomcat/native/branches/1.1.x/jnirelease.sh
URL: 
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/jnirelease.sh?rev=1293202&r1=1293201&r2=1293202&view=diff
==
--- tomcat/native/branches/1.1.x/jnirelease.sh (original)
+++ tomcat/native/branches/1.1.x/jnirelease.sh Fri Feb 24 12:09:43 2012
@@ -70,7 +70,7 @@ if [ "x$JKJNIEXT" = "x" ]; then
  echo ""
  echo "Unknown SVN version"
  echo "Use:"
-echo "  --ver=||trunk"
+echo "  --ver=|trunk"
  echo ""
  exit 1
  fi
@@ -117,20 +117,12 @@ else
echo ""
exit 1
  fi
-echo $JKJNIEXT | egrep -e 'x$'>  /dev/null 2>&1
-if [ $? -eq 0 ]; then
-USE_BRANCH=1
-else
-USE_BRANCH=0
-fi

  JKJNISVN=$SVNBASE/${JKJNIEXT}
  if [ "x$JKJNIEXT" = "xtrunk" ]; then
-JKJNIVER=`svn info ${JKJNISVN} | awk '$1 == "Revision:" {print $2}'`
-elif [ $USE_BRANCH -eq 1 ]; then
-JKJNIBRANCH=${JKJNIEXT}
-JKJNISVN=$SVNBASE/branches/${JKJNIBRANCH}
-JKJNIVER=${JKJNIBRANCH}-`svn info ${JKJNISVN} | awk '$1 == "Revision:" 
{print $2}'`
+i="`svn info`"
+JKJNIVER=`echo "$i" | awk '$1 == "Revision:" {print $2}'`
+JKJNISVN=`echo "$i" | awk '$1 == "URL:" {print $2}'`


Just in case you didn't notice: before you could run the script without 
having a workspace checked out. Now this needs a local workspace to run 
"svn info" on it. Before it ran the info on the URL computed.


Regards,

Rainer

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1293202 - /tomcat/native/branches/1.1.x/jnirelease.sh

2012-02-24 Thread mturk
Author: mturk
Date: Fri Feb 24 12:09:43 2012
New Revision: 1293202

URL: http://svn.apache.org/viewvc?rev=1293202&view=rev
Log:
Simpplify release script. Get url from svn info

Modified:
tomcat/native/branches/1.1.x/jnirelease.sh

Modified: tomcat/native/branches/1.1.x/jnirelease.sh
URL: 
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/jnirelease.sh?rev=1293202&r1=1293201&r2=1293202&view=diff
==
--- tomcat/native/branches/1.1.x/jnirelease.sh (original)
+++ tomcat/native/branches/1.1.x/jnirelease.sh Fri Feb 24 12:09:43 2012
@@ -70,7 +70,7 @@ if [ "x$JKJNIEXT" = "x" ]; then
 echo ""
 echo "Unknown SVN version"
 echo "Use:"
-echo "  --ver=||trunk" 
+echo "  --ver=|trunk"
 echo ""
 exit 1
 fi
@@ -117,20 +117,12 @@ else
   echo ""
   exit 1
 fi
-echo $JKJNIEXT | egrep -e 'x$' > /dev/null 2>&1
-if [ $? -eq 0 ]; then
-USE_BRANCH=1
-else
-USE_BRANCH=0
-fi
 
 JKJNISVN=$SVNBASE/${JKJNIEXT}
 if [ "x$JKJNIEXT" = "xtrunk" ]; then
-JKJNIVER=`svn info ${JKJNISVN} | awk '$1 == "Revision:" {print $2}'`
-elif [ $USE_BRANCH -eq 1 ]; then
-JKJNIBRANCH=${JKJNIEXT}
-JKJNISVN=$SVNBASE/branches/${JKJNIBRANCH}
-JKJNIVER=${JKJNIBRANCH}-`svn info ${JKJNISVN} | awk '$1 == "Revision:" 
{print $2}'`
+i="`svn info`"
+JKJNIVER=`echo "$i" | awk '$1 == "Revision:" {print $2}'`
+JKJNISVN=`echo "$i" | awk '$1 == "URL:" {print $2}'`
 else
 JKJNIVER=$JKJNIEXT
 JKJNISVN="${SVNBASE}/tags/TOMCAT_NATIVE_`echo $JKJNIVER | sed 's/\./_/g'`"
@@ -150,7 +142,6 @@ do
 echo ""
 echo "svn export ${i} failed"
 echo ""
-exit 1
 fi
 done
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org