OSSP CVS Repository

ossp - Check-in [5546]
Not logged in
[Honeypot]  [Browse]  [Home]  [Login]  [Reports
[Search]  [Ticket]  [Timeline
  [Patchset]  [Tagging/Branching

Check-in Number: 5546
Date: 2006-Jul-30 10:00:44 (local)
2006-Jul-30 08:00:44 (UTC)
User:rse
Branch:
Comment: Add support for Windows CygWin and MinGW environments.
Tickets:
Inspections:
Files:
ossp-pkg/js/ChangeLog      1.16 -> 1.17     6 inserted, 0 deleted
ossp-pkg/js/configure.ac      1.15 -> 1.16     6 inserted, 1 deleted
ossp-pkg/js/src/js.c      1.3 -> 1.4     9 inserted, 0 deleted
ossp-pkg/js/src/jsapi.h      1.2 -> 1.3     1 inserted, 1 deleted

ossp-pkg/js/ChangeLog 1.16 -> 1.17

--- ChangeLog    2006/07/29 20:02:55     1.16
+++ ChangeLog    2006/07/30 08:00:44     1.17
@@ -11,6 +11,12 @@
 
   This is a list of all changes to OSSP js.
 
+  Changes between 1.6.20060729 and 1.6.20060730 (2006-07-29 to 2006-07-30)
+
+   o Add support for Windows CygWin and MinGW environments.
+     [Ralf S. Engelschall <rse@engelschall.com>,
+      Andrew Vajoczki <vajoczki@yahoo.com>]
+
   Changes between 1.6.20060724 and 1.6.20060729 (2006-07-24 to 2006-07-29)
 
    o Upgrade to upstream sources as of 2006-07-29.


ossp-pkg/js/configure.ac 1.15 -> 1.16

--- configure.ac 2006/07/29 09:08:15     1.15
+++ configure.ac 2006/07/30 08:00:44     1.16
@@ -47,7 +47,12 @@
 
 AC_CHECK_MEMBERS([struct stat.st_birthtime, struct stat.st_birthtimensec],,, [#include <sys/stat.h>])
 
-CPPFLAGS="$CPPFLAGS -DOSSP -DXP_UNIX -DEXPORT_JS_API"
+CPPFLAGS="$CPPFLAGS -DOSSP"
+case "${host}" in
+    *mingw* | *windows* | *winnt* ) CPPFLAGS="$CPPFLAGS -DXP_WIN"  ;;
+    *                             ) CPPFLAGS="$CPPFLAGS -DXP_UNIX" ;;
+esac
+CPPFLAGS="$CPPFLAGS -DEXPORT_JS_API"
 
 dnl #   configure option --with-version
 AC_ARG_WITH([version],


ossp-pkg/js/src/js.c 1.3 -> 1.4

--- js.c 2006/07/24 18:38:26     1.3
+++ js.c 2006/07/30 08:00:45     1.4
@@ -206,7 +206,11 @@
     }
     JS_SetThreadStackLimit(cx, stackLimit);
 
+#if defined(OSSP) && defined(XP_WIN)
+    if (filename) {
+#else
     if (!isatty(fileno(file))) {
+#endif
         /*
          * It's not interactive - just execute it.
          *
@@ -2492,6 +2496,11 @@
     setbuf(stderr,0);
 #endif
 
+#if defined(OSSP) && defined(XP_WIN)
+    setvbuf(stderr, 0, _IONBF, 0);
+    setvbuf(stdout, 0, _IONBF, 0);
+#endif
+
     gErrFile = stderr;
     gOutFile = stdout;
 


ossp-pkg/js/src/jsapi.h 1.2 -> 1.3

--- jsapi.h      2006/07/24 19:53:01     1.2
+++ jsapi.h      2006/07/30 08:00:45     1.3
@@ -43,7 +43,7 @@
 #ifndef OSSP
 #define OSSP
 #endif
-#ifndef XP_UNIX
+#if !defined(XP_UNIX) && !defined(XP_WIN)
 #define XP_UNIX
 #endif
 

CVSTrac 2.0.1