Changeset 29047 for main

Timestamp:

2014-05-09T19:39:37+12:00 (10 years ago)

Author:

ak19

Message:

Compiling formatconverter on Windows

Location:

main/trunk/greenstone2/runtime-src/src/recpt

Files:

• formatconverter.cpp (modified) (2 diffs)
• win32.mak (modified) (6 diffs)

main/trunk/greenstone2/runtime-src/src/recpt/formatconverter.cpp

@@ -82 +82 @@
 
   if(!silent) {
-    cout << "Enter EOF (Windows: Ctrl-Z | Linux: Ctrl-D | Mac OS X: Ctrl-D) to terminate input>\n";
+    cout << "Enter EOF (Windows: Ctrl-Z+ENTER | Linux: Ctrl-D | Mac OS X: Ctrl-D) to terminate input>\n";
   }
   
@@ -88 +88 @@
   // http://stackoverflow.com/questions/13148887/yet-another-c-cin-loop-issue
   // terminating input: http://www.cplusplus.com/forum/beginner/49993/
+  // http://stackoverflow.com/questions/16132971/how-to-send-ctrlz-in-c
+  //http://www.cplusplus.com/reference/ios/ios_base/iostate/
+  //http://www.cplusplus.com/reference/ios/ios_base/iostate/
 
   for (string line; getline(cin, line); )

main/trunk/greenstone2/runtime-src/src/recpt/win32.mak

@@ -256 +256 @@
     dynamicclassifieraction.cpp \
     extlinkaction.cpp \
+    formatconverter.cpp \
     formattools.cpp \
     gtiaction.cpp \
@@ -347 +348 @@
     "$(COMMON_DIR)\src\lib\gsdllib.lib"
 
+CONVERTER_OBJECTS = \
+    cgiargs.obj \
+    cgiutils.obj \
+    formattools.obj \
+    formatconverter.obj \
+    summarise.obj   
+    
 EXECUTABLE_OBJECTS = \
     $(OBJECTS) \
@@ -353 +361 @@
 EXECUTABLE = library.cgi
 
-
 # Default target: make gsdlrecpt.lib if LOCAL_LIBRARY is set, otherwise both gsdlrecpt.lib and library.exe
 !IF $(LOCAL_LIBRARY)
-all: $(LIBRARY) $(APACHE_MODULE)
-!ELSE
-all: $(LIBRARY) $(EXECUTABLE) $(APACHE_MODULE)
+all: $(LIBRARY) $(APACHE_MODULE) formatconverter.exe
+!ELSE
+all: $(LIBRARY) $(EXECUTABLE) $(APACHE_MODULE) formatconverter.exe
 !ENDIF
 
@@ -368 +375 @@
     $(LINK) $(EXECUTABLE_OBJECTS) $(LIBS)
 
-
+formatconverter.exe: $(CONVERTER_OBJECTS)
+    $(LINK) $(CONVERTER_OBJECTS) "$(COMMON_DIR)\src\lib\gsdllib.lib" "$(PROTOCOL_DIR)\gsdlprotocol.lib" "$(COLSERVR_DIR)\gsdlcolservr.lib"
+    
 mod_gsdl.obj: mod_gsdl.cpp
     $(CC) -nologo /MD /W3 /D WIN32 /D _WINDOWS /D NDEBUG -c  $(CXXFLAGS) $(DEFS) $(INCLUDES) -D_APACHE_MOD=2 $(APXS_CFLAGS) mod_gsdl.cpp
@@ -400 +409 @@
 !IF $(LOCAL_LIBRARY)
 install:
+    if exist "formatconverter.exe" copy formatconverter.exe "$(GSDL_DIR)\bin\windows"
 !ELSE
 install: $(EXECUTABLE)
+    if exist "formatconverter.exe" copy formatconverter.exe "$(GSDL_DIR)\bin\windows"
 !IF "$(PROCESSOR_ARCHITECTURE)"=="" 
     copy $(EXECUTABLE) "$(GSDL_DIR)\cgi-bin\windows"
@@ -410 +421 @@
 !ELSE
     copy $(EXECUTABLE) "$(GSDL_DIR)\cgi-bin\windows64"
-!ENDIF
+!ENDIF  
 !ENDIF