Changeset 32642

Show
Ignore:
Timestamp:
30.11.2018 19:42:21 (2 weeks ago)
Author:
ak19
Message:

In hunting for a recent change that introduced a new warning message, am finding lots of grammatical mistakes in commits, so fixing them.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/common-src/indexers/packages/windows/iconv/GS-README-VS14-VS2015-AND-LATER.txt

    r32637 r32642  
    1111 
    1212[ 
    13 NO NEED FOR STEP 1 
     13NO NEED FOR STEP 1, as windows' iconv.zip requires the same changes as the linux gs-libiconv 1.11 tarball to get it to compile on windows anyway: 
     14 
    1415X 1. Libiconv 1.11 appears to be the last version of the package that can be compiled with Visual Studio. 
    1516Subsequent versions require Mingw and/or Cygwin and won't work easily with our existing GS compile workflow. 
     
    2324] 
    2425 
    25 2. In the Makefile.msvc files inside gs-libiconv 1.11 that are listed below, 
     262. In the Makefile.msvc files inside the extracted iconv folder that are listed below, 
    2627change the now syntax error 
    2728 
     
    3031    !if "$(DEBUG)" == "1" 
    3132     
    32 (example is here: 
     33(an example of the correct way of doing this was found here: 
    3334https://github.com/adobe/chromium/blob/master/third_party/libxslt/win32/Makefile.msvc) 
    3435 
     
    4142- ./tests/Makefile.msvc 
    4243 
    43 Not sure if other similar instances need similar changes, e.g. !if !$(DLL) 
    44 but they didn't give rise to syntax errors or GS3 compilation failures, so I left them as is. 
     44Not sure if other similar instances in Greenstone win make files need similar changes, e.g. !if !$(DLL) 
     45but our other win make files didn't give rise to syntax errors or GS3 compilation failures, so I left them as is. 
    4546 
    4647 
     
    7980- The solution was indicated at: https://github.com/chansen/p5-time-moment/issues/12 
    8081That new VS compilers had their own stdbool.h where bool was typedefed to some other type with a different size in memory. 
    81 So we have to use this stdbool.had 
     82So we have to use VS' stdbool.h instead of iconv.zip's stdbool.h 
    8283 
    8384My solution was therefore to get rid of iconv/windows/stdbool.h for the iconv-VS14+ version, 
    84 to let it find the iconv in VS14+ instead. 
     85to force it to find the stdbool.h in VS14+ instead. 
    8586So I renamed iconv/windows/stdbool.h to iconv/windows/stdbool.unusable_for_VS14plus 
    8687