Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
f9d62425
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看板
提交
f9d62425
编写于
14年前
作者:
M
mikejwre
浏览文件
操作
浏览文件
下载
差异文件
Merge
上级
a0c62a3c
3b75a4e8
变更
16
隐藏空白更改
内联
并排
Showing
16 changed file
with
225 addition
and
66 deletion
+225
-66
make/com/sun/java/pack/Makefile
make/com/sun/java/pack/Makefile
+1
-1
make/common/Defs-windows.gmk
make/common/Defs-windows.gmk
+38
-0
make/common/Modules.gmk
make/common/Modules.gmk
+3
-0
make/common/Release.gmk
make/common/Release.gmk
+25
-0
make/common/shared/Compiler-msvc.gmk
make/common/shared/Compiler-msvc.gmk
+21
-1
make/common/shared/Defs-versions.gmk
make/common/shared/Defs-versions.gmk
+8
-8
make/common/shared/Defs-windows.gmk
make/common/shared/Defs-windows.gmk
+80
-37
make/common/shared/Platform.gmk
make/common/shared/Platform.gmk
+6
-1
src/share/bin/main.c
src/share/bin/main.c
+5
-3
src/windows/bin/java_md.c
src/windows/bin/java_md.c
+7
-0
src/windows/native/sun/jkernel/DownloadDialog.cpp
src/windows/native/sun/jkernel/DownloadDialog.cpp
+4
-1
src/windows/native/sun/jkernel/DownloadHelper.cpp
src/windows/native/sun/jkernel/DownloadHelper.cpp
+4
-1
src/windows/native/sun/jkernel/stdafx.h
src/windows/native/sun/jkernel/stdafx.h
+4
-1
src/windows/native/sun/windows/awt_DesktopProperties.cpp
src/windows/native/sun/windows/awt_DesktopProperties.cpp
+13
-1
src/windows/native/sun/windows/awt_DnDDS.cpp
src/windows/native/sun/windows/awt_DnDDS.cpp
+5
-10
src/windows/native/sun/windows/awt_TextArea.cpp
src/windows/native/sun/windows/awt_TextArea.cpp
+1
-1
未找到文件。
make/com/sun/java/pack/Makefile
浏览文件 @
f9d62425
...
...
@@ -152,7 +152,7 @@ $(UNPACK_EXE): $(UNPACK_EXE_FILES_o) updatefiles winres
$
(
prep-target
)
$(LINKER)
$(LDDFLAGS)
$(UNPACK_EXE_FILES_o)
$(RES)
$(LIBCXX)
$(LDOUTPUT)$(TEMPDIR)
/unpack200
$(EXE_SUFFIX)
ifdef
MT
$(MT)
/manifest
$(
TEMP
DIR)
/unpack200
$(EXE_SUFFIX)
.manifest /outputresource:
$(TEMPDIR)
/unpack200
$(EXE_SUFFIX)
;
#1
$(MT)
/manifest
$(
OBJ
DIR)
/unpack200
$(EXE_SUFFIX)
.manifest /outputresource:
$(TEMPDIR)
/unpack200
$(EXE_SUFFIX)
;
#1
endif
$(CP)
$(TEMPDIR)
/unpack200
$(EXE_SUFFIX)
$(UNPACK_EXE)
$
(
install-module-file
)
...
...
This diff is collapsed.
Click to expand it.
make/common/Defs-windows.gmk
浏览文件 @
f9d62425
...
...
@@ -86,6 +86,11 @@ ifeq ($(ARCH_DATA_MODEL), 32)
MSVCPNN_DLL = msvcp90.dll
MS_RUNTIME_LIBRARIES += $(MSVCRNN_DLL)
endif
ifeq ($(COMPILER_VERSION), VS2010)
MSVCRNN_DLL = msvcr100.dll
MSVCPNN_DLL = msvcp100.dll
MS_RUNTIME_LIBRARIES += $(MSVCRNN_DLL)
endif
endif
ifeq ($(ARCH_DATA_MODEL), 64)
...
...
@@ -94,6 +99,11 @@ ifeq ($(ARCH_DATA_MODEL), 64)
MSVCPNN_DLL = msvcp90.dll
MS_RUNTIME_LIBRARIES += $(MSVCRNN_DLL)
endif
ifeq ($(COMPILER_VERSION), VS2010)
MSVCRNN_DLL = msvcr100.dll
MSVCPNN_DLL = msvcp100.dll
MS_RUNTIME_LIBRARIES += $(MSVCRNN_DLL)
endif
endif
EXTRA_LFLAGS += /LIBPATH:$(DXSDK_LIB_PATH)
...
...
@@ -155,6 +165,7 @@ ifeq ($(CC_VERSION),msvc)
# Automatic precompiled header option to use (if COMPILE_APPROACH=batch)
AUTOMATIC_PCH_OPTION =
GX_OPTION = -GX
GZ_OPTION = -GZ
ifeq ($(ARCH_DATA_MODEL), 32)
CC_OPT/HIGHEST = -Ox -Gy -Os -GB
CC_OPT/HIGHER = -Ox -Gy -Os -GB
...
...
@@ -171,6 +182,7 @@ ifeq ($(CC_VERSION),msvc)
AUTOMATIC_PCH_OPTION = -YX
# Also known as VC7 compiler
GX_OPTION = -GX
GZ_OPTION = -GZ
ifeq ($(ARCH_DATA_MODEL), 32)
# Lowered opt level to try and reduce footprint, dll size especially.
# Was: CC_OPT/HIGHEST = -O2 -G6
...
...
@@ -190,6 +202,7 @@ ifeq ($(CC_VERSION),msvc)
AUTOMATIC_PCH_OPTION =
# VS2005 compiler, only with Platform SDK right now?
GX_OPTION = -EHsc
GZ_OPTION = -RTC1
ifeq ($(ARCH_DATA_MODEL), 32)
CC_OPT/HIGHEST = -O2
CC_OPT/HIGHER = -O1
...
...
@@ -204,6 +217,23 @@ ifeq ($(CC_VERSION),msvc)
# Automatic precompiled header option to use (if COMPILE_APPROACH=batch)
AUTOMATIC_PCH_OPTION =
GX_OPTION = -EHsc
GZ_OPTION = -RTC1
ifeq ($(ARCH_DATA_MODEL), 32)
CC_OPT/HIGHEST = -O2
CC_OPT/HIGHER = -O1
CC_OPT/LOWER = -O1
else
CC_OPT/HIGHEST = -O2
CC_OPT/HIGHER = -O1
CC_OPT/LOWER = -O1
endif
endif
ifeq ($(COMPILER_VERSION), VS2010)
# Automatic precompiled header option to use (if COMPILE_APPROACH=batch)
AUTOMATIC_PCH_OPTION =
GX_OPTION = -EHsc
GZ_OPTION = -RTC1
ifeq ($(ARCH_DATA_MODEL), 32)
CC_OPT/HIGHEST = -O2
CC_OPT/HIGHER = -O1
...
...
@@ -282,6 +312,13 @@ ifeq ($(CC_VERSION),msvc)
CFLAGS_OPT = $(CC_OPT)
CFLAGS_DBG = -Od $(MS_RUNTIME_DEBUG_OPTION)
# REMIND: I don't see where CFLAGS_VS2005 is used. I suspect its
# pulled in as a combined "CFLAGS_$(COMPILER_VERSION)" string
# but the lack of this isn't causing any apparent build problems
# with VS 2010 but it could be causing compiler warnings.
# For now, I will add it for all cases :
CFLAGS_VS2010 += -Zc:wchar_t-
#
# Starting from VS2005 the wchar_t is handled as a built-in C/C++ data type
# by default. However, we expect the wchar_t to be a typedef to the
# unsigned short data type. The -Zc:wchar_t- option restores the old
...
...
@@ -317,6 +354,7 @@ ifeq ($(CC_VERSION),msvc)
# VS2008 has bufferoverflow baked in:
LFLAGS_VS2008 =
LFLAGS_VS2010 =
# LFLAGS are the flags given to $(LINK) and used to build the actual DLL file
BASELFLAGS = -nologo /opt:REF /incremental:no
...
...
This diff is collapsed.
Click to expand it.
make/common/Modules.gmk
浏览文件 @
f9d62425
...
...
@@ -357,6 +357,9 @@ initial-module-image-jdk:: initial-module-image-jdk-setup \
$(MKDIR) -p $(JDK_MODULE_IMAGE_DIR)/bin
$(CP) $(BINDIR)/*$(EXE_SUFFIX) $(JDK_MODULE_IMAGE_DIR)/bin
$(CP) $(BINDIR)/jli.$(LIBRARY_SUFFIX) $(JDK_MODULE_IMAGE_DIR)/bin
ifeq ($(COMPILER_VERSION), VS2010)
$(CP) $(BINDIR)/msvc*100.$(LIBRARY_SUFFIX) $(JDK_MODULE_IMAGE_DIR)/bin
endif
ifeq ($(ARCH_DATA_MODEL), 32)
ifeq ($(COMPILER_VERSION), VS2003)
$(CP) $(BINDIR)/msvc*71.$(LIBRARY_SUFFIX) $(JDK_MODULE_IMAGE_DIR)/bin
...
...
This diff is collapsed.
Click to expand it.
make/common/Release.gmk
浏览文件 @
f9d62425
...
...
@@ -749,6 +749,8 @@ initial-image-jre-sol64:: initial-image-jre-setup \
$(RM) `$(FIND) $(JRE_IMAGE_DIR)/lib -name 'ir.idl'`
# Construct an initial jre image (initial jdk jre) no trimming or stripping
# See "initial-image-jdk-setup" for an explanation of the rm of
# drive names like C:
initial-image-jre:: initial-image-jre-setup \
$(JRE_LICENSES) $(JRE_DOCFILES) \
$(RT_JAR) $(RESOURCES_JAR) $(JSSE_JAR) \
...
...
@@ -759,6 +761,10 @@ initial-image-jre:: initial-image-jre-setup \
$(MKDIR) -p $(JRE_IMAGE_DIR)/lib/applet
@# Copy in lib directory
$(CD) $(OUTPUTDIR) && $(FIND) lib -depth | $(CPIO) -pdum $(JRE_IMAGE_DIR)
ifeq ($(USING_CYGWIN),true)
$(RM) -rf $(JRE_IMAGE_DIR)/[A-Za-z]:
$(RM) -rf $(OUTPUTDIR)/[A-Za-z]:
endif
@# Make sure all directories are read/execute for everyone
$(CHMOD) a+rx `$(FIND) $(JRE_IMAGE_DIR) -type d`
@# Remove some files from the jre area
...
...
@@ -858,11 +864,27 @@ endif
######################################################
# Note: cpio ($(CPIO)) sometimes leaves directories without rx access.
# REMIND: the $(RM) calls for patterns like c:, d: following $(CPIO)
# are because the 1.7.x versions of cygwin's cpio command drops these
# in the working directory if the output path begins with that pattern
# The one for the output jre subdirectory gets there because cpio sees its
# own dropping in the input jre subdirectory. Need to remove both of these.
# We can remove these RM's if someone figures out how to stop cpio from
# leaving these there.
# Note that its a real problem not because this directory can end up in the
# bundle (I think it won't since it not in bin or lib and those are the
# only places from which we copy everything), but because the presence
# of this file causes cygwin's find to bomb out, thus breaking the build
# in "install".
initial-image-jdk-setup:
$(RM) -r $(JDK_IMAGE_DIR)
$(MKDIR) -p $(JDK_IMAGE_DIR)/jre
($(CD) $(JRE_IMAGE_DIR) && $(FIND) . -depth -print \
| $(CPIO) -pdum $(JDK_IMAGE_DIR)/jre )
ifeq ($(USING_CYGWIN),true)
$(RM) -rf $(JRE_IMAGE_DIR)/[A-Za-z]:
$(RM) -rf $(JDK_IMAGE_DIR)/jre/[A-Za-z]:
endif
$(RM) -rf $(JDK_IMAGE_DIR)/jre/man
$(CHMOD) a+rx `$(FIND) $(JDK_IMAGE_DIR) -type d`
...
...
@@ -923,6 +945,9 @@ initial-image-jdk:: initial-image-jdk-setup \
$(MKDIR) -p $(JDK_IMAGE_DIR)/bin
$(CP) $(BINDIR)/*$(EXE_SUFFIX) $(JDK_IMAGE_DIR)/bin
$(CP) $(BINDIR)/jli.$(LIBRARY_SUFFIX) $(JDK_IMAGE_DIR)/bin
ifeq ($(COMPILER_VERSION), VS2010)
$(CP) $(BINDIR)/msvc*100.$(LIBRARY_SUFFIX) $(JDK_IMAGE_DIR)/bin
endif
ifeq ($(ARCH_DATA_MODEL), 32)
ifeq ($(COMPILER_VERSION), VS2003)
$(CP) $(BINDIR)/msvc*71.$(LIBRARY_SUFFIX) $(JDK_IMAGE_DIR)/bin
...
...
This diff is collapsed.
Click to expand it.
make/common/shared/Compiler-msvc.gmk
浏览文件 @
f9d62425
...
...
@@ -67,7 +67,7 @@ ifeq ($(PLATFORM), windows)
COMPILER_VERSION=VS2005
REBASE = $(COMPILER_PATH)../../Common8/Tools/Bin/rebase
MTL = $(COMPILER_PATH)../../Common8/Tools/Bin/midl
MT = $(MSDEVTOOLS_PATH)mt
MT = $(MSDEVTOOLS_PATH)
/
mt
ifndef COMPILER_PATH
COMPILER_PATH := $(error COMPILER_PATH cannot be empty here)
endif
...
...
@@ -83,6 +83,17 @@ ifeq ($(PLATFORM), windows)
COMPILER_PATH := $(error COMPILER_PATH cannot be empty here)
endif
endif
ifeq ($(CC_MAJORVER), 16)
COMPILER_NAME=Visual Studio 10
COMPILER_VERSION=VS2010
#rebase and midl moved out of Visual Studio into the SDK:
REBASE = $(MSDEVTOOLS_PATH)/rebase
MTL = $(MSDEVTOOLS_PATH)/midl.exe
MT = $(MSDEVTOOLS_PATH)mt
ifndef COMPILER_PATH
COMPILER_PATH := $(error COMPILER_PATH cannot be empty here)
endif
endif
else
# else ARCH_DATA_MODEL is 64
LINK_VER := $(shell $(LINK) | $(HEAD) -n 1 | $(NAWK) '{print $$6}')
...
...
@@ -122,6 +133,15 @@ ifeq ($(PLATFORM), windows)
COMPILER_VERSION=VS2008
RC = $(MSSDK61)/Bin/X64/rc.exe
MT = $(MSSDK61)/Bin/X64/mt.exe
MTL = $(MSSDK61)/Bin/X64/midl.exe
endif
ifeq ($(CC_MAJORVER), 16)
COMPILER_NAME=Microsoft Visual Studio 10 (16.00.30319.01)
COMPILER_VERSION=VS2010
RC = $(MSDEVTOOLS_PATH)/Bin/x64/rc.exe
RSC = $(MSDEVTOOLS_PATH)/Bin/x64/rc.exe
MT = $(MSDEVTOOLS_PATH)/Bin/x64/mt.exe
MTL = $(MSDEVTOOLS_PATH)/Bin/X64/midl.exe
endif
# This will cause problems if ALT_COMPILER_PATH is defined to ""
# which is a directive to use the PATH.
...
...
This diff is collapsed.
Click to expand it.
make/common/shared/Defs-versions.gmk
浏览文件 @
f9d62425
...
...
@@ -165,10 +165,10 @@ ifeq ($(PLATFORM), windows)
REQUIRED_DXSDK_VER = 0x0900
ifeq ($(CC_VERSION),msvc)
ifeq ($(ARCH_DATA_MODEL), 32)
REQUIRED_COMPILER_NAME = Visual Studio
9
REQUIRED_COMPILER_VERSION = VS20
08
REQUIRED_CC_VER = 1
5.00.21022.08
REQUIRED_LINK_VER =
9.00.21022.08
REQUIRED_COMPILER_NAME = Visual Studio
10
REQUIRED_COMPILER_VERSION = VS20
10
REQUIRED_CC_VER = 1
6.00.30319.01
REQUIRED_LINK_VER =
10.00.30319.01
else
ifeq ($(ARCH), ia64)
REQUIRED_COMPILER_NAME = Microsoft Platform SDK - November 2001 Edition
...
...
@@ -177,10 +177,10 @@ ifeq ($(PLATFORM), windows)
REQUIRED_LINK_VER = 7.00.9337.7
endif
ifeq ($(ARCH), amd64)
REQUIRED_COMPILER_NAME =
Microsoft Windows SDK with Visual Studio 9 (6001.18000.367)
REQUIRED_COMPILER_VERSION = VS20
08
REQUIRED_CC_VER = 1
5.00.21022.08
REQUIRED_LINK_VER =
9.00.21022.08
REQUIRED_COMPILER_NAME =
Visual Studio 10
REQUIRED_COMPILER_VERSION = VS20
10
REQUIRED_CC_VER = 1
6.00.30319.01
REQUIRED_LINK_VER =
10.00.30319.01
endif
endif
endif
...
...
This diff is collapsed.
Click to expand it.
make/common/shared/Defs-windows.gmk
浏览文件 @
f9d62425
...
...
@@ -248,26 +248,34 @@ ifeq ($(ARCH_DATA_MODEL), 32)
# If we still don't have it, look for VSnnCOMNTOOLS (newest first),
# set by installer?
ifeq ($(_msvc_dir),)
ifdef VS
9
0COMNTOOLS # /Common/Tools directory, use ../../Vc
xVS
90COMNTOOLS :="$(subst \,/,$(VS9
0COMNTOOLS))"
_vs
90tools :=$(call FullPath,$(xVS9
0COMNTOOLS))
ifdef VS
10
0COMNTOOLS # /Common/Tools directory, use ../../Vc
xVS
100COMNTOOLS :="$(subst \,/,$(VS10
0COMNTOOLS))"
_vs
100tools :=$(call FullPath,$(xVS10
0COMNTOOLS))
endif
ifneq ($(_vs
9
0tools),)
_msvc_dir :=$(_vs
9
0tools)/../../Vc
ifneq ($(_vs
10
0tools),)
_msvc_dir :=$(_vs
10
0tools)/../../Vc
else
ifdef VS
8
0COMNTOOLS # /Common/Tools directory, use ../../Vc
xVS
80COMNTOOLS :="$(subst \,/,$(VS8
0COMNTOOLS))"
_vs
80tools :=$(call FullPath,$(xVS8
0COMNTOOLS))
ifdef VS
9
0COMNTOOLS # /Common/Tools directory, use ../../Vc
xVS
90COMNTOOLS :="$(subst \,/,$(VS9
0COMNTOOLS))"
_vs
90tools :=$(call FullPath,$(xVS9
0COMNTOOLS))
endif
ifneq ($(_vs
8
0tools),)
_msvc_dir :=$(_vs
8
0tools)/../../Vc
ifneq ($(_vs
9
0tools),)
_msvc_dir :=$(_vs
9
0tools)/../../Vc
else
ifdef VS
71COMNTOOLS # /Common/Tools directory, use ../../Vc7
xVS
71COMNTOOLS :="$(subst \,/,$(VS71
COMNTOOLS))"
_vs
71tools :=$(call FullPath,$(xVS71
COMNTOOLS))
ifdef VS
80COMNTOOLS # /Common/Tools directory, use ../../Vc
xVS
80COMNTOOLS :="$(subst \,/,$(VS80
COMNTOOLS))"
_vs
80tools :=$(call FullPath,$(xVS80
COMNTOOLS))
endif
ifneq ($(_vs71tools),)
_msvc_dir :=$(_vs71tools)/../../Vc7
ifneq ($(_vs80tools),)
_msvc_dir :=$(_vs80tools)/../../Vc
else
ifdef VS71COMNTOOLS # /Common/Tools directory, use ../../Vc7
xVS71COMNTOOLS :="$(subst \,/,$(VS71COMNTOOLS))"
_vs71tools :=$(call FullPath,$(xVS71COMNTOOLS))
endif
ifneq ($(_vs71tools),)
_msvc_dir :=$(_vs71tools)/../../Vc7
endif
endif
endif
endif
...
...
@@ -276,12 +284,15 @@ ifeq ($(ARCH_DATA_MODEL), 32)
_compiler_bin :=$(_msvc_dir)/Bin
# Assume PlatformSDK is in VS71 (will be empty if VS90)
_ms_sdk :=$(call FullPath,$(_msvc_dir)/PlatformSDK)
# Assume VS90, then VS80, then VS71
_redist_sdk :=$(call FullPath,$(_msvc_dir)/redist/x86/Microsoft.VC
9
0.CRT)
# Assume VS
100, then VS
90, then VS80, then VS71
_redist_sdk :=$(call FullPath,$(_msvc_dir)/redist/x86/Microsoft.VC
10
0.CRT)
ifeq ($(_redist_sdk),)
_redist_sdk :=$(call FullPath,$(_msvc_dir)/redist/x86/Microsoft.VC
8
0.CRT)
_redist_sdk :=$(call FullPath,$(_msvc_dir)/redist/x86/Microsoft.VC
9
0.CRT)
ifeq ($(_redist_sdk),)
_redist_sdk :=$(call FullPath,$(_msvc_dir)/../SDK/v1.1/Bin)
_redist_sdk :=$(call FullPath,$(_msvc_dir)/redist/x86/Microsoft.VC80.CRT)
ifeq ($(_redist_sdk),)
_redist_sdk :=$(call FullPath,$(_msvc_dir)/../SDK/v1.1/Bin)
endif
endif
endif
endif
...
...
@@ -316,23 +327,40 @@ ifeq ($(_ms_sdk),)
endif
endif
# Compilers for 64bit are from SDK
# Compilers for 64bit may be from SDK. For VS 2010 we use those.
# The Express compilers don't contain 64 bit compilers, so in
# that case, you additionally need the SDK. At this time,
# there's no 64 bit SDK available that has VS 2010.
# Presumably SDK v7.1 will provide that and we may want to update
# the logic here to work with that.
# However official builds will use the Professional version.
ifeq ($(ARCH_DATA_MODEL), 64)
xVS2008 :="$(_program_files32)/Microsoft Visual Studio 9.0/"
VS2008 :=$(call FullPath,$(xVS2008))
ifneq ($(VS2008),)
_compiler_bin :=$(VS2008)/VC/Bin/$(ARCH)
xMSSDK61 :="$(_program_files)/Microsoft SDKs/Windows/v6.1/"
MSSDK61 :=$(call FullPath,$(xMSSDK61))
_redist_sdk :=$(VS2008)/VC/redist/x86/Microsoft.VC90.CRT
ifdef VS100COMNTOOLS # /Common7/Tools directory, use ../../Vc
xVS100COMNTOOLS :="$(subst \,/,$(VS100COMNTOOLS))"
_vs100tools :=$(call FullPath,$(xVS100COMNTOOLS))
endif
ifneq ($(_vs100tools),)
_compiler_bin :=$(_vs100tools)/../../Vc/bin/amd64
_redist_sdk :=$(_vs100tools)/../../Vc/redist/x64/Microsoft.VC100.CRT
xMSSDK70 :="$(_program_files32)/Microsoft SDKs/Windows/v7.0a/"
MSSDK70 :=$(call FullPath,$(xMSSDK70))
else
ifneq ($(_ms_sdk),)
ifeq ($(ARCH), ia64)
_compiler_bin :=$(_ms_sdk)/Bin/Win64
endif
ifeq ($(ARCH), amd64)
_compiler_bin :=$(_ms_sdk)/Bin/Win64/x86/$(ARCH)
_redist_sdk :=$(_ms_sdk)/redist/win64/AMD64
xVS2008 :="$(_program_files32)/Microsoft Visual Studio 9.0/"
VS2008 :=$(call FullPath,$(xVS2008))
ifneq ($(VS2008),)
_compiler_bin :=$(VS2008)/VC/Bin/$(ARCH)
xMSSDK61 :="$(_program_files)/Microsoft SDKs/Windows/v6.1/"
MSSDK61 :=$(call FullPath,$(xMSSDK61))
_redist_sdk :=$(VS2008)/VC/redist/x86/Microsoft.VC90.CRT
else
ifneq ($(_ms_sdk),)
ifeq ($(ARCH), ia64)
_compiler_bin :=$(_ms_sdk)/Bin/Win64
endif
ifeq ($(ARCH), amd64)
_compiler_bin :=$(_ms_sdk)/Bin/Win64/x86/$(ARCH)
_redist_sdk :=$(_ms_sdk)/redist/win64/AMD64
endif
endif
endif
endif
...
...
@@ -454,10 +482,14 @@ MSVCRT_DLL_PATH:=$(call AltCheckValue,MSVCRT_DLL_PATH)
ifeq ($(ARCH_DATA_MODEL), 32)
_NEEDS_MSVCRNN = true
else
ifeq ($(VS2008),)
_NEEDS_MSVCRNN = false
else
ifneq ($(VS2010),)
_NEEDS_MSVCRNN = true
else
ifneq ($(VS2008),)
_NEEDS_MSVCRNN = true
else
_NEEDS_MSVCRNN = false
endif
endif
endif
...
...
@@ -557,6 +589,17 @@ else
endif
CSCRIPT:=$(call AltCheckSpaces,CSCRIPT)
# CABARC: path to cabarc.exe (used in creating install bundles)
ifdef ALT_CABARC
xALT_CABARC :="$(subst \,/,$(ALT_CABARC))"
CABARC =$(xALT_CABARC)
else
_CABARC1 :=$(_system_root)/system32/cabarc.exe
_CABARC2 :=$(DEVTOOLS_PATH)cabarc.exe
CABARC :=$(call FileExists,$(_CABARC1),$(_CABARC2))
endif
CABARC:=$(call AltCheckSpaces,CABARC)
# MSIVAL2: path to msival2.exe (used in validating install msi files)
ifdef ALT_MSIVAL2
xALT_MSIVAL2 :="$(subst \,/,$(ALT_MSIVAL2))"
...
...
This diff is collapsed.
Click to expand it.
make/common/shared/Platform.gmk
浏览文件 @
f9d62425
...
...
@@ -275,7 +275,12 @@ ifeq ($(PLATFORM), windows)
endif
ARCH_FAMILY = $(ARCH)
# Where is unwanted output to be delivered?
DEV_NULL = NUL
# MKS uses the special file "NUL", cygwin uses the customary unix file.
ifeq ($(USING_CYGWIN),true)
DEV_NULL = /dev/null
else
DEV_NULL = NUL
endif
export DEV_NULL
# Classpath separator
CLASSPATH_SEPARATOR = ;
...
...
This diff is collapsed.
Click to expand it.
src/share/bin/main.c
浏览文件 @
f9d62425
...
...
@@ -33,14 +33,16 @@
#include "defines.h"
#ifdef _MSC_VER
#if _MSC_VER > 1400
#if _MSC_VER > 1400
&& _MSC_VER < 1600
/*
* When building for Microsoft Windows, main has a dependency on msvcr??.dll.
*
* When using Visual Studio 2005 or
later
, that must be recorded in
* When using Visual Studio 2005 or
2008
, that must be recorded in
* the [java,javaw].exe.manifest file.
*
* As of VS2010 (ver=1600), the runtimes again no longer need manifests.
*
* Reference:
* C:/Program Files/Microsoft SDKs/Windows/v6.1/include/crtdefs.h
*/
...
...
@@ -67,7 +69,7 @@
"publicKeyToken='" _VC_ASSEMBLY_PUBLICKEYTOKEN "'\"")
#endif
/* _M_AMD64 */
#endif
/* _MSC_VER > 1400 */
#endif
/* _MSC_VER > 1400
&& _MSC_VER < 1600
*/
#endif
/* _MSC_VER */
/*
...
...
This diff is collapsed.
Click to expand it.
src/windows/bin/java_md.c
浏览文件 @
f9d62425
...
...
@@ -148,11 +148,18 @@ LoadMSVCRT()
* assumed to be present in the "JRE path" directory. If it is not found
* there (or "JRE path" fails to resolve), skip the explicit load and let
* nature take its course, which is likely to be a failure to execute.
* This is clearly completely specific to the exact compiler version
* which isn't very nice, but its hardly the only place.
* No attempt to look for compiler versions in between 2003 and 2010
* as we aren't supporting building with those.
*/
#ifdef _MSC_VER
#if _MSC_VER < 1400
#define CRT_DLL "msvcr71.dll"
#endif
#if _MSC_VER >= 1600
#define CRT_DLL "msvcr100.dll"
#endif
#ifdef CRT_DLL
if
(
GetJREPath
(
crtpath
,
MAXPATHLEN
))
{
(
void
)
JLI_StrCat
(
crtpath
,
"
\\
bin
\\
"
CRT_DLL
);
/* Add crt dll */
...
...
This diff is collapsed.
Click to expand it.
src/windows/native/sun/jkernel/DownloadDialog.cpp
浏览文件 @
f9d62425
...
...
@@ -29,7 +29,10 @@
#define STRICT
#ifndef _WIN32_WINNT
#define _WIN32_WINNT 0x0400
/* REMIND : 0x500 means Windows 2000 .. seems like we can update
* for Windows XP when we move the SDK and build platform
*/
#define _WIN32_WINNT 0x0500
#endif
#define _ATL_APARTMENT_THREADED
...
...
This diff is collapsed.
Click to expand it.
src/windows/native/sun/jkernel/DownloadHelper.cpp
浏览文件 @
f9d62425
...
...
@@ -29,7 +29,10 @@
#define STRICT
#ifndef _WIN32_WINNT
#define _WIN32_WINNT 0x0400
/* REMIND : 0x500 means Windows 2000 .. seems like we can update
* for Windows XP when we move the SDK and build platform
*/
#define _WIN32_WINNT 0x0500
#endif
#define _ATL_APARTMENT_THREADED
...
...
This diff is collapsed.
Click to expand it.
src/windows/native/sun/jkernel/stdafx.h
浏览文件 @
f9d62425
...
...
@@ -36,7 +36,10 @@
#define STRICT
#ifndef _WIN32_WINNT
#define _WIN32_WINNT 0x0400
/* REMIND : 0x500 means Windows 2000 .. seems like we can update
* for Windows XP when we move the SDK and build platform
*/
#define _WIN32_WINNT 0x0500
#endif
#define _ATL_APARTMENT_THREADED
...
...
This diff is collapsed.
Click to expand it.
src/windows/native/sun/windows/awt_DesktopProperties.cpp
浏览文件 @
f9d62425
...
...
@@ -233,7 +233,19 @@ void AwtDesktopProperties::GetNonClientParameters() {
//
NONCLIENTMETRICS
ncmetrics
;
ncmetrics
.
cbSize
=
sizeof
(
ncmetrics
);
// Fix for 6944516: specify correct size for ncmetrics on WIN2K/XP
// Microsoft recommend to subtract the size of 'iPaddedBorderWidth' field
// when running on XP. However this can't be referenced at compile time
// with the older SDK, so there use 'lfMessageFont' plus its size.
if
(
!
IS_WINVISTA
)
{
#if defined(_MSC_VER) && (_MSC_VER >= 1600) {
ncmetrics
.
cbSize
=
offsetof
(
NONCLIENTMETRICS
,
iPaddedBorderWidth
);
#else
ncmetrics
.
cbSize
=
offsetof
(
NONCLIENTMETRICS
,
lfMessageFont
)
+
sizeof
(
LOGFONT
);
#endif
}
else
{
ncmetrics
.
cbSize
=
sizeof
(
ncmetrics
);
}
VERIFY
(
SystemParametersInfo
(
SPI_GETNONCLIENTMETRICS
,
ncmetrics
.
cbSize
,
&
ncmetrics
,
FALSE
)
);
SetFontProperty
(
TEXT
(
"win.frame.captionFont"
),
ncmetrics
.
lfCaptionFont
);
...
...
This diff is collapsed.
Click to expand it.
src/windows/native/sun/windows/awt_DnDDS.cpp
浏览文件 @
f9d62425
...
...
@@ -29,21 +29,16 @@
//we need <new> inclusion for STL "new" oprators set.
#define bad_alloc zbad_alloc
#include <new>
#pragma pop_macro("bad_alloc")
//"bad_alloc" is undefined from here
//we need to include any STL container before <awt.h> inclusion due to
//"new" re-redefinition that is in conflict with in-place new allocator
//applied in STL.
#if defined(_DEBUG) || defined(DEBUG)
//forward declaration of "new" operator from <awt.h>
extern
void
*
operator
new
(
size_t
size
,
const
char
*
filename
,
int
linenumber
);
//"new" operator definition that is consistent with re-defined
//in <awt.h> "delete" operator
void
*
operator
new
(
size_t
size
)
{
return
operator
new
(
size
,
"stl"
,
1
);}
extern
void
*
operator
new
(
size_t
size
,
const
char
*
filename
,
int
linenumber
);
void
*
operator
new
(
size_t
size
)
{
return
operator
new
(
size
,
"stl"
,
1
);}
#endif
#include <map>
#pragma pop_macro("bad_alloc")
//"bad_alloc" is undefined from here
#include <awt.h>
#include <shlobj.h>
...
...
This diff is collapsed.
Click to expand it.
src/windows/native/sun/windows/awt_TextArea.cpp
浏览文件 @
f9d62425
...
...
@@ -758,7 +758,7 @@ AwtTextArea::HandleEvent(MSG *msg, BOOL synthetic)
si
.
cbSize
=
sizeof
(
SCROLLINFO
);
si
.
fMask
=
SIF_POS
|
SIF_RANGE
|
SIF_PAGE
;
int
actualScrollLines
=
abs
(
platfScrollLines
*
(
*
delta_accum
/
WHEEL_DELTA
));
abs
(
(
int
)(
platfScrollLines
*
(
*
delta_accum
/
WHEEL_DELTA
)
));
for
(
int
i
=
0
;
i
<
actualScrollLines
;
i
++
)
{
if
(
::
GetScrollInfo
(
hWnd
,
sb_type
,
&
si
))
{
if
((
wm_msg
==
WM_VSCROLL
)
...
...
This diff is collapsed.
Click to expand it.
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录
新手
引导
客服
返回
顶部