cvs commit: jakarta-commons-sandbox/daemon/src/native/unix/support apsupport.m4

[billbarker]

billbarker2003/06/20 21:27:46

  Modified:daemon/src/native/unix/support apsupport.m4
  Log:
  Tell configure that cygwin doesn't have a setsid function.  AFAIK, the rest of the 
currently supported platforms do.
  
  Revision  ChangesPath
  1.5   +2 -2  
jakarta-commons-sandbox/daemon/src/native/unix/support/apsupport.m4
  
  Index: apsupport.m4
  ===
  RCS file: 
/home/cvs/jakarta-commons-sandbox/daemon/src/native/unix/support/apsupport.m4,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- apsupport.m4  19 Sep 2002 16:48:47 -  1.4
  +++ apsupport.m4  21 Jun 2003 04:27:46 -  1.5
  @@ -98,7 +98,7 @@
   supported_os="linux"
   ;;
 cygwin)
  -CFLAGS="$CFLAGS -DOS_CYGWIN -DDSO_DLFCN"
  +CFLAGS="$CFLAGS -DOS_CYGWIN -DDSO_DLFCN -DNO_SETSID"
   supported_os="win32"
   ;;
 sysv)
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-commons-sandbox/daemon/src/native/unix/support apsupport.m4

[jfclere]

jfclere 2002/09/19 09:48:48

  Modified:daemon/src/native/unix Makedefs.in configure.in
   daemon/src/native/unix/native Makefile.in java.c
   daemon/src/native/unix/support apsupport.m4
  Log:
  Add support of BS2000 and prepare the logic for other EBCDIC platforms.
  
  Revision  ChangesPath
  1.4   +2 -1  jakarta-commons-sandbox/daemon/src/native/unix/Makedefs.in
  
  Index: Makedefs.in
  ===
  RCS file: /home/cvs/jakarta-commons-sandbox/daemon/src/native/unix/Makedefs.in,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Makedefs.in   17 Sep 2002 16:21:14 -  1.3
  +++ Makedefs.in   19 Sep 2002 16:48:47 -  1.4
  @@ -65,6 +65,7 @@
   LDFLAGS = @LDFLAGS@
   JAVACFLAGS = @JAVACFLAGS@
   RANLIB = @RANLIB@
  +LDCMD = @LDCMD@
   
   .c.o:
$(CC) $(CFLAGS) -c $< -o $@
  
  
  
  1.4   +9 -1  jakarta-commons-sandbox/daemon/src/native/unix/configure.in
  
  Index: configure.in
  ===
  RCS file: /home/cvs/jakarta-commons-sandbox/daemon/src/native/unix/configure.in,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- configure.in  17 Sep 2002 16:21:14 -  1.3
  +++ configure.in  19 Sep 2002 16:48:47 -  1.4
  @@ -126,6 +126,14 @@
  CFLAGS="$CFLAGS -Wall -Wstrict-prototypes"
  AC_MSG_RESULT([gcc flags added])
   fi
  +dnl -
  +dnl Add gcc specific CFLAGS.
  +dnl -
  +if test -z "$LDCMD"
  +then
  +   LDCMD="$CC"
  +fi
  +AC_SUBST(LDCMD)
   
   dnl -
   dnl Random programs we need to compile locally
  
  
  
  1.5   +2 -2  
jakarta-commons-sandbox/daemon/src/native/unix/native/Makefile.in
  
  Index: Makefile.in
  ===
  RCS file: 
/home/cvs/jakarta-commons-sandbox/daemon/src/native/unix/native/Makefile.in,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Makefile.in   17 Sep 2002 16:21:14 -  1.4
  +++ Makefile.in   19 Sep 2002 16:48:47 -  1.5
  @@ -79,7 +79,7 @@
   
   jsvc: jsvc-unix.o libservice.a
mkdir -p ../../../../dist
  - $(CC) $(LDFLAGS) jsvc-unix.o libservice.a -o ../../../../dist/jsvc
  + $(LDCMD) $(LDFLAGS) jsvc-unix.o libservice.a -o ../../../../dist/jsvc
   
   clean:
