[csw-devel] SF.net SVN: gar:[2502] csw/mgar/pkg/jdk6/trunk

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Tue Dec 9 21:50:48 CET 2008


Revision: 2502
          http://gar.svn.sourceforge.net/gar/?rev=2502&view=rev
Author:   dmichelsen
Date:     2008-12-09 20:50:47 +0000 (Tue, 09 Dec 2008)

Log Message:
-----------
jdk6: Another step towards unified JDK/JRE

Modified Paths:
--------------
    csw/mgar/pkg/jdk6/trunk/Makefile
    csw/mgar/pkg/jdk6/trunk/checksums
    csw/mgar/pkg/jdk6/trunk/files/CSWjdk.gspec
    csw/mgar/pkg/jdk6/trunk/files/CSWjdk6.gspec
    csw/mgar/pkg/jdk6/trunk/files/CSWjre.gspec
    csw/mgar/pkg/jdk6/trunk/files/CSWjre6.gspec

Removed Paths:
-------------
    csw/mgar/pkg/jdk6/trunk/files/CSWjdk.depend
    csw/mgar/pkg/jdk6/trunk/files/CSWjdk6.depend
    csw/mgar/pkg/jdk6/trunk/files/CSWjre.depend

Modified: csw/mgar/pkg/jdk6/trunk/Makefile
===================================================================
--- csw/mgar/pkg/jdk6/trunk/Makefile	2008-12-09 20:39:16 UTC (rev 2501)
+++ csw/mgar/pkg/jdk6/trunk/Makefile	2008-12-09 20:50:47 UTC (rev 2502)
@@ -18,16 +18,27 @@
 DISTNAME = jdk$(SPKG_VERSION)
 DISTFILES  = $(foreach S,$(SUFFIXES),jdk-$(GARVERSION)-solaris-$S.sh)
 NOEXTRACT  = $(foreach S,$(filter-out $(SUFFIXES_$(GARCH)),$(SUFFIXES)),jdk-$(GARVERSION)-solaris-$S.sh)
-DISTFILES += $(call admfiles,CSWjdk6,depend)
+DISTFILES += $(call admfiles,CSWjdk6)
 DISTFILES += $(call admfiles,CSWjre6)
-DISTFILES += $(call admfiles,CSWjdk,depend)
-DISTFILES += $(call admfiles,CSWjre,depend)
+DISTFILES += $(call admfiles,CSWjdk)
+DISTFILES += $(call admfiles,CSWjre)
 
 SPKG_SOURCEURL = http://java.sun.com/javase/downloads/index.jsp
 
+SPKG_DESC_CSWjdk6 = Java Development Kit 6
+SPKG_DESC_CSWjre6 = Java Runtime Environment 6
+SPKG_DESC_CSWjdk = Java Delopment Kit - Latest Version (now CSWjdk6)
+SPKG_DESC_CSWjre = Java Runtime Environment - Latest Version (now CSWjre6)
+
+REQUIRED_PKGS_CSWjdk6 = CSWjre6
+REQUIRED_PKGS_CSWjdk = CSWjdk6
+REQUIRED_PKGS_CSWjre = CSWjre6
+
 MANPAGES_JRE  = java.1 javaws.1 keytool.1 orbd.1 pack200.1 policytool.1 rmid.1 rmiregistry.1
 MANPAGES_JRE += servertool.1 tnameserv.1 unpack200.1
 
+MANPAGE_REGEX = ($(shell echo $(MANPAGES_JRE) | perl -lne 's/\./\\./g;print join("|",split)'))
+
 CONFIGURE_SCRIPTS =
 BUILD_SCRIPTS =
 TEST_SCRIPTS =
@@ -39,7 +50,7 @@
 PKGFILES_CSWjre += $(prefix)/java/man
 
 PKGFILES_CSWjre6  = $(prefix)/java/jdk/$(DISTNAME)/jre/.*
-PKGFILES_CSWjre6 += $(prefix)/java/jdk/$(DISTNAME)/man/.*/(java|javaws|keytool|orbd|pack200|policytool|rmid|rmiregistry|servertool|tnameserv|unpack200)\.1
+PKGFILES_CSWjre6 += $(prefix)/java/jdk/$(DISTNAME)/man/.*/$(MANPAGE_REGEX)
 PKGFILES_CSWjre6 += $(prefix)/java/jre/jre$(SPKG_VERSION)
 PKGFILES_CSWjre6 += $(prefix)/java/jre/jre6
 
@@ -57,9 +68,10 @@
 	@echo
 
 # rule to extract files with shell
+# Clear DISPLAY or the installer will bring up advertisement
 shell-extract-archive-%:
 	@echo " ==> Extracting $(DOWNLOADDIR)/$*"
-	@echo "yes" | (D=$(abspath $(DOWNLOADDIR)/$*); cd $(EXTRACTDIR); MORE="-10000" sh $$D)
+	@echo "yes" | (D=$(abspath $(DOWNLOADDIR)/$*); cd $(EXTRACTDIR); DISPLAY= MORE="-10000" sh $$D -noregister)
 	@$(MAKECOOKIE)
 
 extract-archive-%.sh: shell-extract-archive-%.sh

Modified: csw/mgar/pkg/jdk6/trunk/checksums
===================================================================
--- csw/mgar/pkg/jdk6/trunk/checksums	2008-12-09 20:39:16 UTC (rev 2501)
+++ csw/mgar/pkg/jdk6/trunk/checksums	2008-12-09 20:50:47 UTC (rev 2502)
@@ -2,10 +2,7 @@
 2f5b20118c85533854720ebbfb428758  download/jdk-6u11-solaris-sparcv9.sh
 e460101ca2d718b98a65c432753e9684  download/jdk-6u11-solaris-i586.sh
 c103e6c5d4d42a8ab162804a7b01c3c2  download/jdk-6u11-solaris-x64.sh
