MWS_SRX644: migrate branch mws_srx644 -> HEAD

6 files changed, 94 insertions, 8 deletions

diff --git a/dmake/win95/borland/bcc50/public.h b/dmake/win95/borland/bcc50/public.h
index f6f7dd66fa51..a535a6cc6db8 100644
--- a/dmake/win95/borland/bcc50/public.h
+++ b/dmake/win95/borland/bcc50/public.h
@@ -1,4 +1,4 @@
-/* RCS  $Id: public.h,v 1.2 2003-01-13 14:28:08 waratah Exp $
+/* RCS  $Id: public.h,v 1.3 2003-03-25 14:02:52 hr Exp $
 -- WARNING  -- This file is AUTOMATICALLY GENERATED DO NOT EDIT IT
 --
 --
@@ -88,6 +88,7 @@ void Clear_prerequisites ANSI((CELLPTR));
 int Test_circle ANSI((CELLPTR, int));
 STRINGPTR Def_recipe ANSI((char *, STRINGPTR, int, int));
 t_attr Rcp_attribute ANSI((char *));
+void main ANSI((int, char **));
 FILE *Openfile ANSI((char *, int, int));
 FILE *Closefile ANSI(());
 FILE *Search_file ANSI((char *, char **));
diff --git a/dmake/win95/microsft/config.h b/dmake/win95/microsft/config.h
index ca301ff87281..7965dff25215 100644
--- a/dmake/win95/microsft/config.h
+++ b/dmake/win95/microsft/config.h
@@ -1,4 +1,64 @@
-/* RCS  $Id: config.h,v 1.2 2002-10-08 09:21:53 waratah Exp $
+/*************************************************************************
+ *
+ *  $RCSfile: config.h,v $
+ *
+ *  $Revision: 1.3 $
+ *
+ *  last change: $Author: hr $ $Date: 2003-03-25 14:02:53 $
+ *
+ *  The Contents of this file are made available subject to the terms of
+ *  either of the following licenses
+ *
+ *         - GNU Lesser General Public License Version 2.1
+ *         - Sun Industry Standards Source License Version 1.1
+ *
+ *  Sun Microsystems Inc., October, 2000
+ *
+ *  GNU Lesser General Public License Version 2.1
+ *  =============================================
+ *  Copyright 2000 by Sun Microsystems, Inc.
+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License version 2.1, as published by the Free Software Foundation.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *  MA  02111-1307  USA
+ *
+ *
+ *  Sun Industry Standards Source License Version 1.1
+ *  =================================================
+ *  The contents of this file are subject to the Sun Industry Standards
+ *  Source License Version 1.1 (the "License"); You may not use this file
+ *  except in compliance with the License. You may obtain a copy of the
+ *  License at http://www.openoffice.org/license.html.
+ *
+ *  Software provided under this License is provided on an "AS IS" basis,
+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+ *  See the License for the specific provisions governing your rights and
+ *  obligations concerning the Software.
+ *
+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+ *
+ *  Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *  All Rights Reserved.
+ *
+ *  Contributor(s): _______________________________________
+ *
+ *
+ ************************************************************************/
+/*
 --
 -- SYNOPSIS
 --      Configurarion include file.
@@ -25,6 +85,13 @@
 --      Use cvs log to obtain detailed change logs.
 */
 
+/* Attention! In the UNIX like builds with the ./configure ; make
+   procedure a config.h is generated. The autogenerated config.h
+   must not be there to compile dmake with MSC and the
+   "dmake\make.bat win95-vpp40" command. This file sets (among other
+   things) the needed HAS_... and HAVE_... macros.
+*/
+
 #if defined (_MSC_VER)
 # if _MSC_VER < 500
     Force a compile-time blowup.
@@ -71,6 +138,18 @@
 #define HAVE_SYS_TYPES_H 1
 #define HAVE_SYS_STAT_H 1
 
+/* These functions are available! (this is tested only with MSVC++ 6.0) */
+#define HAVE_GETCWD 1
+#define HAVE_UTIME_NULL 1
+#define HAVE_TZSET 1
+
+#define HAVE_ERRNO_H 1
+#define HAVE_STRERROR 1
+
+/* These defines are needed for itypes.h! (this is tested only with MSVC++ 6.0) */
+#define SIZEOF_INT 4
+#define SIZEOF_LONG 4
+#define SIZEOF_SHORT 2
 
 #ifndef MSDOS
 #   define MSDOS 1
@@ -79,6 +158,8 @@
 /* a small problem with pointer to voids on some unix machines needs this */
 #define PVOID void *
 
-/* Use my own tempnam */
-#define tempnam dtempnam
+/* Use my own tempnam for MSC Version less than 6.0 */
+#if _MSC_VER < 600
+#   define tempnam dtempnam
+#endif
 
