Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
5c05cfe8
D
dragonwell8_jdk
项目概览
openanolis
/
dragonwell8_jdk
通知
4
Star
2
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dragonwell8_jdk
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
5c05cfe8
编写于
7月 14, 2008
作者:
T
tbell
浏览文件
操作
浏览文件
下载
差异文件
Merge
上级
0a690d3a
795ad25a
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
20 addition
and
198 deletion
+20
-198
make/common/shared/Platform.gmk
make/common/shared/Platform.gmk
+9
-10
make/common/shared/Sanity.gmk
make/common/shared/Sanity.gmk
+11
-10
make/tools/Makefile
make/tools/Makefile
+0
-1
make/tools/winver/Makefile
make/tools/winver/Makefile
+0
-48
make/tools/winver/bin/winver.exe
make/tools/winver/bin/winver.exe
+0
-0
make/tools/winver/src/StdAfx.cpp
make/tools/winver/src/StdAfx.cpp
+0
-33
make/tools/winver/src/StdAfx.h
make/tools/winver/src/StdAfx.h
+0
-47
make/tools/winver/src/winver.cpp
make/tools/winver/src/winver.cpp
+0
-49
未找到文件。
make/common/shared/Platform.gmk
浏览文件 @
5c05cfe8
...
@@ -72,7 +72,6 @@ PLATFORM_SHARED=done
...
@@ -72,7 +72,6 @@ PLATFORM_SHARED=done
# ISA_DIR solaris only: /sparcv9 or /amd64
# ISA_DIR solaris only: /sparcv9 or /amd64
# LIBARCH32 solaris only: sparc or i386
# LIBARCH32 solaris only: sparc or i386
# LIBARCH64 solaris only: sparcv9 or amd64
# LIBARCH64 solaris only: sparcv9 or amd64
# REQUIRED_WINDOWS_NAME windows only: basic name of windows
# REQUIRED_WINDOWS_VERSION windows only: specific version of windows
# REQUIRED_WINDOWS_VERSION windows only: specific version of windows
# USING_CYGWIN windows only: true or false
# USING_CYGWIN windows only: true or false
# WINDOWS_NT_VERSION_STRING windows only: long version name
# WINDOWS_NT_VERSION_STRING windows only: long version name
...
@@ -311,19 +310,11 @@ ifeq ($(PLATFORM), windows)
...
@@ -311,19 +310,11 @@ ifeq ($(PLATFORM), windows)
endif
endif
endif
endif
export ARCH_DATA_MODEL
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)
ifeq ($(ARCH_DATA_MODEL), 64)
# If the user wants to perform a cross compile build then they must
# If the user wants to perform a cross compile build then they must
# - set ARCH_DATA_MODEL=64 and either
# - set ARCH_DATA_MODEL=64 and either
# + set ARCH to ia64 or amd64, or
# + set ARCH to ia64 or amd64, or
REQUIRED_WINDOWS_NAME=Windows Server 2003
REQUIRED_WINDOWS_VERSION=Server 2003 Enterprise x64 Edition
REQUIRED_WINDOWS_VERSION=5 2 Service Pack 1
ifeq ($(word 1, $(PROCESSOR_IDENTIFIER)), AMD64)
ifeq ($(word 1, $(PROCESSOR_IDENTIFIER)), AMD64)
ARCH=amd64
ARCH=amd64
else
else
...
@@ -332,6 +323,14 @@ ifeq ($(PLATFORM), windows)
...
@@ -332,6 +323,14 @@ ifeq ($(PLATFORM), windows)
LIBARCH=$(ARCH)
LIBARCH=$(ARCH)
# Value of Java os.arch property
# Value of Java os.arch property
ARCHPROP=$(LIBARCH)
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
endif
ARCH_FAMILY = $(ARCH)
ARCH_FAMILY = $(ARCH)
# Where is unwanted output to be delivered?
# Where is unwanted output to be delivered?
...
...
make/common/shared/Sanity.gmk
浏览文件 @
5c05cfe8
...
@@ -82,15 +82,16 @@ ifeq ($(PLATFORM), linux)
...
@@ -82,15 +82,16 @@ ifeq ($(PLATFORM), linux)
endif
endif
ifeq ($(PLATFORM), windows)
ifeq ($(PLATFORM), windows)
WINVER=$(JDK_TOPDIR)/make/tools/winver/bin/winver.exe
FREE_SPACE := $(shell $(DF) -kP $(OUTPUTDIR) | $(TAIL) -1 | $(NAWK) '{print $$4;}')
FREE_SPACE := $(shell $(DF) -kP $(OUTPUTDIR) | $(TAIL) -1 | $(NAWK) '{print $$4;}')
TEMP_FREE_SPACE := $(shell $(DF) -kP $(TEMP_DISK) | $(TAIL) -1 | $(NAWK) '{print $$4;}')
TEMP_FREE_SPACE := $(shell $(DF) -kP $(TEMP_DISK) | $(TAIL) -1 | $(NAWK) '{print $$4;}')
WINDOWS_VERSION := $(shell \
# Localized systeminfo has localized labels, but not localized values.
if [ -x $(WINVER) ]; then \
_WINDOWS_VERSION := \
$(WINVER) ; \
$(shell systeminfo 2> $(DEV_NULL) | grep 'Microsoft' | grep 'Windows' | \
else \
cut -d':' -f2)
$(ECHO) "Unknown Windows Version"; \
ifeq ($(_WINDOWS_VERSION),)
fi)
_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 | \
DXSDK_VER := $(shell $(EGREP) DIRECTDRAW_VERSION $(DXSDK_INCLUDE_PATH)/ddraw.h 2>&1 | \
$(EGREP) "\#define" | $(NAWK) '{print $$3}')
$(EGREP) "\#define" | $(NAWK) '{print $$3}')
endif
endif
...
@@ -264,9 +265,9 @@ ifndef OPENJDK
...
@@ -264,9 +265,9 @@ ifndef OPENJDK
"" >> $(WARNING_FILE) ; \
"" >> $(WARNING_FILE) ; \
fi
fi
ifeq ($(PLATFORM), windows)
ifeq ($(PLATFORM), windows)
@if [ "$(
WINDOWS_VERSION)" != "$(REQUIRED_WINDOWS_VERSION)
" ]; then \
@if [ "$(
findstring $(REQUIRED_WINDOWS_VERSION),$(WINDOWS_VERSION))" = "
" ]; then \
$(ECHO) "WARNING: $(YOU_ARE_USING) an un
supported version of $(REQUIRED_WINDOWS_NAME)
. \n" \
$(ECHO) "WARNING: $(YOU_ARE_USING) an un
known version of Windows
. \n" \
" The
supported version is $(REQUIRED_WINDOWS_NAME)
$(REQUIRED_WINDOWS_VERSION). \n" \
" The
required version is
$(REQUIRED_WINDOWS_VERSION). \n" \
" $(YOU_ARE_USING) $(WINDOWS_VERSION) \n" \
" $(YOU_ARE_USING) $(WINDOWS_VERSION) \n" \
"" >> $(WARNING_FILE) ; \
"" >> $(WARNING_FILE) ; \
fi
fi
...
...
make/tools/Makefile
浏览文件 @
5c05cfe8
...
@@ -51,7 +51,6 @@ SUBDIRS = \
...
@@ -51,7 +51,6 @@ SUBDIRS = \
jdwpgen
\
jdwpgen
\
makeclasslist
\
makeclasslist
\
strip_properties
\
strip_properties
\
winver
\
CharsetMapping
CharsetMapping
all build clean clobber
::
all build clean clobber
::
...
...
make/tools/winver/Makefile
已删除
100644 → 0
浏览文件 @
0a690d3a
#
# 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
make/tools/winver/bin/winver.exe
已删除
100755 → 0
浏览文件 @
0a690d3a
文件已删除
make/tools/winver/src/StdAfx.cpp
已删除
100644 → 0
浏览文件 @
0a690d3a
/*
* 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
make/tools/winver/src/StdAfx.h
已删除
100644 → 0
浏览文件 @
0a690d3a
/*
* 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_)
make/tools/winver/src/winver.cpp
已删除
100644 → 0
浏览文件 @
0a690d3a
/*
* 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
;
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录