Mercurial Mercurial > upstream > oracle > g11n > locale / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove obsolete and broken SVR4 prototype creation tasks from Makefile
authorjenda
Wed, 18 May 2011 16:39:52 +0200
changeset 133 65086617f925
parent 132 7e8834a94d06
child 134 455f05a692fc
remove obsolete and broken SVR4 prototype creation tasks from Makefile
Makefile file | annotate | diff | comparison | revisions
misc/templates/prototype/cs_euro file | annotate | diff | comparison | revisions
misc/templates/prototype/enUS file | annotate | diff | comparison | revisions
misc/templates/prototype/en_extra file | annotate | diff | comparison | revisions
misc/templates/prototype/legacy file | annotate | diff | comparison | revisions
misc/templates/prototype/legacy_alt2 file | annotate | diff | comparison | revisions
misc/templates/prototype/mp_files file | annotate | diff | comparison | revisions
misc/templates/prototype/utf8 file | annotate | diff | comparison | revisions 
--- a/Makefile	Fri Apr 22 14:09:24 2011 +0200
+++ b/Makefile	Wed May 18 16:39:52 2011 +0200
@@ -136,14 +136,12 @@
 # ==== Public targets ====
 # ************************
 
-.PHONY: all install ips doc build_tools clean
+.PHONY: all install doc build_tools clean
 
 all: build/pkgs.d build/cldr.d locale_objects
 
 install: install_ips
 
-ips: install_ips
-
 doc: build/report_diff.html
 
 build_tools: build/icu4j.jar build/xalan.jar build/xml-apis.jar build/utilities.jar build/cldr.jar build/cldr_core/.src
@@ -170,7 +168,6 @@
 	$(Q)$(PERL) -e 'push @{$$pkg{substr(`cat $$_`,0,-1)}},m!build/(.*)/pkg_name! foreach (glob "build/*/pkg_name"); \
 		 print "PKGS ?= SUNWlocaledefsrc " . join(" ", keys %pkg) . "\n"; \
 		 print "build/$$_/.installed: " . join(" ", map { "build/$$_/.installed" } @{$$pkg{$$_}}) ."\n" foreach (keys %pkg); \
-		 print "build/$$_/prototype: " . join(" ", map { "build/$$_/prototype" } @{$$pkg{$$_}}) ."\n" foreach (keys %pkg); \
 		 print "build/$$_/manifest: " . join(" ", map { "build/$$_/manifest" } @{$$pkg{$$_}}) ."\n" foreach (keys %pkg); ' > $@
 
 build/cldr.d: $(LOCALES:%=build/%/cldr_variant) build/.dir
@@ -229,11 +226,6 @@
 # ==== Other package files ====
 # *****************************
 
-# prototype
-$(PKGS:%=build/%/prototype): build/%/prototype: build/%/.dir
-	$(M)GENERATE $@
-	$(Q)cat $^ | $(PERL) -ne 'print unless $$a{$$_}++' > $@
-
 # manifest
 $(PKGS:%=build/%/manifest): build/%/manifest: build/%/.dir
 	$(M)GENERATE $@
@@ -302,12 +294,6 @@
 			echo "$(shell $(PERL) -ne 'print if s/^locale_desc\s+(.*)/\1/' $<)"; \
 		fi) > $@
 
-$(LOCALES:%=build/%/prototype): build/%/prototype: locale/%.spec build/%/pkg_description
-	$(M)GENERATE $@
-	$(Q)for src in $(call spec_fkey,prototype,utf8); do \
-		$(EXPAND_ENV) bash -c 'while read l; do eval "echo \"$$l\""; done' < $$src; \
-	done > $@
-
 $(LOCALES:%=build/%/manifest): build/%/manifest: locale/%.spec build/%/pkg_description
 	$(M)GENERATE $@
 	$(Q)for src in $(call spec_fkey,manifest,header_lang utf8); do \
@@ -329,9 +315,8 @@
 # ==== Install/Build packages ====
 # ********************************
 
-.PHONY: install_svr4 install_ips
+.PHONY: install_ips
 
-install_svr4: build/pkgs.d $(PKGS:%=build/%/.installed_svr4)
 install_ips: build/pkgs.d $(PKGS:%=build/%/.installed_ips)
 
 
@@ -364,16 +349,9 @@
 	$(Q)cp $< $(FILEROOT)/usr/lib/localedef/src/locales/$*.src
 	$(Q)touch $@
 
