Changeset 29047 for main/trunk/greenstone2/runtime-src
- Timestamp:
- 2014-05-09T19:39:37+12:00 (10 years ago)
- Location:
- main/trunk/greenstone2/runtime-src/src/recpt
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/runtime-src/src/recpt/formatconverter.cpp
r29042 r29047 82 82 83 83 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"; 85 85 } 86 86 … … 88 88 // http://stackoverflow.com/questions/13148887/yet-another-c-cin-loop-issue 89 89 // 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/ 90 93 91 94 for (string line; getline(cin, line); ) -
main/trunk/greenstone2/runtime-src/src/recpt/win32.mak
r28909 r29047 256 256 dynamicclassifieraction.cpp \ 257 257 extlinkaction.cpp \ 258 formatconverter.cpp \ 258 259 formattools.cpp \ 259 260 gtiaction.cpp \ … … 347 348 "$(COMMON_DIR)\src\lib\gsdllib.lib" 348 349 350 CONVERTER_OBJECTS = \ 351 cgiargs.obj \ 352 cgiutils.obj \ 353 formattools.obj \ 354 formatconverter.obj \ 355 summarise.obj 356 349 357 EXECUTABLE_OBJECTS = \ 350 358 $(OBJECTS) \ … … 353 361 EXECUTABLE = library.cgi 354 362 355 356 363 # Default target: make gsdlrecpt.lib if LOCAL_LIBRARY is set, otherwise both gsdlrecpt.lib and library.exe 357 364 !IF $(LOCAL_LIBRARY) 358 all: $(LIBRARY) $(APACHE_MODULE) 359 !ELSE 360 all: $(LIBRARY) $(EXECUTABLE) $(APACHE_MODULE) 365 all: $(LIBRARY) $(APACHE_MODULE) formatconverter.exe 366 !ELSE 367 all: $(LIBRARY) $(EXECUTABLE) $(APACHE_MODULE) formatconverter.exe 361 368 !ENDIF 362 369 … … 368 375 $(LINK) $(EXECUTABLE_OBJECTS) $(LIBS) 369 376 370 377 formatconverter.exe: $(CONVERTER_OBJECTS) 378 $(LINK) $(CONVERTER_OBJECTS) "$(COMMON_DIR)\src\lib\gsdllib.lib" "$(PROTOCOL_DIR)\gsdlprotocol.lib" "$(COLSERVR_DIR)\gsdlcolservr.lib" 379 371 380 mod_gsdl.obj: mod_gsdl.cpp 372 381 $(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) 401 410 install: 411 if exist "formatconverter.exe" copy formatconverter.exe "$(GSDL_DIR)\bin\windows" 402 412 !ELSE 403 413 install: $(EXECUTABLE) 414 if exist "formatconverter.exe" copy formatconverter.exe "$(GSDL_DIR)\bin\windows" 404 415 !IF "$(PROCESSOR_ARCHITECTURE)"=="" 405 416 copy $(EXECUTABLE) "$(GSDL_DIR)\cgi-bin\windows" … … 410 421 !ELSE 411 422 copy $(EXECUTABLE) "$(GSDL_DIR)\cgi-bin\windows64" 412 !ENDIF 423 !ENDIF 413 424 !ENDIF 414 425
Note:
See TracChangeset
for help on using the changeset viewer.