rm -f $(OBJS) ../../../../dist/jsvc jsvc-unix.o libservice.a
  
  
  
  1.4   +75 -19jakarta-commons-sandbox/daemon/src/native/unix/native/java.c
  
  Index: java.c
  ===
  RCS file: /home/cvs/jakarta-commons-sandbox/daemon/src/native/unix/native/java.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- java.c17 Sep 2002 16:21:14 -  1.3
  +++ java.c19 Sep 2002 16:48:47 -  1.4
  @@ -63,6 +63,17 @@
   #endif
   #include 
   
  +#ifdef CHARSET_EBCDIC
  +#ifdef OSD_POSIX
  +#include 
  +#define jsvc_xlate_to_ascii(b) _e2a(b)
  +#define jsvc_xlate_from_ascii(b) _a2e(b)
  +#endif
  +#else
  +#define jsvc_xlate_to_ascii() /* NOOP */
  +#define jsvc_xlate_from_ascii() /* NOOP */
  +#endif
  +
   static JavaVM *jvm=NULL;
   static JNIEnv *env=NULL;
   static jclass cls=NULL;
  @@ -121,6 +132,9 @@
   char *libf=NULL;
   jint ret;
   int x;
  +char loaderclass[]=LOADER;
  +char shutdownclass[]="shutdown";
  +char shutdownparams[]="(Z)V";
   
   /* Decide WHAT virtual machine we need to use */
   libf=java_library(args,data);
  @@ -182,7 +196,8 @@
   } else {
   opt=(JavaVMOption *)malloc(arg.nOptions*sizeof(JavaVMOption));
   for (x=0; xonum; x++) {
  -opt[x].optionString=args->opts[x];
  +opt[x].optionString=strdup(args->opts[x]);
  +jsvc_xlate_to_ascii(opt[x].optionString);
   opt[x].extraInfo=NULL;
   }
   arg.options=opt;
  @@ -197,8 +212,10 @@
   log_debug("| Extra options: %d",arg.nOptions);
   
   for (x=0; xonum; x++) {
  +jsvc_xlate_from_ascii(opt[x].optionString);
   log_debug("|   \"%s\" (0x%08x)",opt[x].optionString,
 opt[x].extraInfo);
  +jsvc_xlate_to_ascii(opt[x].optionString);
   }
   log_debug("+---");
   }
  @@ -211,15 +228,19 @@
   }
   log_debug("Java VM created successfully");
   
  -cls=(*env)->FindClass(env,LOADER);
  +jsvc_xlate_to_ascii(loaderclass);
  +cls=(*env)->FindClass(env,loaderclass);
  +jsvc_xlate_from_ascii(loaderclass);
   if (cls=

cvs commit: jakarta-commons-sandbox/daemon/src/native/unix/support apsupport.m4

[jfclere]

jfclere 2002/09/17 05:24:14

  Modified:daemon/src/native/unix/support apsupport.m4
  Log:
  Add detection of 2 of the FSC platforms: ReliantUNIX and BS2000.
  
  Revision  ChangesPath
  1.2   +15 -1 
jakarta-commons-sandbox/daemon/src/native/unix/support/apsupport.m4
  
  Index: apsupport.m4
  ===
  RCS file: 
/home/cvs/jakarta-commons-sandbox/daemon/src/native/unix/support/apsupport.m4,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- apsupport.m4  18 Feb 2002 21:15:48 -  1.1
  +++ apsupport.m4  17 Sep 2002 12:24:14 -  1.2
  @@ -69,6 +69,14 @@
   CFLAGS="$CFLAGS -DCPU=\\\"$host_cpu\\\"" ;;
 i?86)
   CFLAGS="$CFLAGS -DCPU=\\\"i386\\\"" ;;
  +  bs2000)
  +CFLAGS="$CFLAGS -DCPU=\\\"osd\\\""
  +supported_os="osd"
  +;;
  +  mips)
  +CFLAGS="$CFLAGS -DCPU=\\\"mips\\\""
  +supported_os="mips"
  +;;
 *)
   AC_MSG_RESULT([failed])
   AC_MSG_ERROR([Unsupported CPU architecture "$host_cpu"]);;
  @@ -90,6 +98,12 @@
 cygwin)
   CFLAGS="$CFLAGS -DOS_CYGWIN -DDSO_DLFCN"
   supported_os="win32"
  +;;
  +  sysv)
  +CFLAGS="$CFLAGS -DOS_SYSV -DDSO_DLFCN"
  +;;
  +  sysv4)
  +CFLAGS="$CFLAGS -DOS_SYSV -DDSO_DLFCN"
   ;;
 *)
   AC_MSG_RESULT([failed])
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail: