Commit Graph

178 Commits

Author SHA1 Message Date
Kelly O'Hair
8c64c68089 Merge 2011-01-16 12:10:18 -08:00
Kelly O'Hair
d7cd379d57 6950375: Remove msvcrt.dll from the Windows JRE bundles
Reviewed-by: prr
2011-01-14 14:04:54 -08:00
Kelly O'Hair
1a80af87fe 7008047: remove sanity check of msival tool from JDK tree
Reviewed-by: billyh
2011-01-13 13:49:18 -08:00
Kelly O'Hair
dfecf0dd97 Merge 2011-01-10 22:26:47 -08:00
Kelly O'Hair
d0cebf1350 6989472: Provide simple jdk identification information in the install image
Reviewed-by: alanb
2011-01-10 18:07:58 -08:00
Kelly O'Hair
da42f22c48 Merge 2011-01-10 17:53:01 -08:00
Kelly O'Hair
fc42d65040 7011382: Fix use of VS100COMNTOOLS when installed in non-default or non-space path
Reviewed-by: prr
2011-01-10 17:00:05 -08:00
Kelly O'Hair
c5d2b222a9 6980024: Rebranding jre7/jdk7 License, Copyright, Readme
6912291: Third party license agreement should be present in all bundles

Reviewed-by: katleman
2011-01-07 21:52:35 -08:00
Jonathan Gibbons
dd5f96536e 7010537: javah no longer depends on javadoc
Reviewed-by: ohair
2011-01-06 14:32:00 -08:00
Kelly O'Hair
ab7cdfe74f 6975326: Problem in install/make/rebase/Makefile, grep on empty pattern
6413588: Add 'ldd -r' and 'dump -Lv' checks to all .so files delivered in the JDK
7000995: Add check in makefiles to verify that msvcp100.dll is NOT used

Reviewed-by: mduigou
2011-01-05 14:28:58 -08:00
Kelly O'Hair
875160bd93 6991482: Add global jdk makefile options to silence some VS2010 warnings
Reviewed-by: prr
2010-12-28 16:12:31 -08:00
Kelly O'Hair
6b6a611c8e 6962318: Update copyright year
Reviewed-by: xdono
2010-12-28 15:53:50 -08:00
Kelly O'Hair
dc779fa3eb Merge 2010-12-24 11:17:10 -08:00
Kelly O'Hair
1c49ac1a78 7008723: Remove binary plugs creation and use from openjdk
Reviewed-by: mchung, andrew, aph, dholmes
2010-12-23 18:50:21 -08:00
Kelly O'Hair
bf2ba650f9 6360517: ALT_MSDEVTOOLS_PATH and rc.exe location, and rebase location
Reviewed-by: ksrini
2010-12-21 18:21:26 -08:00
Lana Steuck
0abd11c293 Merge 2010-12-20 21:09:57 -08:00
Kelly O'Hair
019f0eb58c 6909026: Change GNU make version requirement to 3.81
Reviewed-by: robilad
2010-12-18 18:28:01 -08:00
Lana Steuck
9ed3faea7a Merge 2010-12-13 16:25:26 -08:00
Mike Duigou
dd0d8c601c 7004205: fixes handling of sane-gcc-compiler on 32-bit linux and solaris. Previously committed as 6998016 and 6998012
Reviewed-by: ohair, dholmes
2010-12-06 19:37:40 -08:00
Andrew Brygin
96a9987699 6980281: SWAT: SwingSet2 got core dumped in Solaris-AMD64 using b107 swat build
Reviewed-by: prr, ohair
2010-12-05 15:51:31 +03:00
Kelly O'Hair
05ca2bb455 6987107: Add variable to add to but not modify non-fcs version string
Reviewed-by: jcoomes, dholmes, andrew, kvn
2010-11-30 17:46:42 -08:00
Andrew John Hughes
a296bc0a0a 7000225: Sanity check on sane-alsa-headers is broken
Fix use of tab separators, ${alsa_version} expansion and conditional

Reviewed-by: ohair
2010-11-23 02:17:23 +00:00
Qi Zuo
ce8fb6a9cb Merge 2010-10-18 11:25:28 -04:00
Lana Steuck
53e6cf8989 Merge 2010-09-25 12:00:05 -07:00
Kelly O'Hair
f181e2fb8f 6987114: Fix top level "test" Makefile logic, add jdk/make/Makefile test target
6987113: Remove SCCS logic from makefiles