-$(PKGS:%=build/%/.installed_svr4): build/%/.installed_svr4: build/%/prototype build/%/.installed
-	$(M)INSTALL $*/prototype
-	$(Q)[ -d pkgmaps/locale ] || mkdir -p pkgmaps/locale
-	$(Q)cp $< pkgmaps/locale/prototype.$(subst SUNW,,$*)
-	$(Q)touch $@
-
-$(PKGS:%=build/%/.installed_ips): build/%/.installed_ips: build/%/manifest build/%/.installed $(FILEROOT)/copyright.cddl+unicode
+$(PKGS:%=build/%/.installed_ips): build/%/.installed_ips: build/%/manifest build/%/.installed $(FILEROOT)/copyright.cddl+unicode pkgmaps/.dir
 	$(M)INSTALL $*/manifest
-	$(Q)[ -d pkgmaps/locale ] || mkdir -p pkgmaps/locale
-	$(Q)cp $< pkgmaps/locale/manifest.$(subst SUNW,,$*)
+	$(Q)cp $< pkgmaps/manifest.$(subst SUNW,,$*)
 	$(Q)touch $@
 
 $(CHARMAPS:%=build/.installed_charmap_%): build/.installed_charmap_%: build/%.cm $(FILEROOT)/usr/lib/localedef/src/charmaps/.dir
