Merge SVN 4724, 4725, 4726

OCamlPro · Jul 12, 2024 · 61d2305 · 61d2305
1 parent ced43e3
commit 61d2305
Show file tree

Hide file tree

Showing 18 changed files with 73 additions and 15 deletions.
diff --git a/build_windows/ChangeLog.txt b/build_windows/ChangeLog.txt
@@ -12,6 +12,12 @@
 	  preventing resource compilers to stumble over C definitions
 	* makedist.cmd: cater for new header files
 
+2022-10-01  Simon Sobisch <[email protected]>
+
+	* general for cobc: include new cconv module;
+	  for cobc.vcxproj: add gcos to auxiliary compiler files;
+	  for cobc.vcproj: have auxiliary compiler files included
+
 2022-01-03  Simon Sobisch <[email protected]>
 
 	* general: project files - only include "build_windows" and top_srcdir;

diff --git a/build_windows/vs2008/cobc.vcproj b/build_windows/vs2008/cobc.vcproj
@@ -183,6 +183,10 @@
 			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
+			<File
+				RelativePath="..\..\cobc\cconv.c"
+				>
+			</File>
 			<File
 				RelativePath="..\..\cobc\cobc.c"
 				>
@@ -333,6 +337,10 @@
 			Filter="h;hpp;hxx;hm;inl;inc;xsd"
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
+			<File
+				RelativePath="..\..\cobc\cconv.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\cobc\cobc.h"
 				>
@@ -354,19 +362,15 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\libcob\exception.def"
-				>
-			</File>
-			<File
-				RelativePath="..\..\cobc\flag.def"
+				RelativePath="..\..\libcob\exception-io.def"
 				>
 			</File>
 			<File
 				RelativePath="..\..\libcob\exception.def"
 				>
 			</File>
 			<File
-				RelativePath="..\..\libcob\system.def"
+				RelativePath="..\..\cobc\flag.def"
 				>
 			</File>
 			<File

diff --git a/build_windows/vs2010/cobc.vcxproj b/build_windows/vs2010/cobc.vcxproj
@@ -187,6 +187,7 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\..\cobc\cobc.c" />
+    <ClCompile Include="..\..\cobc\cconv.c" />
     <ClCompile Include="..\..\cobc\codegen.c" />
     <ClCompile Include="..\..\cobc\codeoptim.c" />
     <ClCompile Include="..\..\cobc\config.c" />
@@ -332,6 +333,7 @@
     <ClInclude Include="..\config.h" />
     <ClInclude Include="..\..\libcob.h" />
     <ClInclude Include="..\..\tarstamp.h" />
+    <ClInclude Include="..\..\cobc\cconv.h" />
     <ClInclude Include="..\..\cobc\cobc.h" />
     <ClInclude Include="..\..\cobc\tree.h" />
     <ClInclude Include="..\..\cobc\parser.h" />

diff --git a/build_windows/vs2010/cobc.vcxproj.filters b/build_windows/vs2010/cobc.vcxproj.filters
@@ -36,6 +36,9 @@
     <ClCompile Include="..\..\cobc\cobc.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\cobc\cconv.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\cobc\codegen.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -248,6 +251,9 @@
     <ClInclude Include="..\..\cobc\cobc.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\cobc\cconv.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\libcob\common.h">
       <Filter>Header Files</Filter>
     </ClInclude>

diff --git a/build_windows/vs2012/cobc.vcxproj b/build_windows/vs2012/cobc.vcxproj
@@ -191,6 +191,7 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\..\cobc\cobc.c" />
+    <ClCompile Include="..\..\cobc\cconv.c" />
     <ClCompile Include="..\..\cobc\codegen.c" />
     <ClCompile Include="..\..\cobc\codeoptim.c" />
     <ClCompile Include="..\..\cobc\config.c" />
@@ -336,6 +337,7 @@
     <ClInclude Include="..\config.h" />
     <ClInclude Include="..\..\libcob.h" />
     <ClInclude Include="..\..\tarstamp.h" />
+    <ClInclude Include="..\..\cobc\cconv.h" />
     <ClInclude Include="..\..\cobc\cobc.h" />
     <ClInclude Include="..\..\cobc\tree.h" />
     <ClInclude Include="..\..\cobc\parser.h" />

diff --git a/build_windows/vs2012/cobc.vcxproj.filters b/build_windows/vs2012/cobc.vcxproj.filters
@@ -36,6 +36,9 @@
     <ClCompile Include="..\..\cobc\cobc.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\cobc\cconv.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\cobc\codegen.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -248,6 +251,9 @@
     <ClInclude Include="..\..\cobc\cobc.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\cobc\cconv.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\libcob\common.h">
       <Filter>Header Files</Filter>
     </ClInclude>

diff --git a/build_windows/vs2013/cobc.vcxproj b/build_windows/vs2013/cobc.vcxproj
@@ -193,6 +193,7 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\..\cobc\cobc.c" />
+    <ClCompile Include="..\..\cobc\cconv.c" />
     <ClCompile Include="..\..\cobc\codegen.c" />
     <ClCompile Include="..\..\cobc\codeoptim.c" />
     <ClCompile Include="..\..\cobc\config.c" />
@@ -338,6 +339,7 @@
     <ClInclude Include="..\config.h" />
     <ClInclude Include="..\..\libcob.h" />
     <ClInclude Include="..\..\tarstamp.h" />
+    <ClInclude Include="..\..\cobc\cconv.h" />
     <ClInclude Include="..\..\cobc\cobc.h" />
     <ClInclude Include="..\..\cobc\tree.h" />
     <ClInclude Include="..\..\cobc\parser.h" />

diff --git a/build_windows/vs2013/cobc.vcxproj.filters b/build_windows/vs2013/cobc.vcxproj.filters
@@ -36,6 +36,9 @@
     <ClCompile Include="..\..\cobc\cobc.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\cobc\cconv.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\cobc\codegen.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -248,6 +251,9 @@
     <ClInclude Include="..\..\cobc\cobc.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\cobc\cconv.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\libcob\common.h">
       <Filter>Header Files</Filter>
     </ClInclude>

diff --git a/build_windows/vs2015/cobc.vcxproj b/build_windows/vs2015/cobc.vcxproj
@@ -191,6 +191,7 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\..\cobc\cobc.c" />
+    <ClCompile Include="..\..\cobc\cconv.c" />
     <ClCompile Include="..\..\cobc\codegen.c" />
     <ClCompile Include="..\..\cobc\codeoptim.c" />
     <ClCompile Include="..\..\cobc\config.c" />
@@ -336,6 +337,7 @@
     <ClInclude Include="..\config.h" />
     <ClInclude Include="..\..\libcob.h" />
     <ClInclude Include="..\..\tarstamp.h" />
+    <ClInclude Include="..\..\cobc\cconv.h" />
     <ClInclude Include="..\..\cobc\cobc.h" />
     <ClInclude Include="..\..\cobc\tree.h" />
     <ClInclude Include="..\..\cobc\parser.h" />

diff --git a/build_windows/vs2015/cobc.vcxproj.filters b/build_windows/vs2015/cobc.vcxproj.filters
@@ -36,6 +36,9 @@
     <ClCompile Include="..\..\cobc\cobc.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\cobc\cconv.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\cobc\codegen.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -248,6 +251,9 @@
     <ClInclude Include="..\..\cobc\cobc.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\cobc\cconv.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\libcob\common.h">
       <Filter>Header Files</Filter>
     </ClInclude>

diff --git a/build_windows/vs2017/cobc.vcxproj b/build_windows/vs2017/cobc.vcxproj
@@ -193,6 +193,7 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\..\cobc\cobc.c" />
+    <ClCompile Include="..\..\cobc\cconv.c" />
     <ClCompile Include="..\..\cobc\codegen.c" />
     <ClCompile Include="..\..\cobc\codeoptim.c" />
     <ClCompile Include="..\..\cobc\config.c" />
@@ -338,6 +339,7 @@
     <ClInclude Include="..\config.h" />
     <ClInclude Include="..\..\libcob.h" />
     <ClInclude Include="..\..\tarstamp.h" />
+    <ClInclude Include="..\..\cobc\cconv.h" />
     <ClInclude Include="..\..\cobc\cobc.h" />
     <ClInclude Include="..\..\cobc\tree.h" />
     <ClInclude Include="..\..\cobc\parser.h" />

diff --git a/build_windows/vs2017/cobc.vcxproj.filters b/build_windows/vs2017/cobc.vcxproj.filters
@@ -36,6 +36,9 @@
     <ClCompile Include="..\..\cobc\cobc.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\cobc\cconv.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\cobc\codegen.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -248,6 +251,9 @@
     <ClInclude Include="..\..\cobc\cobc.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\cobc\cconv.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\libcob\common.h">
       <Filter>Header Files</Filter>
     </ClInclude>

diff --git a/build_windows/vs2019/cobc.vcxproj b/build_windows/vs2019/cobc.vcxproj
@@ -193,6 +193,7 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\..\cobc\cobc.c" />
+    <ClCompile Include="..\..\cobc\cconv.c" />
     <ClCompile Include="..\..\cobc\codegen.c" />
     <ClCompile Include="..\..\cobc\codeoptim.c" />
     <ClCompile Include="..\..\cobc\config.c" />
@@ -338,6 +339,7 @@
     <ClInclude Include="..\config.h" />
     <ClInclude Include="..\..\libcob.h" />
     <ClInclude Include="..\..\tarstamp.h" />
+    <ClInclude Include="..\..\cobc\cconv.h" />
     <ClInclude Include="..\..\cobc\cobc.h" />
     <ClInclude Include="..\..\cobc\tree.h" />
     <ClInclude Include="..\..\cobc\parser.h" />

diff --git a/build_windows/vs2019/cobc.vcxproj.filters b/build_windows/vs2019/cobc.vcxproj.filters
@@ -36,6 +36,9 @@
     <ClCompile Include="..\..\cobc\cobc.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\cobc\cconv.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\cobc\codegen.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -248,6 +251,9 @@
     <ClInclude Include="..\..\cobc\cobc.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\cobc\cconv.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\libcob\common.h">
       <Filter>Header Files</Filter>
     </ClInclude>

diff --git a/cobc/cconv.c b/cobc/cconv.c
@@ -1,7 +1,6 @@
 /*
-   Copyright (C) 2022 Free Software Foundation, Inc.  Written by Keisuke
-   Nishida, Roger While, Simon Sobisch, Edwart Hart, Ron Norman, Nicolas
-   Berthier
+   Copyright (C) 2005,2006,2022 Free Software Foundation, Inc.
+   Written by Roger While, Nicolas Berthier, Simon Sobisch
 
    This file is part of GnuCOBOL.
 
@@ -18,8 +17,11 @@
    You should have received a copy of the GNU General Public License
    along with GnuCOBOL.  If not, see <https://www.gnu.org/licenses/>.
 */
-#include "cconv.h"
+
+#include <stdio.h>		/* for FILE, used in cobc.h */
+
 #include "cobc.h"		/* for cb_strcasecmp */
+#include "cconv.h"
 
 /* TODO: Maybe use iconv or gconv before extending to other character sets while
    using standard naming scheme?  Note, however, that specifications for GCOS7

diff --git a/cobc/cconv.h b/cobc/cconv.h
@@ -1,7 +1,6 @@
 /*
-   Copyright (C) 2022 Free Software Foundation, Inc.  Written by Keisuke
-   Nishida, Roger While, Simon Sobisch, Edwart Hart, Ron Norman, Nicolas
-   Berthier
+   Copyright (C) 2005,2006,2022 Free Software Foundation, Inc.
+   Written by Roger While, Nicolas Berthier, Simon Sobisch
 
    This file is part of GnuCOBOL.
 

diff --git a/cobc/cobc.h b/cobc/cobc.h
@@ -29,10 +29,8 @@
 #ifdef	HAVE_UNISTD_H
 #include <unistd.h>
 #endif
-#include <stdio.h>	/* for FILE */
 
 #include "../libcob/common.h"
-#include "cconv.h"
 
 #ifdef	ENABLE_NLS
 #include "../lib/gettext.h"

diff --git a/cobc/codegen.c b/cobc/codegen.c
@@ -37,6 +37,7 @@
 
 #include "cobc.h"
 #include "tree.h"
+#include "cconv.h"
 
 #if !defined(COB_ALIGN_KNOWN) && !defined(COB_ALLOW_UNALIGNED)
 #error System requires data alignment which is unknown