Reviewed-by: mchung
2010-09-24 14:22:01 -07:00
Kelly O'Hair
86803785e8 6946527: rebranding system properties per Oracle Requirements (vendor)
Changes from "Sun Microsystems, Inc." to "Oracle Corporation" in the java.vendor, java.specification.vendor and java.vendor.url Java system properties. Also change of Windows COMPANY file property from "Oracle" to "Oracle Corporation".

Reviewed-by: lancea, flar
2010-09-22 11:06:50 -07:00
Andy Herrick
577dd2fc6d Merge 2010-09-16 12:19:52 -04:00
Kelly O'Hair
9f5159e694 6974017: Upgrade required Solaris Studio compilers to 5.10 (12 update 1 + patches)
Reviewed-by: jcoomes
2010-09-08 15:12:37 -07:00
Igor Nekrestyanov
08c9310254 6982499: ant detection is fragile on windows. especially using cygwin
Reviewed-by: ohair
2010-09-07 11:28:28 -07:00
Igor Nekrestyanov
dc9d72b5b1 6982774: HOTSPOT_IMPORT_PATH detection does not work as expected
Reviewed-by: herrick, ohair
2010-09-07 11:24:28 -07:00
Qi Zuo
6a4b939143 Merge 2010-09-02 09:23:28 -04:00
Igor Nekrestyanov
c66d80c2d5 6981436: Variable gets hidden if Defs-javadoc is included
Reviewed-by: ohair
2010-09-01 09:36:38 -07:00
Kelly O'Hair
fb2ceb5470 6932743: Makefiles not parsing version strings with - from uname -r
Reviewed-by: mchung
2010-08-18 13:46:39 -07:00
Kelly O'Hair
737e6157fe 6974005: Use of cygpath in Makefile logic needs to silence error messages
Reviewed-by: mchung
2010-08-18 13:46:02 -07:00
Kelly O'Hair
f6c4154043 6973616: Update minimum boot jdk from 1.5 to 1.6
Reviewed-by: igor, jjg
2010-08-02 16:31:26 -07:00
Lana Steuck
6b9ad54671 Merge 2010-07-12 19:42:02 -07:00
Igor Nekrestyanov
1e8cbf3a53 6967050: JDK build issues with cygwin/vc2010
Reviewed-by: prr, ohair
2010-07-06 18:23:14 -07:00
Lana Steuck
acc448eb85 Merge 2010-06-29 10:50:11 -07:00
Kelly O'Hair
43eef4d0ef 6931871: Rebranding of javadoc generation in makefiles
6951293: control docs target does not work on windows

Reviewed-by: jjg
2010-06-22 10:54:38 -07:00
Lana Steuck
ac40d6f126 Merge 2010-06-21 22:08:10 -07:00
Kelly O'Hair
4c7ea8f9ef 6960853: Cleanup makefiles, remove unused vars etc
Reviewed-by: alanb
2010-06-20 14:51:33 -07:00
Phil Race
2e9f8b9c55 6961079: Build JDK7 for 64 bit Windows using free Windows 7.1 SDK 64 bit compilers
Reviewed-by: ohair, jcoomes
2010-06-16 09:42:39 -07:00
Lana Steuck
27a539e27c Merge 2010-06-07 17:08:26 -07:00
Lana Steuck
fd45b4188c Merge 2010-05-28 12:10:14 -07:00
Kelly O'Hair
bef3a5238c 6955707: Correct addNotices.sh logic in Makefiles
6949590: exes(java.exe, javaws.exe) show Copyright Year as 2004, COMPANY as Sun