--- a/misc/templates/prototype/cs_euro	Fri Apr 22 14:09:24 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").  
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-# prototype.cs_euro	LOC: $LOC, MACH64: $MACH64
-
-d none usr 0755 root sys
-d none usr/lib 0755 root bin
-d none usr/lib/locale 0755 root bin
-d none usr/lib/locale/${LOC} 0755 root bin
-d none usr/lib/locale/${LOC}/LC_COLLATE 0755 root bin
-d none usr/lib/locale/${LOC}/LC_CTYPE 0755 root bin
-s none usr/lib/locale/${LOC}/LC_CTYPE/LCL_DEF=../../common/LC_CTYPE/LCL_DEF_unicode
-s none usr/lib/locale/${LOC}/LC_CTYPE/ldterm.dat=../../common/LC_CTYPE/ldterm_unicode.dat
-s none usr/lib/locale/${LOC}/LC_CTYPE/wdresolve.so=../../common/LC_CTYPE/wdresolve_unicode.so
-d none usr/lib/locale/${LOC}/LC_CTYPE/${MACH64} 0755 root bin
-s none usr/lib/locale/${LOC}/LC_CTYPE/${MACH64}/wdresolve.so=../../../common/LC_CTYPE/${MACH64}/wdresolve_unicode.so
-s none usr/lib/locale/${LOC}/LC_MESSAGES=../cs_CZ.UTF-8/LC_MESSAGES
-d none usr/lib/locale/${LOC}/LC_MONETARY 0755 root bin
-d none usr/lib/locale/${LOC}/LC_NUMERIC 0755 root bin
-s none usr/lib/locale/${LOC}/LC_TIME=../cs_CZ.UTF-8/LC_TIME
-d none usr/lib/locale/${LOC}/LO_LTYPE 0755 root bin
-s none usr/lib/locale/${LOC}/LO_LTYPE/${LOC}.layout.so.1=../../common/LO_LTYPE/umle.layout.so.1
-d none usr/lib/locale/${LOC}/LO_LTYPE/${MACH64} 0755 root bin
-s none usr/lib/locale/${LOC}/LO_LTYPE/${MACH64}/${LOC}.layout.so.1=../../../common/LO_LTYPE/${MACH64}/umle.layout.so.1
-d none usr/lib/locale/${LOC}/${MACH64} 0755 root bin
-f none usr/lib/locale/${LOC}/${MACH64}/${LOC}.so.3 0555 root bin
-s none usr/lib/locale/${LOC}/${MACH64}/methods_unicode.so.3=../../common/${MACH64}/methods_unicode.so.3
-f none usr/lib/locale/${LOC}/${LOC}.so.3 0555 root bin
-f none usr/lib/locale/${LOC}/locale_description 0644 root bin
-f none usr/lib/locale/${LOC}/locale_map 0644 root bin
-s none usr/lib/locale/${LOC}/methods_unicode.so.3=../common/methods_unicode.so.3
--- a/misc/templates/prototype/enUS	Fri Apr 22 14:09:24 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
-#
-
-# enUS	LOC: $LOC, MACH64: $MACH64
-
-s none usr/lib/locale/${LOC}/32=.
-s none usr/lib/locale/${LOC}/64=${MACH64}
-s none usr/lib/locale/${LOC}/LC_CTYPE/32=.
-s none usr/lib/locale/${LOC}/LC_CTYPE/64=${MACH64}
-s none usr/lib/locale/${LOC}/LO_LTYPE/32=.
-s none usr/lib/locale/${LOC}/LO_LTYPE/64=${MACH64}
--- a/misc/templates/prototype/en_extra	Fri Apr 22 14:09:24 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").  
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-d none usr/share 0755 root sys
-d none usr/share/lib 0755 root sys
-d none usr/share/lib/setterm 0755 root bin
-d none usr/share/lib/setterm/en_US.UTF-8 0755 root bin
-f none usr/share/lib/setterm/en_US.UTF-8/conf.file 0555 root bin
--- a/misc/templates/prototype/legacy	Fri Apr 22 14:09:24 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-
-# prototype.legacy (LOC: $LOC, MACH64: $MACH64): 	default iso locale prototype template
-
-d none usr 0755 root sys
-d none usr/lib 0755 root bin
-d none usr/lib/locale 0755 root bin
-d none usr/lib/locale/${LOC} 0755 root bin
-d none usr/lib/locale/${LOC}/LC_COLLATE 0755 root bin
-d none usr/lib/locale/${LOC}/LC_CTYPE 0755 root bin
-s none usr/lib/locale/${LOC}/LC_CTYPE/LCL_DEF=../../iso_8859_${CHARMAP#*ISO8859-}/LC_CTYPE/LCL_DEF
-${IS_SET_LC_MESSAGES:-d none usr/lib/locale/${LOC}/LC_MESSAGES 0755 root bin}
-${IS_SET_LC_MESSAGES:+s none usr/lib/locale/${LOC}/LC_MESSAGES=../${LCMESSAGES}/LC_MESSAGES}
-d none usr/lib/locale/${LOC}/LC_MONETARY 0755 root bin
-d none usr/lib/locale/${LOC}/LC_NUMERIC 0755 root bin
-${IS_SET_LC_TIME:-d none usr/lib/locale/${LOC}/LC_TIME 0755 root bin}
-${IS_SET_LC_TIME:+s none usr/lib/locale/${LOC}/LC_TIME=../${LCTIME}/LC_TIME}
-d none usr/lib/locale/${LOC}/${MACH64} 0755 root bin
-f none usr/lib/locale/${LOC}/${MACH64}/${LOC}.so.3 0555 root bin
-f none usr/lib/locale/${LOC}/${LOC}.so.3 0555 root bin
-f none usr/lib/locale/${LOC}/locale_description 0644 root bin
-f none usr/lib/locale/${LOC}/locale_map 0644 root bin
--- a/misc/templates/prototype/legacy_alt2	Fri Apr 22 14:09:24 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-
-# prototype.legacy_alt2 (LOC: $LOC, MACH64: $MACH64): 	equal to prototype.legacy except LC_TYPE/LCL_DEF is not symlink to locale/<charmap>
-
-d none usr 0755 root sys
-d none usr/lib 0755 root bin
-d none usr/lib/locale 0755 root bin
-d none usr/lib/locale/${LOC} 0755 root bin
-d none usr/lib/locale/${LOC}/LC_COLLATE 0755 root bin
-d none usr/lib/locale/${LOC}/LC_CTYPE 0755 root bin
-f none usr/lib/locale/${LOC}/LC_CTYPE/LCL_DEF 0755 root bin
-${IS_SET_LC_MESSAGES:-d none usr/lib/locale/${LOC}/LC_MESSAGES 0755 root bin}
-${IS_SET_LC_MESSAGES:+s none usr/lib/locale/${LOC}/LC_MESSAGES=../${LCMESSAGES}/LC_MESSAGES}
-d none usr/lib/locale/${LOC}/LC_MONETARY 0755 root bin
-d none usr/lib/locale/${LOC}/LC_NUMERIC 0755 root bin
-${IS_SET_LC_TIME:-d none usr/lib/locale/${LOC}/LC_TIME 0755 root bin}
-${IS_SET_LC_TIME:+s none usr/lib/locale/${LOC}/LC_TIME=../${LCTIME}/LC_TIME}
-d none usr/lib/locale/${LOC}/${MACH64} 0755 root bin
-f none usr/lib/locale/${LOC}/${MACH64}/${LOC}.so.3 0555 root bin
-f none usr/lib/locale/${LOC}/${LOC}.so.3 0555 root bin
-f none usr/lib/locale/${LOC}/locale_description 0644 root bin
-f none usr/lib/locale/${LOC}/locale_map 0644 root bin
--- a/misc/templates/prototype/mp_files	Fri Apr 22 14:09:24 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").  
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-# prototype.mp_files (LOC: $LOC, MACH64: $MACH64): 	mp conf files
-
-d none usr/lib/lp 0755 root lp
-d none usr/lib/lp/locale 0755 root lp
-d none usr/lib/lp/locale/${LOC:0:2} 0755 root lp
-d none usr/lib/lp/locale/${LOC:0:2}/mp 0755 root lp
-f none usr/lib/lp/locale/${LOC:0:2}/mp/mp.conf 0444 root lp
--- a/misc/templates/prototype/utf8	Fri Apr 22 14:09:24 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-
-# default utf8 locale prototype template
-#	(LOC: $LOC, MACH64: $MACH64, LCMESSAGES: $LCMESSAGES, LCTIME: $LCTIME)
-
-d none usr 0755 root sys
-d none usr/lib 0755 root bin
-d none usr/lib/locale 0755 root bin
-d none usr/lib/locale/${LOC} 0755 root bin
-d none usr/lib/locale/${LOC}/LC_COLLATE 0755 root bin
-d none usr/lib/locale/${LOC}/LC_CTYPE 0755 root bin
-s none usr/lib/locale/${LOC}/LC_CTYPE/LCL_DEF=../../common/LC_CTYPE/LCL_DEF_unicode
-s none usr/lib/locale/${LOC}/LC_CTYPE/ldterm.dat=../../common/LC_CTYPE/ldterm_unicode.dat
-s none usr/lib/locale/${LOC}/LC_CTYPE/wdresolve.so=../../common/LC_CTYPE/wdresolve_unicode.so
-d none usr/lib/locale/${LOC}/LC_CTYPE/${MACH64} 0755 root bin
-s none usr/lib/locale/${LOC}/LC_CTYPE/${MACH64}/wdresolve.so=../../../common/LC_CTYPE/${MACH64}/wdresolve_unicode.so
-${IS_SET_LC_MESSAGES:-d none usr/lib/locale/${LOC}/LC_MESSAGES 0755 root bin}
-${IS_SET_LC_MESSAGES:+s none usr/lib/locale/${LOC}/LC_MESSAGES=../${LCMESSAGES}/LC_MESSAGES}
-d none usr/lib/locale/${LOC}/LC_MONETARY 0755 root bin
-d none usr/lib/locale/${LOC}/LC_NUMERIC 0755 root bin
-d none usr/lib/locale/${LOC}/LC_TIME 0755 root bin
-${IS_SET_LC_TIME:-d none usr/lib/locale/${LOC}/LC_TIME 0755 root bin}
-${IS_SET_LC_TIME:+s none usr/lib/locale/${LOC}/LC_TIME=../${LCTIME}/LC_TIME}
-d none usr/lib/locale/${LOC}/LO_LTYPE 0755 root bin
-s none usr/lib/locale/${LOC}/LO_LTYPE/${LOC}.layout.so.1=../../common/LO_LTYPE/umle.layout.so.1
-d none usr/lib/locale/${LOC}/LO_LTYPE/${MACH64} 0755 root bin
-s none usr/lib/locale/${LOC}/LO_LTYPE/${MACH64}/${LOC}.layout.so.1=../../../common/LO_LTYPE/${MACH64}/umle.layout.so.1
-d none usr/lib/locale/${LOC}/${MACH64} 0755 root bin
-f none usr/lib/locale/${LOC}/${MACH64}/${LOC}.so.3 0555 root bin
-s none usr/lib/locale/${LOC}/${MACH64}/methods_unicode.so.3=../../common/${MACH64}/methods_unicode.so.3
-f none usr/lib/locale/${LOC}/${LOC}.so.3 0555 root bin
-f none usr/lib/locale/${LOC}/locale_description 0644 root bin
-f none usr/lib/locale/${LOC}/locale_map 0644 root bin
-s none usr/lib/locale/${LOC}/methods_unicode.so.3=../common/methods_unicode.so.3
upstream/oracle/g11n/locale