Good catch on the ccache issue.

But if you set the build number, the full version information will not tell
you when the private openjdk was built (via java -version).
Sometimes that is really handy to know.

I assume the issue is the macro FULL_VERSION being defined on all the compile
lines, right? I think I would rather just fix the makefiles.
Maybe only define FULL_VERSION on the compiles of the files that need it?
It might only be one or two files that need this macro defined.

I'll try this fix:


######### File: ./common/Defs.gmk
######### (cd ./common && sccs diffs -C -w -s -b Defs.gmk)

------- Defs.gmk -------
*** /tmp/sccs.djai4z    Fri Jun  8 16:32:47 2007
--- Defs.gmk    Fri Jun  8 16:26:55 2007
***************
*** 775,783 ****

  # this should be moved into Defs-<platform>.gmk.....
  ifeq ($(PLATFORM), windows)
!   VERSION_DEFINES = -DRELEASE="\"$(RELEASE)\"" 
-DFULL_VERSION="\"$(FULL_VERSION)\""
  else
!   VERSION_DEFINES = -DRELEASE='"$(RELEASE)"' 
-DFULL_VERSION='"$(FULL_VERSION)"'
  endif

  # Note: As a rule, GNU Make rules should not appear in any of the
--- 775,783 ----

  # this should be moved into Defs-<platform>.gmk.....
  ifeq ($(PLATFORM), windows)
!   VERSION_DEFINES = -DRELEASE="\"$(RELEASE)\""
  else
!   VERSION_DEFINES = -DRELEASE='"$(RELEASE)"'
  endif

  # Note: As a rule, GNU Make rules should not appear in any of the

######### File: ./common/Program.gmk
######### (cd ./common && sccs diffs -C -w -s -b Program.gmk)

------- Program.gmk -------
*** /tmp/sccs.Kja44z    Fri Jun  8 16:32:47 2007
--- Program.gmk Fri Jun  8 16:26:42 2007
***************
*** 255,262 ****
--- 255,264 ----
  # this may not be necessary...
  ifeq ($(PLATFORM), windows)
  OTHER_CPPFLAGS += -DPROGNAME="\"$(PROGRAM)\""
+ VERSION_DEFINES += -DFULL_VERSION="\"$(FULL_VERSION)\""
  else
  OTHER_CPPFLAGS += -DPROGNAME='"$(PROGRAM)"'
+ VERSION_DEFINES += -DFULL_VERSION='"$(FULL_VERSION)"'
  endif

  VERSION_DEFINES += -DJDK_MAJOR_VERSION='"$(JDK_MAJOR_VERSION)"' \



Let me know what you think.

-kto

Petteri Räty wrote:
Regards,
Petteri
--
Gentoo/Java project lead

Reply via email to