Changeset 13756

Timestamp:

2007-01-23T16:25:40+13:00 (17 years ago)

Author:

kjdon

Message:

changed the names of libs to match the linux version. and other windows changes so that it works properly

Location:

trunk/indexers/mgpp

Files:

• lib/WIN32.MAK (modified) (2 diffs)
• text/WIN32.MAK (modified) (5 diffs)
• winMake.bat (modified) (1 diff)

trunk/indexers/mgpp/lib/WIN32.MAK

@@ -83 +83 @@
 DISTFILES = Makefile.in $(HEADERS) $(SOURCES)
  
-all : libmgpp.lib
+all : libmgpplib.lib
 
-libmgpp.lib : $(OBJECTS)
-    if EXIST libmgpp.lib del libmgpp.lib
-    $(AR) /out:libmgpp.lib $(OBJECTS)
+libmgpplib.lib : $(OBJECTS)
+    if EXIST libmgpplib.lib del libmgpplib.lib
+    $(AR) /out:libmgpplib.lib $(OBJECTS)
 
 $(OBJECTS): "$(MGPPHOME)\win32cfg.h"
@@ -94 +94 @@
 clean:
     del *$o 
-    del libmgpp.lib
+    del libmgpplib.lib

trunk/indexers/mgpp/text/WIN32.MAK

@@ -26 +26 @@
 
 MGPPHOME = ..
-GSDL3HOME = ..\..\..
+# for now put executables in indexers/bin
+INSTALLDIR = ..\..\bin
 AR = lib
 CC = cl
@@ -34 +35 @@
 DEFS = -DQUIET -DHAVE_CONFIG_H -D__WIN32__ -DSHORT_SUFFIX -D__STDC__ -D__GNU_LIBRARY__ -D__MSDOS__
 INCLUDES = -I"." -I"$(MGPPHOME)" -I"$(MGPPHOME)\lib"
-LIBS = $(MGPPHOME)\lib\libmgpp.lib
+LIBS = $(MGPPHOME)\lib\libmgpplib.lib
 
 COMPILE = $(CC) -c  $(CPPFLAGS) $(DEFS) $(INCLUDES)
@@ -84 +85 @@
 DISTFILES = Makefile.in $(HEADERS) $(SOURCES)
  
-all : $(EXEC) libtextin.lib libmgpppass.lib
+all : $(EXEC) libmgpptext.lib libmgpppass.lib
 
 
@@ -167 +168 @@
            GSDLQueryParser$o GSDLQueryLex$o words$o
 
-libtextin.lib: $(LIB_OBJS)
-        if exist libtextin.lib del libtextin.lib
-        $(AR) /out:libtextin.lib $(LIB_OBJS)
+libmgpptext.lib: $(LIB_OBJS)
+        if exist libmgpptext.lib del libmgpptext.lib
+        $(AR) /out:libmgpptext.lib $(LIB_OBJS)
 
 JNI_LIB_OBJS = \
@@ -183 +184 @@
 
 install: 
+    if not exist "$(INSTALLDIR)" mkdir "$(INSTALLDIR)"
     for %%i in ($(EXEC)) do \
-      copy %%i "$(GSDL3HOME)\bin"
+      copy %%i "$(INSTALLDIR)"
  
 clean:
     del *$o 
-        del libtextin.lib libmgpppass.lib
+        del libmgpptext.lib libmgpppass.lib
 

trunk/indexers/mgpp/winMake.bat

@@ -5 +5 @@
 
 if ""%1"" == """" goto all
-if ""%1"" == ""compile"" goto go
+if ""%1"" == ""all"" goto go
 if ""%1"" == ""install"" goto go
 if ""%1"" == ""clean"" goto go