[Clucene-cvs] SF.net SVN: clucene:[2968] branches/lucene2_3_2

[<ust...@us...>]

Revision: 2968
          http://clucene.svn.sourceforge.net/clucene/?rev=2968&view=rev
Author:   ustramooner
Date:     2009-03-29 13:47:59 +0000 (Sun, 29 Mar 2009)

Log Message:
-----------
fixes for problems discovered by the dist-test.sh script

Modified Paths:
--------------
    branches/lucene2_3_2/dist-test.sh
    branches/lucene2_3_2/src/core/CLucene/search/FieldSortedHitQueue.h
    branches/lucene2_3_2/src/core/CLucene/store/FSDirectory.cpp
    branches/lucene2_3_2/src/core/CLucene/store/LockFactory.h
    branches/lucene2_3_2/src/shared/CLucene/config/repl_wchar.h
    branches/lucene2_3_2/src/test/test.h

Modified: branches/lucene2_3_2/dist-test.sh
===================================================================
--- branches/lucene2_3_2/dist-test.sh	2009-03-29 10:57:30 UTC (rev 2967)
+++ branches/lucene2_3_2/dist-test.sh	2009-03-29 13:47:59 UTC (rev 2968)
@@ -71,7 +71,7 @@
 #check to see that no #ifdefs exist in headers that don't belong
 function checkForIfdefs {
     I=0
-    grep "#if" $1| while read line; do
+    grep "#if" $1| grep -v "_UCS2" |grep -v "_CL_HAVE_" |grep -v "_ASCII" |grep -v "_WIN32" |grep -v "_WIN64" | while read line; do
         I=`expr $I + 1`
         if [ $I -gt 1 ]; then
             echo $1 has invalid ifdef: $line
@@ -102,7 +102,9 @@
             ln -s "`cd "$DN" && pwd`/$BH" "$TMP/${H:3}" 2>/dev/null
             
             #create pub-headers.cpp
-            echo "#include \"${H:7}\"" >>$TMP/pub-headers.cpp
+            if [ "${H:7}" != "core/CLucene/util/Reader.h" ]; then
+              echo "#include \"${H:7}\"" >>$TMP/pub-headers.cpp
+            fi
         fi
     done
 fi
@@ -147,11 +149,12 @@
         fi
         
         #test that each header compiles independently...
-        if [ $t_c_h == 1 ]; then
+        if [ $t_c_h == 1 ] && [ "${H:7}" != "disttest/src/core/CLucene/util/Reader.h" ]; then
+            echo "Test that $H compiles seperately..."
             echo "#include \"CLucene/StdHeader.h"\" >$TMP/pub-header.cpp
             echo "#include \"$H"\" >>$TMP/pub-header.cpp
             echo "int main(){return 0;}"  >>$TMP/pub-header.cpp
-            g++ -I. -I$TMP/src/shared -I$TMP/src/core $TMP/pub-header.cpp
+            g++ -I. -I$TMP/src/shared -I./src/shared -I$TMP/src/core $TMP/pub-header.cpp
             if [ $? != 0 ]; then 
                 FAIL=1; 
             fi

Modified: branches/lucene2_3_2/src/core/CLucene/search/FieldSortedHitQueue.h
===================================================================
--- branches/lucene2_3_2/src/core/CLucene/search/FieldSortedHitQueue.h	2009-03-29 10:57:30 UTC (rev 2967)
+++ branches/lucene2_3_2/src/core/CLucene/search/FieldSortedHitQueue.h	2009-03-29 13:47:59 UTC (rev 2968)
@@ -11,14 +11,10 @@
 CL_CLASS_DEF(search,FieldDoc)
 CL_CLASS_DEF(search,SortComparatorSource)
 CL_CLASS_DEF(search,SortField)
-//#include "FieldCache.h"
-//#include "Sort.h"
-//#include "FieldDocSortedHitQueue.h"
 #include "FieldDoc.h" //required to expose destructor
-//#include "SearchHeader.h"
-//#include "FieldCacheImpl.h"
 #include "CLucene/util/PriorityQueue.h"
 #include "CLucene/util/Equators.h"
+#include "CLucene/LuceneThreads.h"
 
 CL_CLASS_DEF(index,IndexReader)
 

Modified: branches/lucene2_3_2/src/core/CLucene/store/FSDirectory.cpp
===================================================================
--- branches/lucene2_3_2/src/core/CLucene/store/FSDirectory.cpp	2009-03-29 10:57:30 UTC (rev 2967)
+++ branches/lucene2_3_2/src/core/CLucene/store/FSDirectory.cpp	2009-03-29 13:47:59 UTC (rev 2968)
@@ -577,7 +577,7 @@
 #endif
   }
 
-  bool FSDirectory::openInput(const char * name, lucene::store::IndexInput *& ret, CLuceneError& error, int32_t bufferSize)
+  bool FSDirectory::openInput(const char * name, IndexInput *& ret, CLuceneError& error, int32_t bufferSize)
   {
 	CND_PRECONDITION(directory[0]!=0,"directory is not open")
     char fl[CL_MAX_DIR];

Modified: branches/lucene2_3_2/src/core/CLucene/store/LockFactory.h
===================================================================
--- branches/lucene2_3_2/src/core/CLucene/store/LockFactory.h	2009-03-29 10:57:30 UTC (rev 2967)
+++ branches/lucene2_3_2/src/core/CLucene/store/LockFactory.h	2009-03-29 13:47:59 UTC (rev 2968)
@@ -7,9 +7,8 @@
 #ifndef _lucene_store_LockFactory_
 #define _lucene_store_LockFactory_
 
-//#include "Lock.h"
+#include "CLucene/LuceneThreads.h"
 
-
 CL_CLASS_DEF(store,LuceneLock)
 CL_CLASS_DEF(store,NoLock)
 

Modified: branches/lucene2_3_2/src/shared/CLucene/config/repl_wchar.h
===================================================================
--- branches/lucene2_3_2/src/shared/CLucene/config/repl_wchar.h	2009-03-29 10:57:30 UTC (rev 2967)
+++ branches/lucene2_3_2/src/shared/CLucene/config/repl_wchar.h	2009-03-29 13:47:59 UTC (rev 2968)
@@ -8,6 +8,7 @@
 #define _lucene_repl_wchar_h
 
 #include <stdarg.h>
+#include "repl_tchar.h"
 #ifdef _CL_HAVE_STRING_H
     #include <string.h>
 #endif

Modified: branches/lucene2_3_2/src/test/test.h
===================================================================
--- branches/lucene2_3_2/src/test/test.h	2009-03-29 10:57:30 UTC (rev 2967)
+++ branches/lucene2_3_2/src/test/test.h	2009-03-29 13:47:59 UTC (rev 2968)
@@ -18,6 +18,7 @@
 #include "CLucene/store/Lock.h"
 #include "CLucene/index/TermVector.h"
 #include "CLucene/queryParser/MultiFieldQueryParser.h"
+#include <string.h>
 
 #define LUCENE_INT64_MAX_SHOULDBE _ILONGLONG(0x7FFFFFFFFFFFFFFF)
 #define LUCENE_INT64_MIN_SHOULDBE (-LUCENE_INT64_MAX_SHOULDBE - _ILONGLONG(1) )


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.