From 6fa758c552a14618e627814f755fac7703d10988 Mon Sep 17 00:00:00 2001
From: Kelly O'Hair <ohair@openjdk.org>
Date: Tue, 8 Jul 2008 09:27:08 -0700
Subject: [PATCH] 6695765: Remove winver.exe completely from jdk sources

Binary file winver.exe is unnecessary and the repositories should not manage binary files.

Reviewed-by: darcy
---
 jdk/make/common/shared/Platform.gmk  |  19 +++++------
 jdk/make/common/shared/Sanity.gmk    |  21 ++++++------
 jdk/make/tools/Makefile              |   1 -
 jdk/make/tools/winver/Makefile       |  48 --------------------------
 jdk/make/tools/winver/bin/winver.exe | Bin 28672 -> 0 bytes
 jdk/make/tools/winver/src/StdAfx.cpp |  33 ------------------
 jdk/make/tools/winver/src/StdAfx.h   |  47 -------------------------
 jdk/make/tools/winver/src/winver.cpp |  49 ---------------------------
 8 files changed, 20 insertions(+), 198 deletions(-)
 delete mode 100644 jdk/make/tools/winver/Makefile
 delete mode 100755 jdk/make/tools/winver/bin/winver.exe
 delete mode 100644 jdk/make/tools/winver/src/StdAfx.cpp
 delete mode 100644 jdk/make/tools/winver/src/StdAfx.h
 delete mode 100644 jdk/make/tools/winver/src/winver.cpp

diff --git a/jdk/make/common/shared/Platform.gmk b/jdk/make/common/shared/Platform.gmk
index 2d9b0078ec1..abf93964332 100644
--- a/jdk/make/common/shared/Platform.gmk
+++ b/jdk/make/common/shared/Platform.gmk
@@ -72,7 +72,6 @@ PLATFORM_SHARED=done
 #     ISA_DIR                     solaris only: /sparcv9 or /amd64
 #     LIBARCH32                   solaris only: sparc or i386
 #     LIBARCH64                   solaris only: sparcv9 or amd64
-#     REQUIRED_WINDOWS_NAME       windows only: basic name of windows 
 #     REQUIRED_WINDOWS_VERSION    windows only: specific version of windows 
 #     USING_CYGWIN                windows only: true or false
 #     WINDOWS_NT_VERSION_STRING   windows only: long version name
@@ -311,19 +310,11 @@ ifeq ($(PLATFORM), windows)
     endif
   endif
   export ARCH_DATA_MODEL
-  # LIBARCH is used to preserve the jre/lib/i386 directory name for 32-bit intel
-  ARCH=i586
-  LIBARCH=i386
-  # Value of Java os.arch property
-  ARCHPROP=x86
-  REQUIRED_WINDOWS_NAME=Windows Professional 2000
-  REQUIRED_WINDOWS_VERSION=5 0 Service Pack 4
   ifeq ($(ARCH_DATA_MODEL), 64)
     # If the user wants to perform a cross compile build then they must
     # - set ARCH_DATA_MODEL=64 and either
     #      + set ARCH to ia64 or amd64, or
-    REQUIRED_WINDOWS_NAME=Windows Server 2003
-    REQUIRED_WINDOWS_VERSION=5 2 Service Pack 1
+    REQUIRED_WINDOWS_VERSION=Server 2003 Enterprise x64 Edition
     ifeq ($(word 1, $(PROCESSOR_IDENTIFIER)), AMD64)
       ARCH=amd64
     else
@@ -332,6 +323,14 @@ ifeq ($(PLATFORM), windows)
     LIBARCH=$(ARCH)
     # Value of Java os.arch property
     ARCHPROP=$(LIBARCH)
+  else
+    REQUIRED_WINDOWS_VERSION=2000 or Unknown
+    #REQUIRED_WINDOWS_VERSION=XP Professional
+    # LIBARCH is used to preserve the jre/lib/i386 directory name for 32-bit intel
+    ARCH=i586
+    LIBARCH=i386
+    # Value of Java os.arch property
+    ARCHPROP=x86
   endif
   ARCH_FAMILY = $(ARCH)
   # Where is unwanted output to be delivered?
diff --git a/jdk/make/common/shared/Sanity.gmk b/jdk/make/common/shared/Sanity.gmk
index 7a8eb11e13a..8239e008e3f 100644
--- a/jdk/make/common/shared/Sanity.gmk
+++ b/jdk/make/common/shared/Sanity.gmk
@@ -82,15 +82,16 @@ ifeq ($(PLATFORM), linux)
 endif
 
 ifeq ($(PLATFORM), windows)
-  WINVER=$(JDK_TOPDIR)/make/tools/winver/bin/winver.exe
   FREE_SPACE := $(shell $(DF) -kP $(OUTPUTDIR) | $(TAIL) -1 | $(NAWK) '{print $$4;}')
   TEMP_FREE_SPACE := $(shell $(DF) -kP $(TEMP_DISK) | $(TAIL) -1 | $(NAWK) '{print $$4;}')
-  WINDOWS_VERSION := $(shell \
-      if [ -x $(WINVER) ]; then \
-	$(WINVER) ; \
-      else \
-	$(ECHO) "Unknown Windows Version"; \
-      fi)
+  # Localized systeminfo has localized labels, but not localized values.
+  _WINDOWS_VERSION := \
+    $(shell systeminfo 2> $(DEV_NULL) | grep 'Microsoft' | grep 'Windows' | \
+	 cut -d':' -f2)
+  ifeq ($(_WINDOWS_VERSION),)
+    _WINDOWS_VERSION := Windows 2000 or Unknown (no systeminfo utility)
+  endif
+  WINDOWS_VERSION := $(strip $(_WINDOWS_VERSION))
   DXSDK_VER := $(shell $(EGREP) DIRECTDRAW_VERSION $(DXSDK_INCLUDE_PATH)/ddraw.h 2>&1 | \
     $(EGREP) "\#define" | $(NAWK) '{print $$3}')
 endif
@@ -264,9 +265,9 @@ ifndef OPENJDK
 	    "" >> $(WARNING_FILE) ; \
 	fi
   ifeq ($(PLATFORM), windows)
-	@if [ "$(WINDOWS_VERSION)" != "$(REQUIRED_WINDOWS_VERSION)" ]; then \
-	    $(ECHO) "WARNING: $(YOU_ARE_USING) an unsupported version of $(REQUIRED_WINDOWS_NAME). \n" \
-	      "        The supported version is $(REQUIRED_WINDOWS_NAME) $(REQUIRED_WINDOWS_VERSION). \n" \
+	@if [ "$(findstring $(REQUIRED_WINDOWS_VERSION),$(WINDOWS_VERSION))" = "" ]; then \
+	    $(ECHO) "WARNING: $(YOU_ARE_USING) an unknown version of Windows. \n" \
+	      "        The required version is $(REQUIRED_WINDOWS_VERSION). \n" \
 	      "        $(YOU_ARE_USING) $(WINDOWS_VERSION) \n" \
 	      "" >> $(WARNING_FILE) ; \
 	fi
diff --git a/jdk/make/tools/Makefile b/jdk/make/tools/Makefile
index 36be60ea75d..1b3c4063c8c 100644
--- a/jdk/make/tools/Makefile
+++ b/jdk/make/tools/Makefile
@@ -51,7 +51,6 @@ SUBDIRS =                   \
   jdwpgen                   \
   makeclasslist             \
   strip_properties          \
-  winver                    \
   CharsetMapping
 
 all build clean clobber::
