certi-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[certi-cvs] certi/scripts CreatePatchCVS.cmake


From: certi-cvs
Subject: [certi-cvs] certi/scripts CreatePatchCVS.cmake
Date: Sat, 24 Apr 2010 13:49:52 +0000

CVSROOT:        /sources/certi
Module name:    certi
Changes by:     Eric NOULARD <erk>      10/04/24 13:49:52

Modified files:
        scripts        : CreatePatchCVS.cmake 

Log message:
        Small fixes
           -N for new files (even if it doesn't seem to work properly)
           effectively use "CVS_DIFF_ARGS"

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/scripts/CreatePatchCVS.cmake?cvsroot=certi&r1=1.4&r2=1.5

Patches:
Index: CreatePatchCVS.cmake
===================================================================
RCS file: /sources/certi/certi/scripts/CreatePatchCVS.cmake,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- CreatePatchCVS.cmake        6 Feb 2010 23:52:21 -0000       1.4
+++ CreatePatchCVS.cmake        24 Apr 2010 13:49:52 -0000      1.5
@@ -12,11 +12,11 @@
              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")
+SET(CVS_DIFF_ARGS "-uN")
 MESSAGE(STATUS "CVS Patch:: Generating patch using CVS...")
-MESSAGE(STATUS "CVS Patch:: Using command     : ${CVS_COMMAND} 
${CVS_DIFF_ARGS}")
+MESSAGE(STATUS "CVS Patch:: Using command     : ${CVS_COMMAND} diff 
${CVS_DIFF_ARGS}")
 MESSAGE(STATUS "CVS Patch:: Rooted at Workdir : ${WDIR}")
-EXECUTE_PROCESS(COMMAND ${CVS_COMMAND} diff -u
+EXECUTE_PROCESS(COMMAND ${CVS_COMMAND} diff ${CVS_DIFF_ARGS}
                 OUTPUT_FILE ${ODIR}/patch.diff
                 RESULT_VARIABLE PATCHOK
                 WORKING_DIRECTORY ${WDIR}




reply via email to

[Prev in Thread] Current Thread [Next in Thread]