tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

recollindex builds. Still need to implement quite a lot of ifndefed stuff (pathut, rclconfig)

Browse Source 
--HG--
branch : WINDOWSPORT
This commit is contained in:
Jean-Francois Dockes
2015-08-30 15:30:50 +02:00
parent d4cd1dd91c
commit 75517f7497
24 changed files with 344 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/windows/Win32ProjectRecoll.vcxproj
+24 -4
View File
@@ -75,10 +75,10 @@
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;__WIN32__;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>BUILDING_RECOLL;WIN32;__WIN32__;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>false</SDLCheck>
<AdditionalIncludeDirectories>C:\xapian\xapian-core-1.2.8\include;C:\Users\Bill\recoll\src\internfile;C:\Users\Bill\recoll\src\rcldb;C:\Users\Bill\recoll\src\index;C:\Users\Bill\recoll\src\bincimapmime;C:\Users\Bill\recoll\src\unac;C:\Users\Bill\recoll\src\windows;C:\zlib\include;C:\pthreads-w32\Pre-built.2\include;C:\Users\Bill\recoll\src\xaposix;C:\Users\Bill\recoll\src\common;C:\Users\Bill\recoll\src\utils;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4800</DisableSpecificWarnings>
<AdditionalIncludeDirectories>C:\Iconv\include;C:\xapian\xapian-core-1.2.8\include;C:\Users\Bill\recoll\src\internfile;C:\Users\Bill\recoll\src\rcldb;C:\Users\Bill\recoll\src\index;C:\Users\Bill\recoll\src\bincimapmime;C:\Users\Bill\recoll\src\unac;C:\Users\Bill\recoll\src\windows;C:\zlib\include;C:\pthreads-w32\Pre-built.2\include;C:\Users\Bill\recoll\src\xaposix;C:\Users\Bill\recoll\src\common;C:\Users\Bill\recoll\src\utils;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4800;4996</DisableSpecificWarnings>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
@@ -140,16 +140,25 @@
<ItemGroup>
<ClInclude Include="..\common\autoconfig.h" />
<ClInclude Include="..\common\conf_post.h" />
<ClInclude Include="..\index\indexer.h" />
<ClInclude Include="..\index\mimetype.h" />
<ClInclude Include="..\internfile\internfile.h" />
<ClInclude Include="..\internfile\mh_symlink.h" />
<ClInclude Include="..\utils\debuglog.h" />
<ClInclude Include="..\utils\execmd.h" />
<ClInclude Include="..\utils\md5.h" />
<ClInclude Include="..\utils\md5ut.h" />
<ClInclude Include="..\utils\mimeparse.h" />
<ClInclude Include="..\utils\pathut.h" />
<ClInclude Include="..\utils\readfile.h" />
<ClInclude Include="..\utils\smallut.h" />
<ClInclude Include="..\utils\wipedir.h" />
<ClInclude Include="..\xaposix\safefcntl.h" />
<ClInclude Include="..\xaposix\safesysstat.h" />
<ClInclude Include="..\xaposix\safeunistd.h" />
<ClInclude Include="..\xaposix\safewindows.h" />
<ClInclude Include="fnmatch.h" />
<ClInclude Include="strptime.h" />
<ClInclude Include="targetver.h" />
</ItemGroup>
<ItemGroup>
@@ -178,6 +187,7 @@
<ClCompile Include="..\internfile\mh_mbox.cpp" />
<ClCompile Include="..\internfile\mh_text.cpp" />
<ClCompile Include="..\internfile\mimehandler.cpp" />
<ClCompile Include="..\internfile\myhtmlparse.cpp" />
<ClCompile Include="..\internfile\txtdcode.cpp" />
<ClCompile Include="..\internfile\uncomp.cpp" />
<ClCompile Include="..\rcldb\daterange.cpp" />
@@ -194,7 +204,7 @@
<ClCompile Include="..\rcldb\stemdb.cpp" />
<ClCompile Include="..\rcldb\stoplist.cpp" />
<ClCompile Include="..\rcldb\synfamily.cpp" />
<ClCompile Include="..\unac\unac.c" />
<ClCompile Include="..\unac\unac.cpp" />
<ClCompile Include="..\utils\appformime.cpp" />
<ClCompile Include="..\utils\base64.cpp" />
<ClCompile Include="..\utils\circache.cpp" />
@@ -205,10 +215,20 @@
<ClCompile Include="..\utils\fstreewalk.cpp" />
<ClCompile Include="..\utils\idfile.cpp" />
<ClCompile Include="..\utils\md5.cpp" />
<ClCompile Include="..\utils\md5ut.cpp" />
<ClCompile Include="..\utils\mimeparse.cpp" />
<ClCompile Include="..\utils\pathut.cpp" />
<ClCompile Include="..\utils\readfile.cpp" />
<ClCompile Include="..\utils\smallut.cpp" />
<ClCompile Include="..\utils\transcode.cpp" />
<ClCompile Include="..\utils\wipedir.cpp" />
<ClCompile Include="..\xaposix\safe.cc" />
<ClCompile Include="dirent.c" />
<ClCompile Include="fnmatch.c" />
<ClCompile Include="strptime.cpp" />
</ItemGroup>
<ItemGroup>
<None Include="ClassDiagram.cd" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
src/windows/Win32ProjectRecoll.vcxproj.filters
+55 -1
View File
@@ -57,6 +57,33 @@
<ClInclude Include="..\utils\execmd.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="strptime.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\utils\md5.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\utils\md5ut.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\utils\readfile.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\internfile\internfile.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\index\indexer.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\utils\mimeparse.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\index\mimetype.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\utils\wipedir.h">
<Filter>Source Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\utils\smallut.cpp">
@@ -224,8 +251,35 @@
<ClCompile Include="..\utils\pathut.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\unac\unac.c">
<ClCompile Include="..\unac\unac.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\utils\readfile.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\internfile\myhtmlparse.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="strptime.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\utils\md5ut.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\utils\transcode.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="fnmatch.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\utils\mimeparse.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\utils\wipedir.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="ClassDiagram.cd" />
</ItemGroup>
</Project>
src/windows/fnmatch.c
+4 -19
View File
@@ -13,10 +13,9 @@ Library General Public License for more details. */
/* Modified slightly by Brian Berliner <berliner@sun.com> and
Jim Blandy <jimb@cyclic.com> for CVS use */
/* Modified slightly by j.f. dockes for recoll use */
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "autoconfig.h"
/* Some file systems are case-insensitive. If FOLD_FN_CHAR is
#defined, it maps the character C onto its "canonical" form. In a
@@ -27,27 +26,13 @@ Library General Public License for more details. */
#define FOLD_FN_CHAR(c) (c)
#endif
/* IGNORE(@ */
/* #include <ansidecl.h> */
/* @) */
#include <errno.h>
#include <fnmatch.h>
#include "fnmatch.h"
#if !defined(__GNU_LIBRARY__) && !defined(STDC_HEADERS)
extern int errno;
#endif
/* Match STRING against the filename pattern PATTERN, returning zero if
it matches, nonzero if not. */
int
#if __STDC__
fnmatch (const char *pattern, const char *string, int flags)
#else
fnmatch (pattern, string, flags)
char *pattern;
char *string;
int flags;
#endif
int fnmatch (const char *pattern, const char *string, int flags)
{
register const char *p = pattern, *n = string;
register char c;
src/windows/fnmatch.h
+7 -1
View File
@@ -31,7 +31,13 @@ Library General Public License for more details. */
/* Match STRING against the filename pattern PATTERN,
returning zero if it matches, FNM_NOMATCH if not. */
extern int fnmatch (const char *pattern, const char *string, int flags);
#ifdef __cplusplus
extern "C" {
#endif
extern int fnmatch (const char *pattern, const char *str, int flags);
#ifdef __cplusplus
}
#endif
#endif /* fnmatch.h */
src/windows/recollindex/recollindex.vcxproj
+1 -1
View File
@@ -94,7 +94,7 @@
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>C:\xapian\xapian-core-1.2.8\win32\Debug;C:\Users\Bill\recoll\src\windows\Debug;C:\pthreads-w32\Pre-built.2\lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>C:\Users\Bill\recoll\src\windows\Debug\Win32ProjectRecoll.lib;C:\xapian\xapian-core-1.2.8\win32\Debug\xapian-core.lib;C:\zlib\lib\zdll.lib;Ws2_32.lib;Rpcrt4.lib;pthreadVC2.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>C:\Users\Bill\recoll\src\windows\Debug\Win32ProjectRecoll.lib;C:\xapian\xapian-core-1.2.8\win32\Debug\xapian-core.lib;C:\Iconv\lib\iconv.lib;C:\Iconv\lib/charset.lib;C:\zlib\lib\zdll.lib;Ws2_32.lib;Rpcrt4.lib;pthreadVC2.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">