Reviewed-by: weijun, alanb
2010-05-28 11:09:24 -07:00
Kelly O'Hair
fe008ae27a 6943119: Rebrand source copyright notices
Reviewed-by: darcy, weijun
2010-05-25 15:58:33 -07:00
Lana Steuck
ff8daaf36c Merge 2010-05-24 09:06:11 -07:00
Kelly O'Hair
d738280014 6954064: Fix the windows arch settings in the makefiles and chmod logic in test/Makefile
Reviewed-by: wetmore
2010-05-20 13:57:58 -07:00
Phil Race
ca5f8bd9bb 6903970: VS2008/VS2010 build fails in make/sun/jkernel because of "afxres.h" missing
Reviewed-by: ohair, art
2010-05-19 09:45:05 -07:00
Phil Race
325809a3cd 6931180: Migration to recent versions of MS Platform SDK
6944048: VS2010 build failure in make/com/sun/java/pack: missing unpack200.exe.manifest
6944015: VS2010 build failure in awt_TextArea.cpp: ambiguous call to abs()
6936319: JDK build fails in awt_DnDDS.cpp with Visual Studio 2008/Platform SDK 7
6944516: Windows L&F is broken in SwingSet2, when JDK is built with the recent Windows SDK

Changes to enable building JDK7 with Microsoft Visual Studio 2010

Reviewed-by: ohair, art, ccheung, dcubed
2010-05-11 14:36:10 -07:00
Kelly O'Hair
fa7b68252b 6931763: sanity checks broken with latest cygwin, newer egrep -i option problems
Reviewed-by: jjg
2010-03-03 11:29:44 -08:00
Lana Steuck
642193f708 Merge 2010-02-17 10:24:30 -08:00
Mandy Chung
d9eac222f1 6915413: Module build: building of specified jdk components instead of all
Define new SUBDIRS_* variables for specifying components for one group

Reviewed-by: ohair
2010-02-10 17:51:07 -08:00
Lana Steuck
19f13aa80b Merge 2010-02-08 23:59:22 -08:00
Andrew John Hughes
2d314b47cd 6917466: Should set bootclasspath for javadoc in jdk build
Javadoc needs to reference the newly built classes so as not to hit APIs which differ between the boot JDK and the source files of the JDK being built.

Reviewed-by: ohair
2010-01-29 02:38:22 +00:00
Vasanth Venkatachalam
688eab1157 6580131: 3/4 CompiledMethodLoad events don't produce the expected extra notifications to describe inlining
Add support for additional implementation specific info to the JVM/TI CompiledMethodLoad event via the compile_info parameter.

Reviewed-by: never, ohair, tbell, tdeneau
2010-01-20 12:09:31 -07:00
Mandy Chung
b4749c950a 6911737: Module build: generate modules with native libraries and any other files not in jar
Create modules under OUTPUTDIR/modules directory containing resources, native libraries

Reviewed-by: alanb, ohair
2010-01-07 08:14:48 -08:00
Gary Benson
d6a4ac9734 6903453: Zero build on ARM and IA-64
Correctly set uname on ARM, and correctly build fdlibm on IA-64

Reviewed-by: ohair
2009-11-23 10:04:47 +00:00
Jonathan Gibbons
302bb54494 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
Reviewed-by: darcy
2009-10-19 13:43:25 -07:00
Tim Bell
1c6255de3e 6888888: new javah throws NullPointerException when building in jdk/make/java/nio
Use the bootstrap javah during the build until bug-ID 6889255 is fixed

Reviewed-by: jjg
2009-10-07 13:53:11 -07:00
Yuri Nesterenko
926d6d625a Merge 2009-09-09 00:51:06 -07:00
Peter Zhelezniakov
39c5985ede 6844267: Nimbus generator depends on JIBX
Nimbus generator now uses JAXB instead of JIBX

Reviewed-by: jasper
2009-08-31 13:56:34 +04:00
Andrew John Hughes
85c26d2c57 6873059: Explicitly use -source 6 -target 6 when compiling with the boot jdk javac
The bootstrap javac currently uses the default source and targets of the boot javac

Reviewed-by: ohair
2009-08-18 19:50:12 +01:00
Tim Bell
35107a8833 Merge 2009-07-30 23:40:15 -07:00
Xiomara Jayasena
e0c1d51604 6862919: Update copyright year
Update copyright for files that have been modified in 2009, up to 07/09

Reviewed-by: tbell, ohair
2009-07-28 12:12:54 -07:00
Jonathan Gibbons
50dfd0ebd9 6854244: change source/target used to compile JDK to 7
Reviewed-by: ohair
2009-07-27 15:19:55 -07:00
Andy Herrick
974a4682e4 Merge 2009-06-29 12:06:42 -04:00
Andy Herrick
b8b39b3d37 6633813: Add standard hotspot import path for Kernel VM
This problem was discovered testing initial changeset for implementing 6uX Deployment Features into JDK7

