Revision: 6107
          http://ipcop.svn.sourceforge.net/ipcop/?rev=6107&view=rev
Author:   owes
Date:     2011-11-18 06:21:34 +0000 (Fri, 18 Nov 2011)
Log Message:
-----------
Change use of previous SVN revision in make.sh. PREVIOUSSVNREV now marks the 
exact SVN number of the previous release, so older version can be retrieved 
using svn -r <PREVIOUSSVNREV>
Auto-add release marker to Changelog, does not handle updates splitted into 2 
packages.

Modified Paths:
--------------
    ipcop/trunk/make.sh

Modified: ipcop/trunk/make.sh
===================================================================
--- ipcop/trunk/make.sh 2011-11-17 22:19:26 UTC (rev 6106)
+++ ipcop/trunk/make.sh 2011-11-18 06:21:34 UTC (rev 6107)
@@ -57,8 +57,8 @@
 
 # This is the last official IPCop version number. Needed for ./make.sh 
newupdate.
 PREVIOUSVERSION=2.0.1
-# This is the SVN revision number (+1) for the last IPCop version. Needed for 
ChangeLog and MD5 Modification test.
-PREVIOUSSVNREV=6043
+# This is the SVN revision number for the last IPCop version. Needed for 
ChangeLog.
+PREVIOUSSVNREV=6042
 
 # Just an arbitrary name for the downloadable, prebuilt toolchain (if you want 
to save time compiling).
 TOOLCHAINVERSION=1.9.17
@@ -2260,13 +2260,21 @@
        echo "Building new doc/ChangeLog from SVN"
        # svn2cl script come from http://ch.tudelft.nl/~arthur/svn2cl/
 
-       ${BASEDIR}/tools/svn2cl/svn2cl.sh -r "COMMITTED:${PREVIOUSSVNREV}" -o 
${BASEDIR}/doc/ChangeLog-${VERSION}
+       ${BASEDIR}/tools/svn2cl/svn2cl.sh -r "COMMITTED:$[${PREVIOUSSVNREV} + 
1]" -o ${BASEDIR}/doc/ChangeLog-${VERSION}
        cp ${BASEDIR}/doc/ChangeLog ${BASEDIR}/doc/ChangeLog.tmp
-       mv ${BASEDIR}/doc/ChangeLog-${VERSION} ${BASEDIR}/doc/ChangeLog
+       cat > ${BASEDIR}/doc/ChangeLog <<END
+###
+#
+# ${VERSION} release
+#
+###
+
+END
+       cat ${BASEDIR}/doc/ChangeLog-${VERSION} >> ${BASEDIR}/doc/ChangeLog
        cat ${BASEDIR}/doc/ChangeLog.tmp >> ${BASEDIR}/doc/ChangeLog
-       rm ${BASEDIR}/doc/ChangeLog.tmp
+       rm ${BASEDIR}/doc/ChangeLog.tmp ${BASEDIR}/doc/ChangeLog-${VERSION}
        echo
-       echo "Manually add a release 'marker' to doc/ChangeLog and commit 
doc/ChangeLog to update SVN"
+       echo "Verify the release 'marker' in doc/ChangeLog and commit 
doc/ChangeLog to update SVN"
        ;;
 check_files)
        # Check if we have yet build

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.


------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure 
contains a definitive record of customers, application performance, 
security threats, fraudulent activity, and more. Splunk takes this 
data and makes sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-novd2d
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn

Reply via email to