Changeset 278 for trunk/openjdk/jdk/make/javax/swing
- Timestamp:
- Mar 26, 2011, 8:39:20 PM (14 years ago)
- Location:
- trunk/openjdk
- Files:
-
- 9 edited
-
. (modified) (2 props)
-
jdk/make/javax/swing/FILES.gmk (modified) (2 diffs)
-
jdk/make/javax/swing/Makefile (modified) (5 diffs)
-
jdk/make/javax/swing/beaninfo/FILES.gmk (modified) (2 diffs)
-
jdk/make/javax/swing/beaninfo/Makefile (modified) (2 diffs)
-
jdk/make/javax/swing/beaninfo/SwingBeans.gmk (modified) (2 diffs)
-
jdk/make/javax/swing/html32dtd/Makefile (modified) (2 diffs)
-
jdk/make/javax/swing/plaf/FILES.gmk (modified) (2 diffs)
-
jdk/make/javax/swing/plaf/Makefile (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/openjdk
- Property svn:ignore
-
old new 1 1 build 2 build-product-release
-
-
Property svn:mergeinfo
set to
/branches/vendor/oracle/openjdk6/b22 merged eligible /branches/vendor/oracle/openjdk6/current merged eligible
- Property svn:ignore
-
trunk/openjdk/jdk/make/javax/swing/FILES.gmk
r2 r278 1 1 # 2 # Copyright 1998-2005 Sun Microsystems, Inc. All Rights Reserved.2 # Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. 3 3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 4 4 # 5 5 # This code is free software; you can redistribute it and/or modify it 6 6 # under the terms of the GNU General Public License version 2 only, as 7 # published by the Free Software Foundation. Sundesignates this7 # published by the Free Software Foundation. Oracle designates this 8 8 # particular file as subject to the "Classpath" exception as provided 9 # by Sunin the LICENSE file that accompanied this code.9 # by Oracle in the LICENSE file that accompanied this code. 10 10 # 11 11 # This code is distributed in the hope that it will be useful, but WITHOUT … … 19 19 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 20 20 # 21 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,22 # CA 95054 USA or visit www.sun.com if you need additional information or23 # have anyquestions.21 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 22 # or visit www.oracle.com if you need additional information or have any 23 # questions. 24 24 # 25 25 26 26 MISC_FILES = \ 27 27 $(CLASSBINDIR)/javax/swing/text/html/default.css \ 28 $(CLASSBINDIR)/javax/swing/text/html/parser/html32.bdtd \29 28 $(CLASSBINDIR)/javax/swing/text/rtf/charsets/NeXT.txt \ 30 29 $(CLASSBINDIR)/javax/swing/text/rtf/charsets/ansi.txt \ -
trunk/openjdk/jdk/make/javax/swing/Makefile
r2 r278 1 1 # 2 # Copyright 1998-2006 Sun Microsystems, Inc. All Rights Reserved.2 # Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. 3 3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 4 4 # 5 5 # This code is free software; you can redistribute it and/or modify it 6 6 # under the terms of the GNU General Public License version 2 only, as 7 # published by the Free Software Foundation. Sundesignates this7 # published by the Free Software Foundation. Oracle designates this 8 8 # particular file as subject to the "Classpath" exception as provided 9 # by Sunin the LICENSE file that accompanied this code.9 # by Oracle in the LICENSE file that accompanied this code. 10 10 # 11 11 # This code is distributed in the hope that it will be useful, but WITHOUT … … 19 19 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 20 20 # 21 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,22 # CA 95054 USA or visit www.sun.com if you need additional information or23 # have anyquestions.21 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 22 # or visit www.oracle.com if you need additional information or have any 23 # questions. 24 24 # 25 25 26 26 BUILDDIR = ../.. 27 27 PACKAGE = javax.swing 28 SUN_PACKAGE = com.sun.java.swing.plaf 28 29 PRODUCT = com 29 30 SWING_SRC = $(SHARE_SRC)/classes/javax/swing 31 SUN_SRC = $(SHARE_SRC)/classes/com/sun/java/swing 32 33 NIMBUS_GENSRC_DIR = $(GENSRCDIR)/com/sun/java/swing/plaf/nimbus 34 NIMBUS_SKIN_FILE = $(SUN_SRC)/plaf/nimbus/skin.laf 35 NIMBUS_GENERATOR_JAR = $(BUILDTOOLJARDIR)/generatenimbus.jar 36 30 37 include $(BUILDDIR)/common/Defs.gmk 38 LANGUAGE_VERSION = -source 6 39 CLASS_VERSION = -target 6 31 40 32 41 # … … 39 48 SUBDIRS = html32dtd plaf 40 49 50 # 51 # Include 52 # 53 ifndef DISABLE_NIMBUS 54 CLASSES_INIT = $(NIMBUS_GENSRC_DIR) 55 endif 56 41 57 include $(BUILDDIR)/common/Classes.gmk 42 58 … … 45 61 46 62 clean clobber:: 63 $(RM) -r $(NIMBUS_GENSRC_DIR) 47 64 $(SUBDIRS-loop) 48 65 … … 58 75 $(install-file) 59 76 60 $(CLASSBINDIR)/%.bdtd: $(SHARE_SRC)/classes/%.bdtd61 $(install-file)62 63 77 $(CLASSBINDIR)/%.txt: $(SHARE_SRC)/classes/%.txt 64 78 $(install-file) 65 79 80 $(NIMBUS_GENSRC_DIR): $(NIMBUS_SKIN_FILE) $(NIMBUS_GENERATOR_JAR) 81 @$(ECHO) "Generating Nimbus source files:" 82 $(RM) -r $(NIMBUS_GENSRC_DIR) 83 $(BOOT_JAVA_CMD) -jar $(NIMBUS_GENERATOR_JAR) \ 84 -skinFile $(NIMBUS_SKIN_FILE) -buildDir $(GENSRCDIR) \ 85 -packagePrefix $(SUN_PACKAGE).nimbus -lafName Nimbus 86 @$(ECHO) "Finished generating Nimbus source files" -
trunk/openjdk/jdk/make/javax/swing/beaninfo/FILES.gmk
r2 r278 1 1 # 2 # Copyright 1998-2004 Sun Microsystems, Inc. All Rights Reserved.2 # Copyright (c) 1998, 2004, Oracle and/or its affiliates. All rights reserved. 3 3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 4 4 # 5 5 # This code is free software; you can redistribute it and/or modify it 6 6 # under the terms of the GNU General Public License version 2 only, as 7 # published by the Free Software Foundation. Sundesignates this7 # published by the Free Software Foundation. Oracle designates this 8 8 # particular file as subject to the "Classpath" exception as provided 9 # by Sunin the LICENSE file that accompanied this code.9 # by Oracle in the LICENSE file that accompanied this code. 10 10 # 11 11 # This code is distributed in the hope that it will be useful, but WITHOUT … … 19 19 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 20 20 # 21 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,22 # CA 95054 USA or visit www.sun.com if you need additional information or23 # have anyquestions.21 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 22 # or visit www.oracle.com if you need additional information or have any 23 # questions. 24 24 # 25 25 -
trunk/openjdk/jdk/make/javax/swing/beaninfo/Makefile
r2 r278 1 1 # 2 # Copyright 1998-2005 Sun Microsystems, Inc. All Rights Reserved.2 # Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved. 3 3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 4 4 # 5 5 # This code is free software; you can redistribute it and/or modify it 6 6 # under the terms of the GNU General Public License version 2 only, as 7 # published by the Free Software Foundation. Sundesignates this7 # published by the Free Software Foundation. Oracle designates this 8 8 # particular file as subject to the "Classpath" exception as provided 9 # by Sunin the LICENSE file that accompanied this code.9 # by Oracle in the LICENSE file that accompanied this code. 10 10 # 11 11 # This code is distributed in the hope that it will be useful, but WITHOUT … … 19 19 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 20 20 # 21 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,22 # CA 95054 USA or visit www.sun.com if you need additional information or23 # have anyquestions.21 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 22 # or visit www.oracle.com if you need additional information or have any 23 # questions. 24 24 # 25 25 -
trunk/openjdk/jdk/make/javax/swing/beaninfo/SwingBeans.gmk
r2 r278 1 1 # 2 # Copyright 1998-2006 Sun Microsystems, Inc. All Rights Reserved.2 # Copyright (c) 1998, 2006, Oracle and/or its affiliates. All rights reserved. 3 3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 4 4 # 5 5 # This code is free software; you can redistribute it and/or modify it 6 6 # under the terms of the GNU General Public License version 2 only, as 7 # published by the Free Software Foundation. Sundesignates this7 # published by the Free Software Foundation. Oracle designates this 8 8 # particular file as subject to the "Classpath" exception as provided 9 # by Sunin the LICENSE file that accompanied this code.9 # by Oracle in the LICENSE file that accompanied this code. 10 10 # 11 11 # This code is distributed in the hope that it will be useful, but WITHOUT … … 19 19 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 20 20 # 21 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,22 # CA 95054 USA or visit www.sun.com if you need additional information or23 # have anyquestions.21 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 22 # or visit www.oracle.com if you need additional information or have any 23 # questions. 24 24 # 25 25 -
trunk/openjdk/jdk/make/javax/swing/html32dtd/Makefile
r2 r278 1 1 # 2 # Copyright 1998-2005 Sun Microsystems, Inc. All Rights Reserved.2 # Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved. 3 3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 4 4 # 5 5 # This code is free software; you can redistribute it and/or modify it 6 6 # under the terms of the GNU General Public License version 2 only, as 7 # published by the Free Software Foundation. Sundesignates this7 # published by the Free Software Foundation. Oracle designates this 8 8 # particular file as subject to the "Classpath" exception as provided 9 # by Sunin the LICENSE file that accompanied this code.9 # by Oracle in the LICENSE file that accompanied this code. 10 10 # 11 11 # This code is distributed in the hope that it will be useful, but WITHOUT … … 19 19 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 20 20 # 21 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,22 # CA 95054 USA or visit www.sun.com if you need additional information or23 # have anyquestions.21 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 22 # or visit www.oracle.com if you need additional information or have any 23 # questions. 24 24 # 25 25 -
trunk/openjdk/jdk/make/javax/swing/plaf/FILES.gmk
r2 r278 1 1 # 2 # Copyright 1998-2007 Sun Microsystems, Inc. All Rights Reserved.2 # Copyright (c) 1998, 2007, Oracle and/or its affiliates. All rights reserved. 3 3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 4 4 # 5 5 # This code is free software; you can redistribute it and/or modify it 6 6 # under the terms of the GNU General Public License version 2 only, as 7 # published by the Free Software Foundation. Sundesignates this7 # published by the Free Software Foundation. Oracle designates this 8 8 # particular file as subject to the "Classpath" exception as provided 9 # by Sunin the LICENSE file that accompanied this code.9 # by Oracle in the LICENSE file that accompanied this code. 10 10 # 11 11 # This code is distributed in the hope that it will be useful, but WITHOUT … … 19 19 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 20 20 # 21 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,22 # CA 95054 USA or visit www.sun.com if you need additional information or23 # have anyquestions.21 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 22 # or visit www.oracle.com if you need additional information or have any 23 # questions. 24 24 # 25 25 -
trunk/openjdk/jdk/make/javax/swing/plaf/Makefile
r74 r278 1 1 # 2 # Copyright 1998-2007 Sun Microsystems, Inc. All Rights Reserved.2 # Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. 3 3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 4 4 # 5 5 # This code is free software; you can redistribute it and/or modify it 6 6 # under the terms of the GNU General Public License version 2 only, as 7 # published by the Free Software Foundation. Sundesignates this7 # published by the Free Software Foundation. Oracle designates this 8 8 # particular file as subject to the "Classpath" exception as provided 9 # by Sunin the LICENSE file that accompanied this code.9 # by Oracle in the LICENSE file that accompanied this code. 10 10 # 11 11 # This code is distributed in the hope that it will be useful, but WITHOUT … … 19 19 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 20 20 # 21 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,22 # CA 95054 USA or visit www.sun.com if you need additional information or23 # have anyquestions.21 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 22 # or visit www.oracle.com if you need additional information or have any 23 # questions. 24 24 # 25 25 26 26 BUILDDIR = ../../.. 27 27 PACKAGE = javax.swing.plaf 28 SUN_PACKAGE = com.sun.java.swing.plaf29 28 PRODUCT = com 30 29 SWING_SRC = $(SHARE_SRC)/classes/javax/swing 31 SUN_SRC = $(SHARE_SRC)/classes/com/sun/java/swing32 30 33 31 include $(BUILDDIR)/common/Defs.gmk 32 LANGUAGE_VERSION = -source 6 33 CLASS_VERSION = -target 6 34 34 35 35 # … … 54 54 endif 55 55 56 NIMBUS_GENSRC_DIR = $(GENSRCDIR)/com/sun/java/swing/plaf/nimbus57 NIMBUS_SKIN_FILE = $(SUN_SRC)/plaf/nimbus/skin.laf58 NIMBUS_GENERATOR_JAR = $(BUILDTOOLJARDIR)/generatenimbus.jar59 56 60 57 FILES_java = $(FILES_SWING_java) … … 81 78 # 82 79 build: $(LOGO_ICONS) $(MISC_SWING_FILES_MOTIF_GIF) $(MISC_SWING_FILES_MOTIF_PNG) other_files 83 84 $(NIMBUS_GENSRC_DIR): $(NIMBUS_SKIN_FILE) $(NIMBUS_GENERATOR_JAR)85 @$(ECHO) "Generating Nimbus source files:"86 $(RM) -r $(NIMBUS_GENSRC_DIR)87 $(BOOT_JAVA_CMD) -jar $(NIMBUS_GENERATOR_JAR) \88 -skinFile $(NIMBUS_SKIN_FILE) -buildDir $(GENSRCDIR) \89 -packagePrefix $(SUN_PACKAGE).nimbus -lafName Nimbus90 @$(ECHO) "Finished generating Nimbus source files"91 92 clean:: classes.clean93 $(RM) -r $(NIMBUS_GENSRC_DIR)94 95 #96 # Include97 #98 ifndef DISABLE_NIMBUS99 CLASSES_INIT = $(NIMBUS_GENSRC_DIR)100 endif101 80 102 81 include $(BUILDDIR)/common/Classes.gmk
Note:
See TracChangeset
for help on using the changeset viewer.