diff --git a/dmake/win95/microsft/ruletab.c b/dmake/win95/microsft/ruletab.c
index 353e1eb7802e..3202f70b3b43 100644
--- a/dmake/win95/microsft/ruletab.c
+++ b/dmake/win95/microsft/ruletab.c
@@ -1,4 +1,4 @@
-/* RCS  $Id: ruletab.c,v 1.1.1.1 2000-09-22 15:33:36 hr Exp $
+/* RCS  $Id: ruletab.c,v 1.2 2003-03-25 14:02:53 hr Exp $
 --
 -- SYNOPSIS
 --      Default initial configuration of dmake.
@@ -39,6 +39,9 @@ static char *_rules[] = {
     ".MAKEFILES : makefile.mk makefile",
     ".SOURCE    : .NULL",
 #include "startup.h"
+#if __MINGW32__
+#   include "dmakeroot.h"
+#endif
     (char *)NULL };
 
 char **Rule_tab = _rules; /* for sundry reasons in Get_environment() */
diff --git a/dmake/win95/microsft/vpp40/mk.bat b/dmake/win95/microsft/vpp40/mk.bat
index b1f73ba7e18f..4f38874cb20d 100755
--- a/dmake/win95/microsft/vpp40/mk.bat
+++ b/dmake/win95/microsft/vpp40/mk.bat
@@ -25,7 +25,8 @@ cl -c %c_flg -I. -Iwin95 -Iwin95\microsft -Iwin95\microsft\vpp40 /nologo -Od -GF
 cl -c %c_flg -I. -Iwin95 -Iwin95\microsft -Iwin95\microsft\vpp40 /nologo -Od -GF -Ge -Foobjects\dstrlwr.obj msdos\dstrlwr.c
 cl -c %c_flg -I. -Iwin95 -Iwin95\microsft -Iwin95\microsft\vpp40 /nologo -Od -GF -Ge -Foobjects\arlib.obj msdos\arlib.c
 cl -c %c_flg -I. -Iwin95 -Iwin95\microsft -Iwin95\microsft\vpp40 /nologo -Od -GF -Ge -Foobjects\dirbrk.obj msdos\dirbrk.c
-cl -c %c_flg -I. -Iwin95 -Iwin95\microsft -Iwin95\microsft\vpp40 /nologo -Od -GF -Ge -Foobjects\tempnam.obj tempnam.c
+rem Not needed for MSVC 6 and up. Lesser versions not supported
+rem cl -c %c_flg -I. -Iwin95 -Iwin95\microsft -Iwin95\microsft\vpp40 /nologo -Od -GF -Ge -Foobjects\tempnam.obj tempnam.c
 cl -c %c_flg -I. -Iwin95 -Iwin95\microsft -Iwin95\microsft\vpp40 /nologo -Od -GF -Ge -Foobjects\ruletab.obj win95\microsft\ruletab.c
 cl -c %c_flg -I. -Iwin95 -Iwin95\microsft -Iwin95\microsft\vpp40 /nologo -Od -GF -Ge -Foobjects\runargv.obj msdos\runargv.c
 cl -c %c_flg -I. -Iwin95 -Iwin95\microsft -Iwin95\microsft\vpp40 /nologo -Od -GF -Ge -Foobjects\rmprq.obj msdos\rmprq.c
diff --git a/dmake/win95/microsft/vpp40/obj.rsp b/dmake/win95/microsft/vpp40/obj.rsp
index e9e03972b791..ae89a27c3940 100644
--- a/dmake/win95/microsft/vpp40/obj.rsp
+++ b/dmake/win95/microsft/vpp40/obj.rsp
@@ -23,7 +23,6 @@ objects\switchar.obj
 objects\dstrlwr.obj
 objects\arlib.obj
 objects\dirbrk.obj
-objects\tempnam.obj
 objects\ruletab.obj
 objects\runargv.obj
 objects\rmprq.obj
diff --git a/dmake/win95/microsft/vpp40/public.h b/dmake/win95/microsft/vpp40/public.h
index 921b67b6f121..1a8a8f181d5e 100644
--- a/dmake/win95/microsft/vpp40/public.h
+++ b/dmake/win95/microsft/vpp40/public.h
@@ -1,4 +1,4 @@
-/* RCS  $Id: public.h,v 1.2 2003-01-13 14:28:09 waratah Exp $
+/* RCS  $Id: public.h,v 1.3 2003-03-25 14:02:54 hr Exp $
 -- WARNING  -- This file is AUTOMATICALLY GENERATED DO NOT EDIT IT
 --
 --
@@ -88,6 +88,7 @@ void Clear_prerequisites ANSI((CELLPTR));
 int Test_circle ANSI((CELLPTR, int));
 STRINGPTR Def_recipe ANSI((char *, STRINGPTR, int, int));
 t_attr Rcp_attribute ANSI((char *));
+int main ANSI((int, char **));
 FILE *Openfile ANSI((char *, int, int));
 FILE *Closefile ANSI(());
 FILE *Search_file ANSI((char *, char **));