[GNUnet-SVN] r9929 - in Extractor-mono/LibExtractor: . src

[gnunet]

Author: patrick
Date: 2009-12-29 16:20:28 +0100 (Tue, 29 Dec 2009)
New Revision: 9929

Modified:
   Extractor-mono/LibExtractor/LibExtractor.dll.config
   Extractor-mono/LibExtractor/src/AssemblyInfo.cs
   Extractor-mono/LibExtractor/src/Extractor.cs
Log:
* LibExtractor/src/Extractor.cs: changed native dll imports from libextractor 
to libextractor-1 to avoid filename problems on windows
* LibExtractor/src/AssemblyInfo.cs: bumped version number
* LibExtractor/LibExtractor.dll.config: changed dllmapping to libextractor-1

Modified: Extractor-mono/LibExtractor/LibExtractor.dll.config
===================================================================
--- Extractor-mono/LibExtractor/LibExtractor.dll.config 2009-12-29 15:01:08 UTC 
(rev 9928)
+++ Extractor-mono/LibExtractor/LibExtractor.dll.config 2009-12-29 15:20:28 UTC 
(rev 9929)
@@ -1,3 +1,3 @@
 <configuration>
-       <dllmap dll="libextractor" target="libextractor.so.1.1.1"/>
+       <dllmap dll="libextractor-1" target="libextractor.so.1.1.1"/>
 </configuration>

Modified: Extractor-mono/LibExtractor/src/AssemblyInfo.cs
===================================================================
--- Extractor-mono/LibExtractor/src/AssemblyInfo.cs     2009-12-29 15:01:08 UTC 
(rev 9928)
+++ Extractor-mono/LibExtractor/src/AssemblyInfo.cs     2009-12-29 15:20:28 UTC 
(rev 9929)
@@ -33,7 +33,7 @@
 // The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
 // If the build and revision are set to '*' they will be updated automatically.
 
-[assembly: AssemblyVersion("0.5.23.0")]
+[assembly: AssemblyVersion("0.5.23.1")]
 
 // The following attributes are used to specify the signing key for the 
assembly, 
 // if desired. See the Mono documentation for more information about signing.

Modified: Extractor-mono/LibExtractor/src/Extractor.cs
===================================================================
--- Extractor-mono/LibExtractor/src/Extractor.cs        2009-12-29 15:01:08 UTC 
(rev 9928)
+++ Extractor-mono/LibExtractor/src/Extractor.cs        2009-12-29 15:20:28 UTC 
(rev 9929)
@@ -364,37 +364,37 @@
                ///
                
                #region Native imports
-               [DllImport("libextractor")]
+               [DllImport("libextractor-1")]
                private static extern IntPtr EXTRACTOR_loadDefaultLibraries();
                
-               [DllImport("libextractor")]
+               [DllImport("libextractor-1")]
                private static extern IntPtr 
EXTRACTOR_loadConfigLibraries(IntPtr prev, string config);
                
-               [DllImport("libextractor")]
+               [DllImport("libextractor-1")]
                private static extern IntPtr EXTRACTOR_addLibrary(IntPtr prev, 
string library);
                
-               [DllImport("libextractor")]
+               [DllImport("libextractor-1")]
                private static extern IntPtr EXTRACTOR_addLibraryLast(IntPtr 
prev, string library);
                
-               [DllImport("libextractor")]
+               [DllImport("libextractor-1")]
                private static extern IntPtr EXTRACTOR_removeLibrary(IntPtr 
prev, string library);
                        
-               [DllImport("libextractor")]
+               [DllImport("libextractor-1")]
                private static extern void EXTRACTOR_removeAll(IntPtr 
libraries);
                
-               [DllImport("libextractor")]
+               [DllImport("libextractor-1")]
                private static extern IntPtr EXTRACTOR_getKeywords(IntPtr 
extractors, string filename);
                
-               [DllImport("libextractor")]
+               [DllImport("libextractor-1")]
                private static extern IntPtr EXTRACTOR_getKeywords2(IntPtr 
extractors, IntPtr data, int size);
                
-               [DllImport("libextractor")]
+               [DllImport("libextractor-1")]
                private static extern void EXTRACTOR_freeKeywords(IntPtr 
keywords);             
                
-               [DllImport("libextractor")]
+               [DllImport("libextractor-1")]
                private static extern IntPtr 
EXTRACTOR_getKeywordTypeAsString(KeywordType type);
                
-               [DllImport("libextractor")]
+               [DllImport("libextractor-1")]
                private static extern KeywordType 
EXTRACTOR_getHighestKeywordTypeNumber();
                #endregion
        }