[med-svn] r20257 - trunk/packages/gdcm/prepare-2.6/debian/patches

[Gert Wollny]

Author: gert-guest
Date: 2015-10-17 09:14:53 +0000 (Sat, 17 Oct 2015)
New Revision: 20257

Modified:
   trunk/packages/gdcm/prepare-2.6/debian/patches/add-csharp-keyfile-from-commandline.patch
   trunk/packages/gdcm/prepare-2.6/debian/patches/series
Log:
Sign c# module after compiling it

Modified: trunk/packages/gdcm/prepare-2.6/debian/patches/add-csharp-keyfile-from-commandline.patch
===================================================================
--- trunk/packages/gdcm/prepare-2.6/debian/patches/add-csharp-keyfile-from-commandline.patch	2015-10-16 21:09:07 UTC (rev 20256)
+++ trunk/packages/gdcm/prepare-2.6/debian/patches/add-csharp-keyfile-from-commandline.patch	2015-10-17 09:14:53 UTC (rev 20257)
@@ -1,27 +1,31 @@
-diff -u gdcm-2.6.0.old/Wrapping/Csharp/AssemblyInfo.cs.in gdcm-2.6.0/Wrapping/Csharp/AssemblyInfo.cs.in
+diff -ru gdcm-2.6.0.old/Wrapping/Csharp/AssemblyInfo.cs.in gdcm-2.6.0/Wrapping/Csharp/AssemblyInfo.cs.in
 --- gdcm-2.6.0.old/Wrapping/Csharp/AssemblyInfo.cs.in	2015-09-03 16:42:12.000000000 +0200
-+++ gdcm-2.6.0/Wrapping/Csharp/AssemblyInfo.cs.in	2015-10-16 22:33:46.022500023 +0200
-@@ -68,9 +68,9 @@
- // The following attributes specify the key for the sign of your assembly. See the
- // .NET Framework documentation for more information about signing.
++++ gdcm-2.6.0/Wrapping/Csharp/AssemblyInfo.cs.in	2015-10-17 10:59:49.764531268 +0200
+@@ -70,7 +70,7 @@
  // This is not required, if you don't want signing let these attributes like they're.
--[assembly: AssemblyDelaySign(false)]
-+[assembly: AssemblyDelaySign(false)]
+ [assembly: AssemblyDelaySign(false)]
  // http://msdn.microsoft.com/en-us/library/6f05ezxy(VS.80).aspx
 -[assembly: AssemblyKeyFile("key.snk")]
 +//[assembly: AssemblyKeyFile("key.snk")]
  //[assembly: AssemblyKeyFile("")]
  //[assembly: AssemblyKeyName("GDCM Key")]
  //[assembly: AssemblyKeyName("")]
-diff -u gdcm-2.6.0.old/Wrapping/Csharp/CMakeLists.txt gdcm-2.6.0/Wrapping/Csharp/CMakeLists.txt
+Nur in gdcm-2.6.0/Wrapping/Csharp/: AssemblyInfo.cs.in~.
+diff -ru gdcm-2.6.0.old/Wrapping/Csharp/CMakeLists.txt gdcm-2.6.0/Wrapping/Csharp/CMakeLists.txt
 --- gdcm-2.6.0.old/Wrapping/Csharp/CMakeLists.txt	2015-09-03 16:42:12.000000000 +0200
-+++ gdcm-2.6.0/Wrapping/Csharp/CMakeLists.txt	2015-10-16 21:47:33.000000000 +0200
-@@ -69,7 +69,7 @@
++++ gdcm-2.6.0/Wrapping/Csharp/CMakeLists.txt	2015-10-17 10:59:37.408588478 +0200
+@@ -69,11 +69,12 @@
  
    add_custom_command(
      OUTPUT ${GDCM_LIBRARY_DIR}/gdcm-sharp.dll
 -    COMMAND ${CMAKE_CSHARP_COMPILER} ARGS "/t:library" "/doc:${GDCM_LIBRARY_DIR}/gdcm-sharp.dll.xml" "/out:${GDCM_LIBRARY_DIR}/gdcm-sharp.dll" "*.cs"
 +    COMMAND ${CMAKE_CSHARP_COMPILER} ARGS "/t:library" "/doc:${GDCM_LIBRARY_DIR}/gdcm-sharp.dll.xml" "/out:${GDCM_LIBRARY_DIR}/gdcm-sharp.dll" "*.cs" "/keyfile:key.snk"
++    COMMAND "/usr/bin/sn" "-R" "${GDCM_LIBRARY_DIR}/gdcm-sharp.dll" "${CMAKE_CURRENT_SOURCE_DIR}/key.snk"
      WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
      DEPENDS "${swig_generated_file_fullname}"
      ${CMAKE_CURRENT_BINARY_DIR}/AssemblyInfo.cs
+-    COMMENT "csc *.cs"
++    COMMENT "csc *.cs" 
+     )
+ 
+   if(BUILD_EXAMPLES)

Modified: trunk/packages/gdcm/prepare-2.6/debian/patches/series
===================================================================
--- trunk/packages/gdcm/prepare-2.6/debian/patches/series	2015-10-16 21:09:07 UTC (rev 20256)
+++ trunk/packages/gdcm/prepare-2.6/debian/patches/series	2015-10-17 09:14:53 UTC (rev 20257)
@@ -4,3 +4,4 @@
 multiarch.patch
 enable-vtk6-bindings.patch
 add-csharp-keyfile-from-commandline.patch
+vtkgdcm-sharp-siging.patch