Reviewed-by: dgu, billyh
2009-06-24 14:49:31 -04:00
Andy Herrick
2d11eb64db 6853152: JDK 7 cannot build w/o ALT_HOTSPOT_KERNEL_PATH set. - still broken
This problem was discovered testing initial changeset for implementing 6uX Deployment Features into JDK7

Reviewed-by: dgu, billyh
2009-06-19 15:04:51 -04:00
Andy Herrick
2eaba45345 6852646: JDK 7 cannot build w/o ALT_HOTSPOT_KERNEL_PATH set
This problem was discovered testing initial changeset for implementing 6uX Deployment Features into JDK7

Reviewed-by: dgu, billyh
2009-06-19 11:46:39 -04:00
Andy Herrick
1939fe49d8 Merge 2009-06-15 13:08:29 -04:00
Andy Herrick
e487e25584 6797688: Umbrella: Merge all JDK 6u4 - 6u12 deployment code into JDK7
6845973: Update JDK7 with deployment changes in 6u13, 6u14
4802695: Support 64-bit Java Plug-in and Java webstart on Windows/Linux on AMD64
6825019: DownloadManager should not be loaded and referenced for full JRE
6738770: REGRESSION:JSException throws when use LiveConnect javascript facility
6772884: plugin2 : java.lang.OutOfMemoryError or crash
6707535: Crossing domain hole affecting multiple sites/domains using plug-in
6728071: Non-verification of Update files may allow unintended updates
6704154: Code loaded from local filesystem should not get access to localhost
6727081: Web Start security restrictions bypass using special extension jnlp
6727079: Java Web Start Socket() restriction bypass
6727071: Cache location/user name information disclosure in SingleInstanceImpl
6716217: AppletClassLoader adds permissions based on codebase regardless of CS
6694892: Java Webstart inclusion via system properties override [CVE-2008-2086]
6704074: localhost socket access due to cache location exposed
6703909: Java webstart arbitrary file creation using nativelib
6665315: browser crashes when deployment.properties has more slashes ( / )
6660121: Encoding values in JNLP files can cause buffer overflow
6606110: URLConnection.setProxiedHost for resources that are loaded via proxy
6581221: SSV(VISTA): Redirection FAILS to work if user does a downgrade install
6609756: Buffer Overflow in Java ActiveX component
6608712: Bypassing the same origin policy in Java with crafted names
6534630: "gnumake clobber" doesn't
6849953: JDK7 - replacement of bufferoverflowU.lib on amd64 breaks build
6849029: Need some JDK7 merge clean-up after comments on the webrev
6847582: Build problem on JDK7 with isSecureProperty in merge
6827935: JDK 7 deployment merging - problem in Compiler-msvm.gmk
6823215: latest merge fixes from 6u12 -> JDK7
6816153: further mergers for JDK7 deployment integration
6807074: Fix Java Kernel and JQS in initial JDK7 builds

Initial changeset for implementing 6uX Deployment Features into JDK7

Reviewed-by: dgu, billyh
2009-06-12 14:56:32 -04:00
Tim Bell
54e8ace85c Merge 2009-06-11 21:32:12 -07:00
Yuri Nesterenko
d094861eeb Merge 2009-06-09 23:47:38 -07:00
Andrew John Hughes
62ccd90ee5 6841728: Make building the Nimbus L 'n' F optional (100054)
Add DISABLE_NIMBUS variable to prevent Nimbus subdirs being built

Reviewed-by: mr, ohair
2009-05-21 16:29:58 +01:00
Jonathan Gibbons
6178f3c373 6827026: Change javac source and target default to 7
Reviewed-by: darcy, ohair
2009-05-20 13:55:50 -07:00
Anthony Petrov
013285996b 6833444: _BOOTDIR1/_BOOTDIR2 on MS Windows should be consistent with other platforms
Added optional _BOOTDIR3 that provides the J: path for the BOOTDIR on Windows

