[certi-cvs] certi configure.in CMakeLists.txt Makefile.am s...

[certi-cvs]

CVSROOT:        /sources/certi
Module name:    certi
Changes by:     Eric NOULARD <erk>      08/03/20 16:09:33

Modified files:
        .              : configure.in CMakeLists.txt Makefile.am 
Added files:
        scripts        : CreatePatchCVS.cmake 

Log message:
        Prepare CERTI 3.2.6

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/configure.in?cvsroot=certi&r1=3.28&r2=3.29
http://cvs.savannah.gnu.org/viewcvs/certi/CMakeLists.txt?cvsroot=certi&r1=1.35&r2=1.36
http://cvs.savannah.gnu.org/viewcvs/certi/Makefile.am?cvsroot=certi&r1=3.11&r2=3.12
http://cvs.savannah.gnu.org/viewcvs/certi/scripts/CreatePatchCVS.cmake?cvsroot=certi&rev=1.1

Patches:
Index: configure.in
===================================================================
RCS file: /sources/certi/certi/configure.in,v
retrieving revision 3.28
retrieving revision 3.29
diff -u -b -r3.28 -r3.29
--- configure.in        20 Nov 2007 07:36:21 -0000      3.28
+++ configure.in        20 Mar 2008 16:09:33 -0000      3.29
@@ -1,12 +1,12 @@
-## $Id: configure.in,v 3.28 2007/11/20 07:36:21 erk Exp $ 
+## $Id: configure.in,v 3.29 2008/03/20 16:09:33 erk Exp $ 
 ## ---------------------------------------------------------------------------
 
 ## Process this file with autoconf to produce `configure'
 ## Init
-AC_INIT([certi],[3.2.6cvs], address@hidden, [certi])
+AC_INIT([certi],[3.2.6], address@hidden, [certi])
 AC_PREREQ(2.53)
 
-AC_REVISION($Revision: 3.28 $)
+AC_REVISION($Revision: 3.29 $)
 AC_CONFIG_SRCDIR(RTIG/RTIG.cc)
 AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE

Index: CMakeLists.txt
===================================================================
RCS file: /sources/certi/certi/CMakeLists.txt,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- CMakeLists.txt      20 Mar 2008 15:53:43 -0000      1.35
+++ CMakeLists.txt      20 Mar 2008 16:09:33 -0000      1.36
@@ -81,7 +81,7 @@
 SET(PACKAGE_NAME      "CERTI")
 SET(PACKAGE_VERSION_MAJOR "3")
 SET(PACKAGE_VERSION_MINOR "2")
-SET(PACKAGE_VERSION_PATCH "6pre2")
+SET(PACKAGE_VERSION_PATCH "6")
 SET(PACKAGE_VERSION   
"${PACKAGE_VERSION_MAJOR}.${PACKAGE_VERSION_MINOR}.${PACKAGE_VERSION_PATCH}")
 # Autotools compatibility var
 SET(VERSION ${PACKAGE_VERSION})
@@ -346,6 +346,14 @@
   ${CMAKE_CURRENT_SOURCE_DIR}/scripts/UseCERTI.cmake
   DESTINATION share/scripts)
 
+ ## Patch generating target
+# The custom target is using a cmake script which in turn
+# use execute_process, 
+# this way we may find a flexible way to build the patch
+ADD_CUSTOM_TARGET(patch 
+                  COMMAND ${CMAKE_COMMAND} -DWDIR:PATH=${CMAKE_SOURCE_DIR} 
-DODIR:PATH=${CMAKE_BINARY_DIR} -P 
${CMAKE_SOURCE_DIR}/scripts/CreatePatchCVS.cmake                                
                      
+                  COMMENT "Generating patch file ready for review at 
address@hidden")
+
 IF (WIN32)
   MESSAGE(STATUS "*** CERTI for WIN32 has been successfully configured 
********")
 ELSE (WIN32)

Index: Makefile.am
===================================================================
RCS file: /sources/certi/certi/Makefile.am,v
retrieving revision 3.11
retrieving revision 3.12
diff -u -b -r3.11 -r3.12
--- Makefile.am 21 Nov 2007 09:48:54 -0000      3.11
+++ Makefile.am 20 Mar 2008 16:09:33 -0000      3.12
@@ -19,5 +19,7 @@
        scripts/UseRPMTools.cmake \
        scripts/FindMd5sum.cmake \
        scripts/UseDebian.cmake \
-       scripts/UseCERTI.cmake 
+       scripts/UseCERTI.cmake  \
+       GenMessageClass.py \
+       NW_MessageType.txt
 

Index: scripts/CreatePatchCVS.cmake
===================================================================
RCS file: scripts/CreatePatchCVS.cmake
diff -N scripts/CreatePatchCVS.cmake
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ scripts/CreatePatchCVS.cmake        20 Mar 2008 16:09:33 -0000      1.1
@@ -0,0 +1,24 @@
+# This CMake script may be used
+# with a command line like
+# cmake -DWDIR:PATH=<workdir_path> -DODIR:PATH=<output_path> -P 
CreatePatchCVS.cmake
+#
+# The script will
+#   1) find an appropriate cvs command.
+#   2) create a unified diff from CVS diff command
+#      rooted at WDIR and put the resulting diff
+#      in ODIR/patch.diff
+FIND_PROGRAM(CVS_COMMAND
+             NAMES cvs 
+             DOC "The command line cvs command")
+
+# TODO: -kk doesn't work, googling only reports a few unsolved problem reports.
+SET(CVS_DIFF_ARGS "diff -u")
+MESSAGE(STATUS "CVS Patch:: Generating patch using CVS...")
+MESSAGE(STATUS "CVS Patch:: Using command     : ${CVS_COMMAND} 
${CVS_DIFF_ARGS}")
+MESSAGE(STATUS "CVS Patch:: Rooted at Workdir : ${WDIR}")
+EXECUTE_PROCESS(COMMAND ${CVS_COMMAND} ${CVS_DIFF_ARGS}
+                OUTPUT_FILE ${ODIR}/patch.diff
+                RESULT_VARIABLE PATCHOK
+                WORKING_DIRECTORY ${WDIR}
+                ERROR_QUIET)               
+MESSAGE(STATUS "CVS Patch:: Patch file is : ${ODIR}/patch.diff")              
\ No newline at end of file