Resolve v2.3.1_winexe merge conflictsjavafx

2 files changed, 15 insertions, 1 deletions

diff --git a/make/scripts/make.gluegen.all.win64.bat b/make/scripts/make.gluegen.all.win64.bat
index fef7c08..65429b5 100755
--- a/make/scripts/make.gluegen.all.win64.bat
+++ b/make/scripts/make.gluegen.all.win64.bat
@@ -3,8 +3,10 @@ set THISDIR="C:\JOGL"
 set J2RE_HOME=c:\jre1.8.0_66_x64

 set JAVA_HOME=c:\jdk1.8.0_66_x64

 set ANT_PATH=C:\apache-ant-1.9.4

+set GIT_PATH=C:\cygwin\bin

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

 

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

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

 

 set LIB_GEN=%THISDIR%\lib

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

diff --git a/src/java/com/jogamp/common/util/IOUtil.java b/src/java/com/jogamp/common/util/IOUtil.java
index 517c21c..342c557 100644
--- a/src/java/com/jogamp/common/util/IOUtil.java
+++ b/src/java/com/jogamp/common/util/IOUtil.java
@@ -83,6 +83,12 @@ public class IOUtil {
     /** Subdirectory within platform's temporary root directory where all JogAmp related temp files are being stored: {@code jogamp} */
     public static final String tmpSubDir = "jogamp";
 
+    private static final String _TestTempDirExec = "jogamp.gluegen.TestTempDirExec";
+    private static final boolean testTempDirExec;
+    static {
+        testTempDirExec = PropertyAccess.getBooleanProperty(_TestTempDirExec, true, true);
+    }
+
     private IOUtil() {}
 
     /**
@@ -923,6 +929,12 @@ public class IOUtil {
     {
         final boolean debug = DEBUG_EXE || DEBUG;
 
+        if( !testTempDirExec ) {
+            if(DEBUG) {
+                System.err.println("IOUtil.testDirExec: <"+dir.getAbsolutePath()+">: Disabled "+_TestTempDirExec);
+            }
+            return false;
+        }
         if (!testFile(dir, true, true)) {
             if( debug ) {
                 System.err.println("IOUtil.testDirExec: <"+dir.getAbsolutePath()+">: Not writeable dir");