Menu
▾
▴
[Wrapper-cvs] SF.net SVN: wrapper:[1937] trunk/wrapper
|
From: <mor...@us...> - 2015-09-04 04:29:01
|
Revision: 1937
http://sourceforge.net/p/wrapper/code/1937
Author: mortenson
Date: 2015-09-04 04:28:59 +0000 (Fri, 04 Sep 2015)
Log Message:
-----------
Work on 3.5.27 Release.
Modified Paths:
--------------
trunk/wrapper/build-tests.xml
trunk/wrapper/src/c/wrapper_unix.c
trunk/wrapper/src/c/wrapper_win.c
trunk/wrapper/src/c/wrappereventloop.c
trunk/wrapper/src/c/wrapperinfo.c.in
Modified: trunk/wrapper/build-tests.xml
===================================================================
--- trunk/wrapper/build-tests.xml 2015-09-01 02:45:26 UTC (rev 1936)
+++ trunk/wrapper/build-tests.xml 2015-09-04 04:28:59 UTC (rev 1937)
@@ -11,16 +11,31 @@
<!-- Java version -->
<condition property="is.java 1.5 or lower">
+ <!-- ant.java.version can hold values starting from 1.2 -->
<or>
- <equals arg1="${ant.java.version}" arg2="1.0" />
- <equals arg1="${ant.java.version}" arg2="1.1" />
<equals arg1="${ant.java.version}" arg2="1.2" />
<equals arg1="${ant.java.version}" arg2="1.3" />
<equals arg1="${ant.java.version}" arg2="1.4" />
<equals arg1="${ant.java.version}" arg2="1.5" />
</or>
</condition>
-
+
+ <!-- Java vendor -->
+ <condition property="is.JavaSunOracle">
+ <or>
+ <equals arg1="${java.vendor}" arg2="Sun Microsystems Inc."/>
+ <equals arg1="${java.vendor}" arg2="Oracle Corporation"/>
+ </or>
+ </condition>
+
+ <!-- Does Java include the JavaScript Engine ? -->
+ <condition property="java-includes-jsEngine">
+ <and>
+ <isfalse value="${is.java 1.5 or lower}"/>
+ <istrue value="${is.JavaSunOracle}"/>
+ </and>
+ </condition>
+
<!-- platform -->
<property name="is.${os.name}" value="true"/>
@@ -108,7 +123,7 @@
<!-- Resolve Classpaths -->
<!-- =================================================================== -->
<!-- Classpath for script tests -->
- <target name="set-classpath.scriptLibs" if="is.java 1.5 or lower">
+ <target name="set-classpath.scriptLibs" unless="java-includes-jsEngine">
<path id="classpath.scriptLibs">
<fileset dir="${external.test.dir}/scriptLibs/">
<include name="*.jar"/>
@@ -116,8 +131,8 @@
</path>
</target>
- <target name="default-classpath.scriptLibs" unless="is.java 1.5 or lower">
- <!-- empty path: we don't need any additional libs because they are already included in Java 1.6 and upper -->
+ <target name="default-classpath.scriptLibs" if="java-includes-jsEngine">
+ <!-- empty path: we don't need any additional libs because they are already included in Oracle Java 1.6 and upper -->
<path id="classpath.scriptLibs"/>
</target>
@@ -127,7 +142,7 @@
<!-- Check if the required libs exist -->
<!-- =================================================================== -->
<!-- Check libs for script tests -->
- <target name="check-libs-exist.scriptLibs">
+ <target name="check-libs-exist.scriptLibs" unless="java-includes-jsEngine">
<available file="${external.test.dir}/scriptLibs/js-1.6R7.jar" property="js.exists"/>
<available file="${external.test.dir}/scriptLibs/bsf.jar" property="bsf.exists"/>
<available file="${external.test.dir}/scriptLibs/commons-logging-1.2.jar" property="cl.exists"/>
@@ -143,8 +158,8 @@
<target name="check-script-tests-setup-common" depends="check-libs-exist.scriptLibs">
<condition property="script-tests-setup-common-ok">
<or>
+ <istrue value="${java-includes-jsEngine}"/>
<istrue value="${libs-exist.scriptLibs}"/>
- <isfalse value="${is.java 1.5 or lower}"/>
</or>
</condition>
</target>
Modified: trunk/wrapper/src/c/wrapper_unix.c
===================================================================
--- trunk/wrapper/src/c/wrapper_unix.c 2015-09-01 02:45:26 UTC (rev 1936)
+++ trunk/wrapper/src/c/wrapper_unix.c 2015-09-04 04:28:59 UTC (rev 1937)
@@ -1477,7 +1477,6 @@
}
}
- /* we are on the parent side, cpuAffinityConfig will not be used here. A copy will remain for the child. */
return FALSE;
}
}
@@ -2008,14 +2007,6 @@
return 1; /* For compiler. */
}
-
-#if defined(LINUX) && defined(__GLIBC__) && defined(__GLIBC_MINOR__)
- if (((__GLIBC__ == 2 && __GLIBC_MINOR__ < 21) || (__GLIBC__ < 2)) &&
- (_tcscmp(getStringProperty(properties, TEXT("wrapper.logfile.maxsize"), TEXT("0")), TEXT("0")) != 0)) {
- log_printf(WRAPPER_SOURCE_WRAPPER, LEVEL_WARN, TEXT("The wrapper detected that the current version of the GNU C Library\n(glibc) is %d.%d. This library has a known bug that causes memory leaks\nfor versions lower than 2.21. Please upgrade it to a more recent\nversion.\n"), __GLIBC__, __GLIBC_MINOR__);
- }
-#endif
-
/* Set the default umask of the Wrapper process. */
umask(wrapperData->umask);
if (!strcmpIgnoreCase(wrapperData->argCommand, TEXT("-translate"))) {
Modified: trunk/wrapper/src/c/wrapper_win.c
===================================================================
--- trunk/wrapper/src/c/wrapper_win.c 2015-09-01 02:45:26 UTC (rev 1936)
+++ trunk/wrapper/src/c/wrapper_win.c 2015-09-04 04:28:59 UTC (rev 1937)
@@ -1410,9 +1410,9 @@
int res;
TCHAR titleBuffer[80];
int allocConsoleSucceed;
+ HANDLE process = GetCurrentProcess();
/* Set the process priority. */
- HANDLE process = GetCurrentProcess();
if (!SetPriorityClass(process, wrapperData->ntServicePriorityClass)) {
log_printf(WRAPPER_SOURCE_WRAPPER, LEVEL_WARN,
TEXT("Unable to set the process priority: %s"), getLastErrorText());
@@ -6560,7 +6560,6 @@
appExit(1);
return; /* For clarity. */
}
-
/* Set the default umask of the Wrapper process. */
_umask(wrapperData->umask);
Modified: trunk/wrapper/src/c/wrappereventloop.c
===================================================================
--- trunk/wrapper/src/c/wrappereventloop.c 2015-09-01 02:45:26 UTC (rev 1936)
+++ trunk/wrapper/src/c/wrappereventloop.c 2015-09-04 04:28:59 UTC (rev 1937)
@@ -1953,6 +1953,7 @@
int uptimeSeconds;
TICKS lastCycleTicks = wrapperGetTicks();
int nextSleep;
+
/* Initialize the tick timeouts. */
wrapperData->anchorTimeoutTicks = lastCycleTicks;
wrapperData->commandTimeoutTicks = lastCycleTicks;
Modified: trunk/wrapper/src/c/wrapperinfo.c.in
===================================================================
--- trunk/wrapper/src/c/wrapperinfo.c.in 2015-09-01 02:45:26 UTC (rev 1936)
+++ trunk/wrapper/src/c/wrapperinfo.c.in 2015-09-04 04:28:59 UTC (rev 1937)
@@ -30,7 +30,7 @@
TCHAR *wrapperBits = TEXT("@bits@");
TCHAR *wrapperArch = TEXT("@dist.arch@");
TCHAR *wrapperOS = TEXT("@dist.os@");
-TCHAR *wrapperReleaseDate = TEXT("20150901");
+TCHAR *wrapperReleaseDate = TEXT("20150904");
TCHAR *wrapperReleaseTime = TEXT("0000");
TCHAR *wrapperBuildDate = TEXT("@build.date@");
TCHAR *wrapperBuildTime = TEXT("@build.time@");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
