/hg/icedtea6: 2 new changesets
dbhole at icedtea.classpath.org
dbhole at icedtea.classpath.org
Tue Feb 23 08:46:33 PST 2010
changeset 6692226bafb6 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=6692226bafb6
author: Deepak Bhole <dbhole at redhat.com>
date: Mon Feb 22 17:53:44 2010 -0500
- Fixed IcedTea Bug# 446: Use JDK_UPDATE_VERSION to set the jpi
version.
changeset 1365cc7a840d in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=1365cc7a840d
author: Deepak Bhole <dbhole at redhat.com>
date: Tue Feb 23 11:46:21 2010 -0500
Merge with main repo
diffstat:
7 files changed, 27 insertions(+), 11 deletions(-)
ChangeLog | 17 +++++++++++++++++
Makefile.am | 1 +
plugin/icedteanp/IcedTeaNPPlugin.cc | 4 ++--
ports/hotspot/make/linux/makefiles/shark.make | 4 ++--
ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp | 8 +++-----
ports/hotspot/src/share/vm/shark/sharkCompiler.cpp | 2 +-
ports/hotspot/src/share/vm/shark/sharkContext.hpp | 2 +-
diffs (122 lines):
diff -r b30c8301d479 -r 1365cc7a840d ChangeLog
--- a/ChangeLog Mon Feb 22 16:54:32 2010 -0500
+++ b/ChangeLog Tue Feb 23 11:46:21 2010 -0500
@@ -1,3 +1,20 @@ 2010-02-22 Deepak Bhole <dbhole at redhat.
+2010-02-23 Deepak Bhole <dbhole at redhat.com>
+
+ * Makefile.am: Provide JDK_UPDATE_VERSION when compiling the plugin
+ * plugin/icedteanp/IcedTeaNPPlugin.cc: Use JDK_UPDATE_VERSION to set the
+ jpi version.
+
+2010-02-23 Gary Benson <gbenson at redhat.com>
+
+ * ports/hotspot/make/linux/makefiles/shark.make: Update copyright.
+ * ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkCompiler.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkContext.hpp: Likewise.
+
+2010-02-23 Gary Benson <gbenson at redhat.com>
+
+ * ports/hotspot/make/linux/makefiles/shark.make: Comment fix.
+
2010-02-22 Deepak Bhole <dbhole at redhat.com>
* plugin/icedteanp/java/sun/applet/PluginAppletViewer.java: Centralized
diff -r b30c8301d479 -r 1365cc7a840d Makefile.am
--- a/Makefile.am Mon Feb 22 16:54:32 2010 -0500
+++ b/Makefile.am Tue Feb 23 11:46:21 2010 -0500
@@ -1608,6 +1608,7 @@ NPPLUGIN_OBJECTS=IcedTeaNPPlugin.o IcedT
mkdir -p $(NPPLUGIN_DIR) && \
cd $(NPPLUGIN_DIR) && \
$(CXX) $(CXXFLAGS) \
+ -DJDK_UPDATE_VERSION="\"$(JDK_UPDATE_VERSION)\"" \
-DPLUGIN_VERSION="\"$(PLUGIN_VERSION)\"" \
-DMOZILLA_VERSION_COLLAPSED="$(MOZILLA_VERSION_COLLAPSED)" \
$(GLIB_CFLAGS) \
diff -r b30c8301d479 -r 1365cc7a840d plugin/icedteanp/IcedTeaNPPlugin.cc
--- a/plugin/icedteanp/IcedTeaNPPlugin.cc Mon Feb 22 16:54:32 2010 -0500
+++ b/plugin/icedteanp/IcedTeaNPPlugin.cc Tue Feb 23 11:46:21 2010 -0500
@@ -107,7 +107,7 @@ exception statement from your version. *
"application/x-java-applet;version=1.4.2:class,jar:IcedTea;" \
"application/x-java-applet;version=1.5:class,jar:IcedTea;" \
"application/x-java-applet;version=1.6:class,jar:IcedTea;" \
- "application/x-java-applet;jpi-version=1.6.0_00:class,jar:IcedTea;" \
+ "application/x-java-applet;jpi-version=1.6.0_" JDK_UPDATE_VERSION ":class,jar:IcedTea;" \
"application/x-java-bean:class,jar:IcedTea;" \
"application/x-java-bean;version=1.1:class,jar:IcedTea;" \
"application/x-java-bean;version=1.1.1:class,jar:IcedTea;" \
@@ -123,7 +123,7 @@ exception statement from your version. *
"application/x-java-bean;version=1.4.2:class,jar:IcedTea;" \
"application/x-java-bean;version=1.5:class,jar:IcedTea;" \
"application/x-java-bean;version=1.6:class,jar:IcedTea;" \
- "application/x-java-bean;jpi-version=1.6.0_00:class,jar:IcedTea;" \
+ "application/x-java-bean;jpi-version=1.6.0_" JDK_UPDATE_VERSION ":class,jar:IcedTea;" \
"application/x-java-vm-npruntime::IcedTea;"
#define PLUGIN_URL NS_INLINE_PLUGIN_CONTRACTID_PREFIX NS_JVM_MIME_TYPE
diff -r b30c8301d479 -r 1365cc7a840d ports/hotspot/make/linux/makefiles/shark.make
--- a/ports/hotspot/make/linux/makefiles/shark.make Mon Feb 22 16:54:32 2010 -0500
+++ b/ports/hotspot/make/linux/makefiles/shark.make Tue Feb 23 11:46:21 2010 -0500
@@ -1,6 +1,6 @@
#
# Copyright 1999-2005 Sun Microsystems, Inc. All Rights Reserved.
-# Copyright 2008 Red Hat, Inc.
+# Copyright 2008, 2010 Red Hat, Inc.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
#
#
-# Sets make macros for making shark version of VM
+# Sets make macros for making Shark version of VM
TYPE = SHARK
diff -r b30c8301d479 -r 1365cc7a840d ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp
--- a/ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp Mon Feb 22 16:54:32 2010 -0500
+++ b/ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp Tue Feb 23 11:46:21 2010 -0500
@@ -1,6 +1,6 @@
/*
* Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved.
- * Copyright 2008 Red Hat, Inc.
+ * Copyright 2008, 2009, 2010 Red Hat, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,10 +23,8 @@
*
*/
-//
-// Sets the default values for platform dependent flags used by the
-// Shark compiler.
-//
+// Set the default values for platform dependent flags used by the
+// Shark compiler. See globals.hpp for details of what they do.
define_pd_global(bool, BackgroundCompilation, true );
define_pd_global(bool, UseTLAB, true );
diff -r b30c8301d479 -r 1365cc7a840d ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp Mon Feb 22 16:54:32 2010 -0500
+++ b/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp Tue Feb 23 11:46:21 2010 -0500
@@ -1,6 +1,6 @@
/*
* Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved.
- * Copyright 2008, 2009 Red Hat, Inc.
+ * Copyright 2008, 2009, 2010 Red Hat, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
diff -r b30c8301d479 -r 1365cc7a840d ports/hotspot/src/share/vm/shark/sharkContext.hpp
--- a/ports/hotspot/src/share/vm/shark/sharkContext.hpp Mon Feb 22 16:54:32 2010 -0500
+++ b/ports/hotspot/src/share/vm/shark/sharkContext.hpp Tue Feb 23 11:46:21 2010 -0500
@@ -1,6 +1,6 @@
/*
* Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved.
- * Copyright 2009 Red Hat, Inc.
+ * Copyright 2009, 2010 Red Hat, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
More information about the distro-pkg-dev
mailing list