[brlcad-commits] SF.net SVN: brlcad:[51576] brlcad/trunk/src/other/step
Open Source Solid Modeling CAD
Brought to you by:
brlcad
From: <sta...@us...> - 2012-07-18 15:24:32
|
Revision: 51576 http://brlcad.svn.sourceforge.net/brlcad/?rev=51576&view=rev Author: starseeker Date: 2012-07-18 15:24:25 +0000 (Wed, 18 Jul 2012) Log Message: ----------- Thanks Keith for reminding me of the potential problem - strip newlines out of md5 calculations so Windows can't toss in a monkey wrench. Modified Paths: -------------- brlcad/trunk/src/other/step/cmake/Generated_Source_Utils.cmake brlcad/trunk/src/other/step/src/express/generated/verification_info.cmake Modified: brlcad/trunk/src/other/step/cmake/Generated_Source_Utils.cmake =================================================================== --- brlcad/trunk/src/other/step/cmake/Generated_Source_Utils.cmake 2012-07-18 15:22:10 UTC (rev 51575) +++ brlcad/trunk/src/other/step/cmake/Generated_Source_Utils.cmake 2012-07-18 15:24:25 UTC (rev 51576) @@ -1,8 +1,12 @@ # Utility routines for managing generated files with CMake macro(MD5 filename md5sum) - execute_process(COMMAND ${CMAKE_COMMAND} -E md5sum ${filename} OUTPUT_VARIABLE md5string) - string(REPLACE " ${filename}" "" md5string "${md5string}") + file(READ "${filename}" RAW_MD5_FILE) + string(REGEX REPLACE "\r?\n" "" STRIPPED_MD5_FILE "${RAW_MD5_FILE}") + file(WRITE ${CMAKE_BINARY_DIR}/CMakeTmp/md5_file "${STRIPPED_MD5_FILE}") + execute_process(COMMAND ${CMAKE_COMMAND} -E md5sum ${CMAKE_BINARY_DIR}/CMakeTmp/md5_file OUTPUT_VARIABLE md5string) + file(REMOVE ${CMAKE_BINARY_DIR}/CMakeTmp/md5_file) + string(REPLACE " ${CMAKE_BINARY_DIR}/CMakeTmp/md5_file" "" md5string "${md5string}") string(STRIP "${md5string}" ${md5sum}) endmacro(MD5) Modified: brlcad/trunk/src/other/step/src/express/generated/verification_info.cmake =================================================================== --- brlcad/trunk/src/other/step/src/express/generated/verification_info.cmake 2012-07-18 15:22:10 UTC (rev 51575) +++ brlcad/trunk/src/other/step/src/express/generated/verification_info.cmake 2012-07-18 15:24:25 UTC (rev 51576) @@ -2,11 +2,11 @@ set(baseline_lemon_version "1.0") set(baseline_re2c_version "001305") set(baseline_perplex_version "1.0.0") -set(baseline_lempar_c_md5 800202a4b85dba30159f18c671486cd1) -set(baseline_perplex_template_c_md5 f58d4e84b966006f5309df859a0eb36f) -set(baseline_expscan_l_md5 617531ffdf3ee747cd5980f3c3a9a4bd) -set(baseline_expparse_y_md5 886cf43ab5bbdbfe5ec1cb6a8b83b690) -set(baseline_expscan_c_md5 33f8b3bcdb682bdc774c3a17cd38d25b) -set(baseline_expscan_h_md5 3052c058a37045b43f96e4c04039bce3) -set(baseline_expparse_c_md5 bc18408ef7740f2ef924dcc17d24ad93) -set(baseline_expparse_h_md5 e4a5599839b2a9f7a6915a0dcc7747b0) +set(baseline_lempar_c_md5 be967611b8e05f74bddd7f2214e2bbb0) +set(baseline_perplex_template_c_md5 a01d5673b979cc6b5740812e1a65df86) +set(baseline_expscan_l_md5 1dd32f5ae123f358c9a27759f25d519b) +set(baseline_expparse_y_md5 31d665302035889af06c56baf4f14b2b) +set(baseline_expscan_c_md5 dbe513399f365f4323acb03fd476ddf4) +set(baseline_expscan_h_md5 57d55bbf95d84846e735e307f7032bcd) +set(baseline_expparse_c_md5 accfb4ba75d4d3f65ab93935e91d9b95) +set(baseline_expparse_h_md5 3760ebbc81cef310ca47796d55edc3d5) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |