Build Update: CMake 2.8.10.2 -> 3.15.2 (Windows + MacOS), Mingw64 4.8.1 -> 8.1.0

7 files changed, 39 insertions, 31 deletions

diff --git a/LICENSE.txt b/LICENSE.txt
index 1b21c36..4ab32a1 100755
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -23,7 +23,7 @@ by the generated and deployed GlueGen binaries.
 L.1) The GlueGen source tree contains code from the JogAmp Community
      which is covered by the Simplified BSD 2-clause license:
 
-   Copyright 2010 JogAmp Community. All rights reserved.
+   Copyright 2010 - 2019 JogAmp Community. All rights reserved.
   
    Redistribution and use in source and binary forms, with or without modification, are
    permitted provided that the following conditions are met:
diff --git a/doc/HowToBuild.html b/doc/HowToBuild.html
index daf980f..168cc27 100644
--- a/doc/HowToBuild.html
+++ b/doc/HowToBuild.html
@@ -69,6 +69,7 @@
                                         <li>awk</li>
                                         <li>p7zip-full ???</li>
                                         <li>gcc</li>
+                                        <li>cmake</li>
                                     </ul>
                             </ul>
                         </li>
@@ -84,12 +85,13 @@
                                         <li>gawk</li>
                                         <li>p7zip-full</li>
                                         <li>gcc</li>
+                                        <li>cmake</li>
                                     </ul>
                                     One liner install command:
                                     <ul>
                                       <li><b>Debian</b> 10 Buster
                                       <pre>
-apt-get install openjdk-11-jre openjdk-11-jdk ant git-all gawk p7zip-full gcc
+apt-get install openjdk-11-jre openjdk-11-jdk ant git-all gawk p7zip-full gcc cmake
                                       </pre></li>
                                     </ul>
                                     Optional: Add <i>kernel</i> build utilities:
@@ -114,6 +116,7 @@ apt-get install lib32z1 lib32ncurses5 gcc-multilib lib32gcc1 lib32gomp1 lib32itm
                                         <li>gawk</li>
                                         <li>p7zip-full</li>
                                         <li>gcc</li>
+                                        <li>cmake</li>
                                     </ul>
                                 </li>
                                 <li> <b>CentOS 7 / Red Hat Enterprise Linux 7.6</b> or later<br/>
@@ -124,6 +127,7 @@ apt-get install lib32z1 lib32ncurses5 gcc-multilib lib32gcc1 lib32gomp1 lib32itm
                                         <li>gawk</li>
                                         <li>p7zip-full</li>
                                         <li>gcc</li>
+                                        <li>cmake</li>
                                     </ul>
                                 </li>
                             </ul>
@@ -144,6 +148,7 @@ apt-get install lib32z1 lib32ncurses5 gcc-multilib lib32gcc1 lib32gomp1 lib32itm
                             <ul>
                                 <li>git &ge; 2.11 provided by Xcode &ge; 8.3.3</li>
                                 <li>awk is provided by MacOS</li>
+                                <li><a href="https://cmake.org/">CMake 3.15.2</a>, and install the <a href="https://stackoverflow.com/questions/30668601/installing-cmake-command-line-tools-on-a-mac">command line tools</a></li>
                                 <li><a href="http://www.apple.com/macosx/">Mac OS</a> 10.13 or later (note: may not work with earlier releases) </li>
                                 <li><a href="http://developer.apple.com/technologies/xcode.html">Xcode</a> 8.3.3 or later for gcc, etc (included in MacOS)</li>
                             </ul>
@@ -153,21 +158,19 @@ apt-get install lib32z1 lib32ncurses5 gcc-multilib lib32gcc1 lib32gomp1 lib32itm
                                 <li>Windows XP or later </li>
                                 <li>git is provided by <a href="https://cygwin.com">cygwin</a></li>
                                 <li>gawk is provided by <a href="https://cygwin.com">cygwin</a></li>
-                                <li> <a href="http://mingw-w64.sourceforge.net/">MinGW64</a>
+                                <li> <a href="http://mingw-w64.org/">MinGW64</a> (<a href="https://sourceforge.net/projects/mingw-w64/files/">files on sourceforge</a>)
                                   <ul>
-                                    <li> <a href="http://sourceforge.net/projects/mingwbuilds/files/mingw-builds-install/mingw-builds-install.exe/download">Installer</a>
+                                    <li> <a href="https://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win32/Personal%20Builds/mingw-builds/8.1.0/threads-win32/sjlj/i686-8.1.0-release-win32-sjlj-rt_v6-rev0.7z">i686-8.1.0-release-win32-sjlj-rt_v6-rev0.7z</a>
                                       <ul>
-                                        <li>mingw-build-install</li>
-                                        <li>version: 4.8.1</li>
+                                        <li>version: 8.1.0</li>
                                         <li>host: x32</li>
                                         <li>threading: win32</li>
                                         <li>exceptions: SJLJ</li>
-                                        <li>revision: 5</li>
+                                        <li>revision: 0</li>
                                       </ul></li>
-                                    <li> or <a href="http://sourceforge.net/projects/mingwbuilds/files/host-windows/releases/">manual</a> 
-                                         via  <a href="http://sourceforge.net/projects/mingwbuilds/files/host-windows/releases/4.8.1/32-bit/threads-win32/sjlj/">7z archive file</a></li>
                                   </ul>
                                 </li>
+                                <li><a href="https://cmake.org/">CMake 3.15.2</a> 32bit version</li>
                             </ul>
                         </li>
                         <li> <b>Windows</b>/x86_64 (64-bit)
@@ -175,26 +178,27 @@ apt-get install lib32z1 lib32ncurses5 gcc-multilib lib32gcc1 lib32gomp1 lib32itm
                                 <li>Windows XP or later </li>
                                 <li>git is provided by <a href="https://cygwin.com">cygwin</a></li>
                                 <li>gawk is provided by <a href="https://cygwin.com">cygwin</a></li>
-                                <li> <a href="http://mingw-w64.sourceforge.net/">MinGW64</a>
+                                <li> <a href="http://mingw-w64.org/">MinGW64</a> (<a href="https://sourceforge.net/projects/mingw-w64/files/">files on sourceforge</a>)
                                   <ul>
-                                    <li> <a href="http://sourceforge.net/projects/mingwbuilds/files/mingw-builds-install/mingw-builds-install.exe/download">Installer</a>
+                                    <li> <a href="https://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win64/Personal%20Builds/mingw-builds/8.1.0/threads-win32/sjlj/x86_64-8.1.0-release-win32-sjlj-rt_v6-rev0.7z">x86_64-8.1.0-release-win32-sjlj-rt_v6-rev0.7z</a>
                                       <ul>
-                                        <li>mingw-build-install</li>
-                                        <li>version: 4.8.1</li>
+                                        <li>version: 8.1.0</li>
                                         <li>host: x64</li>
                                         <li>threading: win32</li>
                                         <li>exceptions: SJLJ</li>
-                                        <li>revision: 5</li>
+                                        <li>revision: 0</li>
                                       </ul></li>
-                                    <li> or <a href="http://sourceforge.net/projects/mingwbuilds/files/host-windows/releases/">manual</a> 
-                                         via  <a href="http://sourceforge.net/projects/mingwbuilds/files/host-windows/releases/4.8.1/64-bit/threads-win32/sjlj/">7z archive file</a></li>
                                   </ul>
                                 </li>
+                                <li><a href="https://cmake.org/">CMake 3.15.2</a> 64bit version</li>
                             </ul>
                         </li>
                     </ul>
 
                     <p>
+                        CMake has been added here for JOAL and JOGL.
+                    </p>
+                    <p>
                         Additional platforms such as FreeBSD and HP/UX are handled by the
                         build system, but are not officially supported.
                     </p>
diff --git a/make/build-test.xml b/make/build-test.xml
index f39f0bf..736a82a 100644
--- a/make/build-test.xml
+++ b/make/build-test.xml
@@ -579,7 +579,7 @@ chmod 644 ${results}/* \${line.separator}
         </gluegen>
     </target>
 
-    <target name="junit.test1.c.build" depends="junit.test1i.c.build, junit.test1p1.c.build, junit.test1p2.c.build" unless="build.javaonly" />
+    <target name="junit.test1.c.build" depends="junit.test1i.c.build, c.rename.lib.test1.mingw, junit.test1p1.c.build, c.rename.lib.test1p1.mingw, junit.test1p2.c.build, c.rename.lib.test1p2.mingw" unless="build.javaonly" />
 
     <!-- this is the test1 implementation -->
     <target name="junit.test1i.c.build">
@@ -589,21 +589,21 @@ chmod 644 ${results}/* \${line.separator}
 
         <!-- Windows hacks ro make a proper DLL -->
         <linker id="linker.test1.dll.cfg.id" extends="${linker.cfg.id}">
-            <linkerarg value="-Wl,-soname=test1.dll" if="isMingW"/>
-            <linkerarg value="-Wl,--output=test1.dll" if="isMingW"/>
         </linker>
 
         <c.build c.compiler.src.files="junit.test1i.c.src.files"
                  output.lib.name="test1"
                  compiler.cfg.id="${compiler.cfg.id}"
                  linker.cfg.id="linker.test1.dll.cfg.id"/>
+
+    </target>
+    <target name="c.rename.lib.test1.mingw" if="isMingW">
+      <move file="${build_t.lib}/libtest1.so" tofile="${build_t.lib}/test1.dll" />
     </target>
 
     <!-- this is a fixed binding to the test1 implementation -->
     <target name="junit.test1p1.c.build">
         <linker id="linker.test1.fixed.cfg.id" extends="${linker.cfg.id}">
-            <linkerarg value="-Wl,-soname=Bindingtest1p1.dll" if="isMingW"/>
-            <linkerarg value="-Wl,--output=Bindingtest1p1.dll" if="isMingW"/>
             <syslibset dir="${build_t.lib}" libs="test1"/>
         </linker>
 
@@ -620,12 +620,13 @@ chmod 644 ${results}/* \${line.separator}
                  compiler.cfg.id="${compiler.cfg.id}"
                  linker.cfg.id="linker.test1.fixed.cfg.id"/>
     </target>
+    <target name="c.rename.lib.test1p1.mingw" if="isMingW">
+      <move file="${build_t.lib}/libBindingtest1p1.so" tofile="${build_t.lib}/Bindingtest1p1.dll" />
+    </target>
 
     <!-- this is a dynamic lookup binding to the test1 implementation -->
     <target name="junit.test1p2.c.build">
         <linker id="linker.test1.runtime.cfg.id" extends="${linker.cfg.id}">
-            <linkerarg value="-Wl,-soname=Bindingtest1p2.dll" if="isMingW"/>
-            <linkerarg value="-Wl,--output=Bindingtest1p2.dll" if="isMingW"/>
         </linker>
 
         <patternset id="junit.test1p2.c.src.files">
@@ -641,6 +642,9 @@ chmod 644 ${results}/* \${line.separator}
                  compiler.cfg.id="${compiler.cfg.id}"
                  linker.cfg.id="linker.test1.runtime.cfg.id"/>
     </target>
+    <target name="c.rename.lib.test1p2.mingw" if="isMingW">
+      <move file="${build_t.lib}/libBindingtest1p2.so" tofile="${build_t.lib}/Bindingtest1p2.dll" />
+    </target>
 
     <!-- 
 
diff --git a/make/scripts/java-win32.bat b/make/scripts/java-win32.bat
index eb84ee0..2ed87c3 100755
--- a/make/scripts/java-win32.bat
+++ b/make/scripts/java-win32.bat
@@ -9,8 +9,8 @@ set BLD_DIR=..\%BLD_SUB%
 REM set LIB_DIR=..\%BLD_SUB%\obj;..\%BLD_SUB%\test\build\natives

 REM set LIB_DIR=..\%BLD_SUB%\test\build\natives

 

-REM set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw\bin;%LIB_DIR%;%PATH%

-set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw\bin;%PATH%

+REM set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw32\bin;%LIB_DIR%;%PATH%

+set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw32\bin;%PATH%

 

 set CP_ALL=.;lib\junit.jar;%ANT_PATH%\lib\ant.jar;%ANT_PATH%\lib\ant-junit.jar;lib/semantic-versioning/semver.jar;%BLD_DIR%\gluegen-rt.jar;%BLD_DIR%\gluegen.jar;%BLD_DIR%\gluegen-test-util.jar;%BLD_DIR%\test\build\gluegen-test.jar

 

diff --git a/make/scripts/java-win64.bat b/make/scripts/java-win64.bat
index e52b4c9..283fe4c 100755
--- a/make/scripts/java-win64.bat
+++ b/make/scripts/java-win64.bat
@@ -9,8 +9,8 @@ set BLD_DIR=..\%BLD_SUB%
 REM set LIB_DIR=..\%BLD_SUB%\obj;..\%BLD_SUB%\test\build\natives

 REM set LIB_DIR=..\%BLD_SUB%\test\build\natives

 

-REM set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw\bin;%LIB_DIR%;%PATH%

-set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw\bin;%PATH%

+REM set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw64\bin;%LIB_DIR%;%PATH%

+set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw64\bin;%PATH%

 

 set CP_ALL=.;lib\junit.jar;%ANT_PATH%\lib\ant.jar;%ANT_PATH%\lib\ant-junit.jar;lib/semantic-versioning/semver.jar;lib\TestJarsInJar.jar;%BLD_DIR%\gluegen-rt.jar;%BLD_DIR%\gluegen.jar;%BLD_DIR%\gluegen-test-util.jar;%BLD_DIR%\test\build\gluegen-test.jar

 

diff --git a/make/scripts/make.gluegen.all.win32.bat b/make/scripts/make.gluegen.all.win32.bat
index 54a6bca..f32c3cd 100755
--- a/make/scripts/make.gluegen.all.win32.bat
+++ b/make/scripts/make.gluegen.all.win32.bat
@@ -6,10 +6,10 @@ set ANT_PATH=C:\apache-ant-1.10.5
 set GIT_PATH=C:\cygwin\bin

 set SEVENZIP=C:\Program Files\7-Zip

 

-set CMAKE_PATH=C:\cmake-2.8.10.2-win32-x86

-set CMAKE_C_COMPILER=c:\mingw\bin\gcc

+set CMAKE_PATH=C:\cmake-3.15.2-win32-x86

+set CMAKE_C_COMPILER=c:\mingw32\bin\gcc

 

-set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw\bin;%CMAKE_PATH%\bin;%GIT_PATH%;%SEVENZIP%;%PATH%

+set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw32\bin;%CMAKE_PATH%\bin;%GIT_PATH%;%SEVENZIP%;%PATH%

 

 set LIB_GEN=%THISDIR%\lib

 set CLASSPATH=.;%THISDIR%\build-win32\classes

diff --git a/make/scripts/make.gluegen.all.win64.bat b/make/scripts/make.gluegen.all.win64.bat
index 1fea6c4..3601822 100755
--- a/make/scripts/make.gluegen.all.win64.bat
+++ b/make/scripts/make.gluegen.all.win64.bat
@@ -6,7 +6,7 @@ set ANT_PATH=C:\apache-ant-1.10.5
 set GIT_PATH=C:\cygwin\bin

 set SEVENZIP=C:\Program Files\7-Zip

 

-set CMAKE_PATH=C:\cmake-2.8.10.2-win32-x86

+set CMAKE_PATH=C:\cmake-3.15.2-win64-x64

 set CMAKE_C_COMPILER=c:\mingw64\bin\gcc

 

 set PATH=%J2RE_HOME%\bin;%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw64\bin;%CMAKE_PATH%\bin;%GIT_PATH%;%SEVENZIP%;%PATH%