-d2ea0d736a7cf088ed9d452f3b1ecb1d  download/CSWjdk6.gspec
-a077039adebc66db2f7316e387ba13eb  download/CSWjdk6.depend
-d085818ed2ca9c777c85b3c9553a41f5  download/CSWjre6.gspec
-8b98539f0a2211e965cc9bb2d42024f3  download/CSWjdk.gspec
-e1aeb08d2dbb21e9b61598bc1dde0094  download/CSWjdk.depend
-873b8c1f59485f78eb87ad67fe4c4dc4  download/CSWjre.gspec
-a077039adebc66db2f7316e387ba13eb  download/CSWjre.depend
+8e3e3bcebbbd14d16657d8a102c2ed3b  download/CSWjdk6.gspec
+a08a034895b0e77dd70df961d63ec1a1  download/CSWjre6.gspec
+232933acc5ba9ac4fe72ed3cebdcb4d0  download/CSWjdk.gspec
+8d4a797e73a0e4b6f17fcf0a99d9b6f0  download/CSWjre.gspec

Deleted: csw/mgar/pkg/jdk6/trunk/files/CSWjdk.depend
===================================================================
--- csw/mgar/pkg/jdk6/trunk/files/CSWjdk.depend	2008-12-09 20:39:16 UTC (rev 2501)
+++ csw/mgar/pkg/jdk6/trunk/files/CSWjdk.depend	2008-12-09 20:50:47 UTC (rev 2502)
@@ -1 +0,0 @@
-P CSWjdk6        jdk6 - Java Development Kit 6

Modified: csw/mgar/pkg/jdk6/trunk/files/CSWjdk.gspec
===================================================================
--- csw/mgar/pkg/jdk6/trunk/files/CSWjdk.gspec	2008-12-09 20:39:16 UTC (rev 2501)
+++ csw/mgar/pkg/jdk6/trunk/files/CSWjdk.gspec	2008-12-09 20:50:47 UTC (rev 2502)
@@ -1,4 +1,4 @@
 %var            bitname jdk
 %var            pkgname CSWjdk
 %include        url file://%{PKGLIB}/csw_standard.gspec
-%copyright      url file://%{WORKSRC}/LICENSE
+%copyright      url file://%{WORKSRC_DEFAULT}/LICENSE

Deleted: csw/mgar/pkg/jdk6/trunk/files/CSWjdk6.depend
===================================================================
--- csw/mgar/pkg/jdk6/trunk/files/CSWjdk6.depend	2008-12-09 20:39:16 UTC (rev 2501)
+++ csw/mgar/pkg/jdk6/trunk/files/CSWjdk6.depend	2008-12-09 20:50:47 UTC (rev 2502)
@@ -1 +0,0 @@
-P CSWjre6        jre6 - Java Runtime Environment 6

Modified: csw/mgar/pkg/jdk6/trunk/files/CSWjdk6.gspec
===================================================================
--- csw/mgar/pkg/jdk6/trunk/files/CSWjdk6.gspec	2008-12-09 20:39:16 UTC (rev 2501)
+++ csw/mgar/pkg/jdk6/trunk/files/CSWjdk6.gspec	2008-12-09 20:50:47 UTC (rev 2502)
@@ -1,4 +1,4 @@
 %var            bitname jdk6
 %var            pkgname CSWjdk6
 %include        url file://%{PKGLIB}/csw_standard.gspec
-%copyright      url file://%{WORKSRC}/LICENSE
+%copyright      url file://%{WORKSRC_DEFAULT}/LICENSE

Deleted: csw/mgar/pkg/jdk6/trunk/files/CSWjre.depend
===================================================================
--- csw/mgar/pkg/jdk6/trunk/files/CSWjre.depend	2008-12-09 20:39:16 UTC (rev 2501)
+++ csw/mgar/pkg/jdk6/trunk/files/CSWjre.depend	2008-12-09 20:50:47 UTC (rev 2502)
@@ -1 +0,0 @@
-P CSWjre6        jre6 - Java Runtime Environment 6

Modified: csw/mgar/pkg/jdk6/trunk/files/CSWjre.gspec
===================================================================
--- csw/mgar/pkg/jdk6/trunk/files/CSWjre.gspec	2008-12-09 20:39:16 UTC (rev 2501)
+++ csw/mgar/pkg/jdk6/trunk/files/CSWjre.gspec	2008-12-09 20:50:47 UTC (rev 2502)
@@ -1,4 +1,4 @@
 %var            bitname jre
 %var            pkgname CSWjre
 %include        url file://%{PKGLIB}/csw_standard.gspec
-%copyright      url file://%{WORKSRC}/LICENSE
+%copyright      url file://%{WORKSRC_DEFAULT}/LICENSE

Modified: csw/mgar/pkg/jdk6/trunk/files/CSWjre6.gspec
===================================================================
--- csw/mgar/pkg/jdk6/trunk/files/CSWjre6.gspec	2008-12-09 20:39:16 UTC (rev 2501)
+++ csw/mgar/pkg/jdk6/trunk/files/CSWjre6.gspec	2008-12-09 20:50:47 UTC (rev 2502)
@@ -1,4 +1,4 @@
 %var            bitname jre6
 %var            pkgname CSWjre6
 %include        url file://%{PKGLIB}/csw_standard.gspec
-%copyright      url file://%{WORKSRC}/LICENSE
+%copyright      url file://%{WORKSRC_DEFAULT}/LICENSE


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.



More information about the devel mailing list