diff --git a/.hgtags-top-repo b/.hgtags-top-repo index 8366e3060e0..aee7617b596 100644 --- a/.hgtags-top-repo +++ b/.hgtags-top-repo @@ -9,3 +9,4 @@ cbc8ad9dd0e085a607427ea35411990982f19a36 jdk7-b25 64da805be725721bf2004e7409a0d7a16fc8ddbc jdk7-b32 bb1ef4ee3d2c8cbf43a37d372325a7952be590b9 jdk7-b33 46a989ab932992b2084b946eeb322fa99b9fee6c jdk7-b34 +143c1abedb7d3095eff0f9ee5fec9bf48e3490fc jdk7-b35 diff --git a/README-builds.html b/README-builds.html index d4f008720cf..8783bf8bde2 100644 --- a/README-builds.html +++ b/README-builds.html @@ -5,7 +5,7 @@ - + +
+ @@ -1087,50 +1148,59 @@ - + - + - + - + + - + + - + + - + + - + + - - + + +
OpenJDKIntroduction
  • Minimum Build Environments
  • Specific Developer Build Environments
    • +
  • Source Directory Structure
  • Build Information
      @@ -182,14 +187,64 @@ we will try to provide what information we have available to us. -

      Fedora

      +

      Fedora 9

      - TBD + After installing + Fedora 9 + you need to make sure you have + the "Software Development" bundle installed, plus the + following packages: +
      +
        +
      • cups devel: Cups Development Package
        • +
      • freetype 2.3+ devel: Freetype 2.3 Development Package
        • +
      • hg: Mercurial, if you need to clone or manage source repositories
        • +
      • ksh: May be needed when using webrev
        • +
      +
      +

      + Always a good idea to do a complete Software Update/Refresh + after you get all the packages installed.

      -

      Debian

      +

      CentOS 5.2

      - TBD + After installing + CentOS 5.2 + you need to make sure you have + the following Development bundles installed: +
      +
        +
      • Development Libraries
        • +
      • Development Tools
        • +
      • Java Development
        • +
      • X Software Development
        • +
      +
      +

      + Plus the following packages: +

      +
        +
      • cups devel: Cups Development Package
        • +
      • alsa devel: Alsa Development Package
        • +
      • ant: Ant Package
        • +
      • Xi devel: libXi.so Development Package
        • +
      +
      +

      + The freetype 2.3 packages don't seem to be available, + but the freetype 2.3 sources can be downloaded, built, + and installed easily enough from + + the freetype site. + Build and install with something like: +

      + ./configure && make && sudo -u root make install +
      +

      + Mercurial packages could not be found easily, but a Google + search should find ones, and they usually include Python if + it's needed.

      Ubuntu

      @@ -664,8 +719,8 @@
    • Install the - Microsoft Visual Studio .NET 2003 Professional or the - Microsoft Platform SDK. + Microsoft Visual Studio .NET 2003 Professional (32bit) or the + Microsoft Platform SDK (64bit).
    • Setup all environment variables for compilers @@ -871,6 +926,11 @@ The Microsoft Visual Studio .NET 2005 (VS2005) compiler will not work at this time due to the new runtime dll and the manifest requirements. +

      + WARNING: Make sure you check out the + CYGWIN link.exe WARNING. + The path /usr/bin must be after the path to the + Visual Studio product. Windows X64: Microsoft Platform SDK April 2005

      @@ -1079,6 +1139,7 @@
    • Binary NameCategory Package Description
    ar.exe Develbinutils: The GNU assembler, linker and binary + binutilsThe GNU assembler, linker and binary utilities
    make.exe Develmake: The GNU version of the 'make' utility
    +     		makeThe GNU version of the 'make' utility built for CYGWIN.
    NOTE: See the GNU make section
    m4.exe Interpretersm4: GNU implementation of the traditional Unix macro + m4GNU implementation of the traditional Unix macro processor
    cpio.exe Utilscpio: A program to manage archives of filescpioA program to manage archives of files
    gawk.exe Utilsawk: Pattern-directed scanning and processing languageawkPattern-directed scanning and processing language
    file.exe Utilsfile: Determines file type using 'magic' numbersfileDetermines file type using 'magic' numbers
    zip.exe Archivezip: Package and compress (archive) fileszipPackage and compress (archive) files
    unzip.exe Archiveunzip: Extract compressed files in a ZIP archiveunzipExtract compressed files in a ZIP archive
    free.exeProcpsfree: Display amount of free and used memory in the systemSystemprocpsDisplay amount of free and used memory in the system
    @@ -1144,6 +1214,13 @@ section on BLODA (applications that interfere with CYGWIN). +

    + WARNING: + Be very careful with link.exe, it will conflict + with the Visual Studio version. You need the Visual Studio + version of link.exe, not the CYGWIN one. + So it's important that the Visual Studio paths in PATH preceed + the CYGWIN path /usr/bin. Microsoft DirectX 9.0 SDK header files and libraries

    @@ -1429,7 +1506,7 @@ build output is to go. The default output directory will be build/platform. -
    ALT_SLASHJAVA
    +
    ALT_SLASH_JAVA
    The default root location for many of the ALT path locations of the following ALT variables. diff --git a/make/Defs-internal.gmk b/make/Defs-internal.gmk index aae0ab7367b..05d8149c5d2 100644 --- a/make/Defs-internal.gmk +++ b/make/Defs-internal.gmk @@ -257,8 +257,3 @@ ifdef ANT_HOME COMMON_BUILD_ARGUMENTS += ANT_HOME="$(ANT_HOME)" endif -ifdef FINDBUGS_HOME - COMMON_BUILD_ARGUMENTS += FINDBUGS_HOME="$(FINDBUGS_HOME)" -endif - - diff --git a/make/README.pre-components b/make/README.pre-components index 1ed7717d9c0..8d2eab571cb 100644 --- a/make/README.pre-components +++ b/make/README.pre-components @@ -20,7 +20,6 @@ The make/makefile rules are: VARIANT If DBG, debug build, if OPT, optimized build TARGET_CLASS_VERSION The classfile version number (currently 5) ANT_HOME Home of ant to use, if provided - FINDBUGS_HOME Home of findbugs to use, if provided QUIET If defined, be quiet VERBOSE If defined, be verbose JDK_VERSION Version being built diff --git a/make/jprt.config b/make/jprt.config index 08e56cac149..f3ff50615ef 100644 --- a/make/jprt.config +++ b/make/jprt.config @@ -1,7 +1,7 @@ #!echo "This is not a shell script" ############################################################################# # -# Copyright 2006-2007 Sun Microsystems, Inc. All Rights Reserved. +# Copyright 2006-2008 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 @@ -100,20 +100,16 @@ share="${jdk_devtools}/share" # Needed for langtools, maybe other parts of the build ANT_HOME="${share}/ant/latest" export ANT_HOME -FINDBUGS_HOME="${share}/findbugs/latest" -export FINDBUGS_HOME # The 3 bin directories in common to all platforms sharebin="${share}/bin" antbin="${ANT_HOME}/bin" -findbugsbin="${FINDBUGS_HOME}/bin" # Check input dirMustExist "${bootdir}" ALT_BOOTDIR dirMustExist "${slashjava}" ALT_SLASH_JAVA dirMustExist "${jdk_import}" ALT_JDK_IMPORT_PATH dirMustExist "${ANT_HOME}" ANT_HOME -dirMustExist "${FINDBUGS_HOME}" FINDBUGS_HOME # If ALT_PREVIOUS_RELEASE_IMAGE not defined, set it to the bootdir area for # any possible image comparisons. @@ -152,7 +148,7 @@ if [ "${osname}" = SunOS ] ; then ALT_COMPILER_PATH="${compiler_path}" export ALT_COMPILER_PATH dirMustExist "${compiler_path}" ALT_COMPILER_PATH - path4sdk=${compiler_path}:${sharebin}:${antbin}:${findbugsbin} + path4sdk=${compiler_path}:${sharebin}:${antbin} # Add basic solaris system paths path4sdk=${path4sdk}:/usr/ccs/bin:/usr/ccs/lib:/usr/bin:/bin:/usr/sfw/bin @@ -189,7 +185,7 @@ elif [ "${osname}" = Linux ] ; then ALT_COMPILER_PATH="${compiler_path}" export ALT_COMPILER_PATH dirMustExist "${compiler_path}" ALT_COMPILER_PATH - path4sdk=${compiler_path}:${sharebin}:${antbin}:${findbugsbin} + path4sdk=${compiler_path}:${sharebin}:${antbin} # Add basic paths path4sdk=${path4sdk}:/usr/bin:/bin:/usr/sbin:/sbin @@ -237,7 +233,7 @@ else dosname="${mkshome}/mksnt/dosname -s" # Most unix utilities are in the mksnt directory of ROOTDIR unixcommand_path="${mkshome}/mksnt" - path4sdk="${sharebin};${antbin};${findbugsbin};${unixcommand_path}" + path4sdk="${sharebin};${antbin};${unixcommand_path}" dirMustExist "${unixcommand_path}" ALT_UNIXCOMMAND_PATH devtools_path="${jdk_devtools}/win32/bin" path4sdk="${devtools_path};${path4sdk}" @@ -255,7 +251,7 @@ else dosname="/usr/bin/cygpath -a -m -s" # Most unix utilities are in the /usr/bin unixcommand_path="/usr/bin" - path4sdk="${sharebin};${antbin};${findbugsbin};${unixcommand_path}" + path4sdk="${sharebin};${antbin};${unixcommand_path}" dirMustExist "${unixcommand_path}" ALT_UNIXCOMMAND_PATH # Find GNU make make="${unixcommand_path}/make.exe"