Reviewed-by: ohair, xdono
2009-05-19 14:43:49 +04:00
Kelly O'Hair
b324b462d0 6841873: Fix windows redist default location for msvc runtime dlls
Reviewed-by: tbell
2009-05-15 13:14:40 -07:00
Yuri Nesterenko
33484a2710 Merge 2009-04-28 13:41:11 -07:00
Peter Zhelezniakov
c738ebdc67 6591875: Nimbus Swing Look and Feel
Reviewed-by: jasper, ohair
2009-04-25 21:17:50 +04:00
Kelly O'Hair
06a5796034 Merge 2009-04-01 18:45:25 -07:00
Kelly O'Hair
8ed0a99cb6 6825175: Remove or disable sanity check on binary plugs
Reviewed-by: xdono
2009-04-01 16:49:43 -07:00
Kelly O'Hair
a4fccad415 6745361: Add -XX options to prevent stdout/stderr pollution using fastdebug/debug bootjdk
Reviewed-by: tbell
2009-03-31 16:11:09 -07:00
Tim Bell
0a7ba6e27e 6819847: build is broken for OpenJDK with plugs
Reviewed-by: jjg, robilad, ohair
2009-03-31 15:27:40 -07:00
Kelly O'Hair
2ce9a96c01 6822374: Windows: detect X64 when PROCESSOR_IDENTIFIER contains EM64T or Intel64
6822913: Consolidate make/jprt.config files, let JPRT manage this file make it optional in repos

Reviewed-by: tbell
2009-03-26 16:52:00 -07:00
Kelly O'Hair
4091200de7 Merge 2009-03-17 13:45:01 -07:00
Kelly O'Hair
0b7966e54a 6818565: Regression with fix 6816311: COMPILER_VERSION -> REQUIRED_COMPILER_VERSION
Reviewed-by: tbell
2009-03-17 13:44:08 -07:00
Xiomara Jayasena
5d0f0bfb8b Merge 2009-03-16 16:18:28 -07:00
Kelly O'Hair
20f06ceb09 6816311: Changes to allow builds with latest Windows SDK 6.1 on 64bit Windows 2003
These changes create a preference for the newer 6.1 SDK on Windows.

Reviewed-by: tbell
2009-03-16 11:24:06 -07:00
Tim Bell
79bc5884e7 Merge 2009-03-09 23:37:17 -07:00
Jonathan Gibbons
fb317642d0 6810915: Sun proprietary warnings in JDK build
Reviewed-by: ohair
2009-02-26 18:51:57 -08:00
Kelly O'Hair
2fa7dc18d7 6799141: Build with --hash-style=both so that binaries can work on SuSE 10
Reviewed-by: tbell
2009-01-31 17:31:21 -08:00
Tim Bell
6a54f22ae0 6754862: jdk/src/windows/bin/java_md.c: hardcoded reference to msvcr71.dll
6779412: VS2008 errors compiling jdk sources

Update Makefiles to tolerate newer Visual Studio releases and runtimes.

Reviewed-by: ohair
2009-01-14 21:35:03 -08:00
Martin Buchholz
8dc49502e3 6775152: freetype version check program problem main arg order
Fix all compiler warnings

Reviewed-by: ohair, tbell
2008-11-23 09:56:39 -08:00
Xiomara Jayasena
6e86513c3a 6754988: Update copyright year
Update for files that have been modified starting July 2008

Reviewed-by: ohair, tbell
2008-10-02 19:58:32 -07:00
Kelly O'Hair
edb7cf2a91 6746430: Fix problems with getting 'ant -version' and the required setting of 'ANT_HOME'
Reviewed-by: tbell
2008-09-10 10:16:54 -07:00
Kelly O'Hair
ddfbf23583 6746424: Remove build dependency on findbugs and FINDBUGS_HOME
Reviewed-by: tbell
2008-09-10 09:48:41 -07:00
Kelly O'Hair
28aaf9add2 6746421: Compare images logic needs to be more forgiving
Reviewed-by: tbell
2008-09-10 09:31:16 -07:00
Kumar Srinivasan
731dd43ab4 6614210: JPRT Windows 32bit msival2 build failure when building 'install' workspace
Suppresses wscript's modal dialog on error and no msi validation for jprt.

Reviewed-by: ohair, jmelvin
2008-08-19 07:50:03 -07:00
Xiomara Jayasena
4fb42021d7 Merge 2008-08-12 15:17:12 -07:00