diff --git a/jdk/make/tools/winver/Makefile b/jdk/make/tools/winver/Makefile
deleted file mode 100644
index 9b8638a9437..00000000000
--- a/jdk/make/tools/winver/Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-# Copyright 1998-2005 Sun Microsystems, Inc.  All Rights Reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Sun designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Sun in the LICENSE file that accompanied this code.
-#
-# This code 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 General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-# CA 95054 USA or visit www.sun.com if you need additional information or
-# have any questions.
-#
-
-#
-# Makefile for building the winver tool
-#
-
-BUILDDIR = ../..
-PRODUCT = tools
-PROGRAM = winver
-include $(BUILDDIR)/common/Defs.gmk
-
-build: permissions
-
-permissions:
-ifeq ($(PLATFORM),windows)
-	$(CHMOD) a+x bin/winver.exe
-endif
-
-#
-# Rules.
-#
-include $(BUILDDIR)/common/Rules.gmk
-
-.PHONY: permissions
-
diff --git a/jdk/make/tools/winver/bin/winver.exe b/jdk/make/tools/winver/bin/winver.exe
deleted file mode 100755
index cba45bef1a4945cb3f2ae9b252e681fda3e5842f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 28672
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

diff --git a/jdk/make/tools/winver/src/StdAfx.cpp b/jdk/make/tools/winver/src/StdAfx.cpp
deleted file mode 100644
index a7169bc689b..00000000000
--- a/jdk/make/tools/winver/src/StdAfx.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2001 Sun Microsystems, Inc.  All Rights Reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
- *
- * This code 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 General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-// stdafx.cpp : source file that includes just the standard includes
-//      getver.pch will be the pre-compiled header
-//      stdafx.obj will contain the pre-compiled type information
-
-#include "stdafx.h"
-
-// TODO: reference any additional headers you need in STDAFX.H
-// and not in this file
diff --git a/jdk/make/tools/winver/src/StdAfx.h b/jdk/make/tools/winver/src/StdAfx.h
deleted file mode 100644
index 3e9407954bc..00000000000
--- a/jdk/make/tools/winver/src/StdAfx.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright 2001 Sun Microsystems, Inc.  All Rights Reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
- *
- * This code 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 General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-// stdafx.h : include file for standard system include files,
-//  or project specific include files that are used frequently, but
-//      are changed infrequently
-//
-
-#if !defined(AFX_STDAFX_H__C592D6C3_027D_11D5_8DFB_080020C19238__INCLUDED_)
-#define AFX_STDAFX_H__C592D6C3_027D_11D5_8DFB_080020C19238__INCLUDED_
-
-#if _MSC_VER > 1000
-#pragma once
-#endif // _MSC_VER > 1000
-
-#define WIN32_LEAN_AND_MEAN             // Exclude rarely-used stuff from Windows headers
-
-#include <stdio.h>
-
-// TODO: reference additional headers your program requires here
-
-//{{AFX_INSERT_LOCATION}}
-// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_STDAFX_H__C592D6C3_027D_11D5_8DFB_080020C19238__INCLUDED_)
diff --git a/jdk/make/tools/winver/src/winver.cpp b/jdk/make/tools/winver/src/winver.cpp
deleted file mode 100644
index 6497b9e2ee6..00000000000
--- a/jdk/make/tools/winver/src/winver.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright 2001 Sun Microsystems, Inc.  All Rights Reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
- *
- * This code 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 General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-// getver.cpp : Defines the entry point for the console application.
-//
-
-#include "stdafx.h"
-#include <windows.h>
-
-int main(int argc, char* argv[])
-{
-        OSVERSIONINFO verInfo;
-
-        memset(&verInfo,0,sizeof(verInfo));
-        verInfo.dwOSVersionInfoSize = sizeof(verInfo);
-
-        if (GetVersionEx(&verInfo))
-        {
-                printf("%d %d %s",verInfo.dwMajorVersion,verInfo.dwMinorVersion,verInfo.szCSDVersion);
-        }
-        else
-        {
-                printf("No version info available");
-        }
-
-        return 0;
-}