Show
Ignore:
Timestamp:
09.05.2014 19:39:37 (5 years ago)
Author:
ak19
Message:

Compiling formatconverter on Windows

Location:
main/trunk/greenstone2/runtime-src/src/recpt
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/runtime-src/src/recpt/formatconverter.cpp

    r29042 r29047  
    8282 
    8383  if(!silent) { 
    84     cout << "Enter EOF (Windows: Ctrl-Z | Linux: Ctrl-D | Mac OS X: Ctrl-D) to terminate input>\n"; 
     84    cout << "Enter EOF (Windows: Ctrl-Z+ENTER | Linux: Ctrl-D | Mac OS X: Ctrl-D) to terminate input>\n"; 
    8585  } 
    8686   
     
    8888  // http://stackoverflow.com/questions/13148887/yet-another-c-cin-loop-issue 
    8989  // terminating input: http://www.cplusplus.com/forum/beginner/49993/ 
     90  // http://stackoverflow.com/questions/16132971/how-to-send-ctrlz-in-c 
     91  //http://www.cplusplus.com/reference/ios/ios_base/iostate/ 
     92  //http://www.cplusplus.com/reference/ios/ios_base/iostate/ 
    9093 
    9194  for (string line; getline(cin, line); ) 
  • main/trunk/greenstone2/runtime-src/src/recpt/win32.mak

    r28909 r29047  
    256256    dynamicclassifieraction.cpp \ 
    257257    extlinkaction.cpp \ 
     258    formatconverter.cpp \ 
    258259    formattools.cpp \ 
    259260    gtiaction.cpp \ 
     
    347348    "$(COMMON_DIR)\src\lib\gsdllib.lib" 
    348349 
     350CONVERTER_OBJECTS = \ 
     351    cgiargs.obj \ 
     352    cgiutils.obj \ 
     353    formattools.obj \ 
     354    formatconverter.obj \ 
     355    summarise.obj    
     356     
    349357EXECUTABLE_OBJECTS = \ 
    350358    $(OBJECTS) \ 
     
    353361EXECUTABLE = library.cgi 
    354362 
    355  
    356363# Default target: make gsdlrecpt.lib if LOCAL_LIBRARY is set, otherwise both gsdlrecpt.lib and library.exe 
    357364!IF $(LOCAL_LIBRARY) 
    358 all: $(LIBRARY) $(APACHE_MODULE) 
    359 !ELSE 
    360 all: $(LIBRARY) $(EXECUTABLE) $(APACHE_MODULE) 
     365all: $(LIBRARY) $(APACHE_MODULE) formatconverter.exe 
     366!ELSE 
     367all: $(LIBRARY) $(EXECUTABLE) $(APACHE_MODULE) formatconverter.exe 
    361368!ENDIF 
    362369 
     
    368375    $(LINK) $(EXECUTABLE_OBJECTS) $(LIBS) 
    369376 
    370  
     377formatconverter.exe: $(CONVERTER_OBJECTS) 
     378    $(LINK) $(CONVERTER_OBJECTS) "$(COMMON_DIR)\src\lib\gsdllib.lib" "$(PROTOCOL_DIR)\gsdlprotocol.lib" "$(COLSERVR_DIR)\gsdlcolservr.lib" 
     379     
    371380mod_gsdl.obj: mod_gsdl.cpp 
    372381    $(CC) -nologo /MD /W3 /D WIN32 /D _WINDOWS /D NDEBUG -c  $(CXXFLAGS) $(DEFS) $(INCLUDES) -D_APACHE_MOD=2 $(APXS_CFLAGS) mod_gsdl.cpp 
     
    400409!IF $(LOCAL_LIBRARY) 
    401410install: 
     411    if exist "formatconverter.exe" copy formatconverter.exe "$(GSDL_DIR)\bin\windows" 
    402412!ELSE 
    403413install: $(EXECUTABLE) 
     414    if exist "formatconverter.exe" copy formatconverter.exe "$(GSDL_DIR)\bin\windows" 
    404415!IF "$(PROCESSOR_ARCHITECTURE)"==""  
    405416    copy $(EXECUTABLE) "$(GSDL_DIR)\cgi-bin\windows" 
     
    410421!ELSE 
    411422    copy $(EXECUTABLE) "$(GSDL_DIR)\cgi-bin\windows64" 
    412 !ENDIF 
     423!ENDIF   
    413424!ENDIF 
    414425