Changeset 32642 for main

Timestamp:

2018-11-30T19:42:21+13:00 (5 years 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.

File:

• main/trunk/greenstone2/common-src/indexers/packages/windows/iconv/GS-README-VS14-VS2015-AND-LATER.txt (modified) (5 diffs)

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

@@ -11 +11 @@
 
 [
-NO NEED FOR STEP 1
+NO 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:
+
 X 1. Libiconv 1.11 appears to be the last version of the package that can be compiled with Visual Studio.
 Subsequent versions require Mingw and/or Cygwin and won't work easily with our existing GS compile workflow.
@@ -23 +24 @@
 ]
 
-2. In the Makefile.msvc files inside gs-libiconv 1.11 that are listed below,
+2. In the Makefile.msvc files inside the extracted iconv folder that are listed below,
 change the now syntax error
 
@@ -30 +31 @@
     !if "$(DEBUG)" == "1"
     
-(example is here:
+(an example of the correct way of doing this was found here:
 https://github.com/adobe/chromium/blob/master/third_party/libxslt/win32/Makefile.msvc)
 
@@ -41 +42 @@
 - ./tests/Makefile.msvc
 
-Not sure if other similar instances need similar changes, e.g. !if !$(DLL)
-but they didn't give rise to syntax errors or GS3 compilation failures, so I left them as is.
+Not sure if other similar instances in Greenstone win make files need similar changes, e.g. !if !$(DLL)
+but our other win make files didn't give rise to syntax errors or GS3 compilation failures, so I left them as is.
 
 
@@ -79 +80 @@
 - The solution was indicated at: https://github.com/chansen/p5-time-moment/issues/12
 That new VS compilers had their own stdbool.h where bool was typedefed to some other type with a different size in memory.
-So we have to use this stdbool.had
+So we have to use VS' stdbool.h instead of iconv.zip's stdbool.h
 
 My solution was therefore to get rid of iconv/windows/stdbool.h for the iconv-VS14+ version,
-to let it find the iconv in VS14+ instead.
+to force it to find the stdbool.h in VS14+ instead.
 So I renamed iconv/windows/stdbool.h to iconv/windows/stdbool.unusable_for_VS14plus