Revision: 2460
http://gar.svn.sourceforge.net/gar/?rev=2460&view=rev
Author: dmichelsen
Date: 2008-12-05 08:06:08 +0000 (Fri, 05 Dec 2008)
Log Message:
-----------
jdk6: Unified JDK/JRE package
Modified Paths:
--------------
csw/mgar/pkg/jdk6/trunk/Makefile
csw/mgar/pkg/jdk6/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/jdk6/trunk/files/CSWjdk.depend
csw/mgar/pkg/jdk6/trunk/files/CSWjdk.gspec
csw/mgar/pkg/jdk6/trunk/files/CSWjdk6.depend
csw/mgar/pkg/jdk6/trunk/files/CSWjre.depend
csw/mgar/pkg/jdk6/trunk/files/CSWjre.gspec
csw/mgar/pkg/jdk6/trunk/files/CSWjre6.gspec
Modified: csw/mgar/pkg/jdk6/trunk/Makefile
===================================================================
--- csw/mgar/pkg/jdk6/trunk/Makefile 2008-12-05 07:39:49 UTC (rev 2459)
+++ csw/mgar/pkg/jdk6/trunk/Makefile 2008-12-05 08:06:08 UTC (rev 2460)
@@ -18,15 +18,33 @@
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)
+DISTFILES += $(call admfiles,CSWjdk6,depend)
+DISTFILES += $(call admfiles,CSWjre6)
+DISTFILES += $(call admfiles,CSWjdk,depend)
+DISTFILES += $(call admfiles,CSWjre,depend)
-SPKG_SOURCEURL = http://java.sun.com/products/archive/
+SPKG_SOURCEURL = http://java.sun.com/javase/downloads/index.jsp
+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
+
CONFIGURE_SCRIPTS =
BUILD_SCRIPTS =
TEST_SCRIPTS =
INSTALL_SCRIPTS = custom
+PKGFILES_CSWjdk = $(prefix)/java/jdk/latest
+
+PKGFILES_CSWjre = $(prefix)/java/jre/latest
+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/jre/jre$(SPKG_VERSION)
+PKGFILES_CSWjre6 += $(prefix)/java/jre/jre6
+
+# CSWjdk6 gets all the rest
+
# Tell the user to download the file manually
manual//%:
@echo
@@ -39,21 +57,34 @@
@echo
# rule to extract files with shell
-shell-extract-%:
+shell-extract-archive-%:
@echo " ==> Extracting $(DOWNLOADDIR)/$*"
@echo "yes" | (D=$(abspath $(DOWNLOADDIR)/$*); cd $(EXTRACTDIR);
MORE="-10000" sh $$D)
@$(MAKECOOKIE)
-extract-%.sh: shell-extract-%.sh
+extract-archive-%.sh: shell-extract-archive-%.sh
@$(MAKECOOKIE)
include gar/category.mk
install-custom:
@echo " ==> Installing $(GARNAME)"
- @rm -rf $(DESTDIR)$(prefix)/$(DISTNAME)
- @ginstall -d $(DESTDIR)$(prefix)
- @(cd $(WORKDIR); pax -r -w -v $(DISTNAME) $(DESTDIR)$(prefix))
- @rm -f $(DESTDIR)$(prefix)/$(GARNAME)
- @gln -sf $(DISTNAME) $(DESTDIR)$(prefix)/$(GARNAME)
+
+ @rm -rf $(DESTDIR)$(prefix)/java
+ @ginstall -d $(DESTDIR)$(prefix)/java/jdk
+ @(cd $(WORKDIR); pax -r -w $(DISTNAME) $(DESTDIR)$(prefix)/java/jdk)
+ @rm -f $(DESTDIR)$(prefix)/java/jdk/latest
+ @gln -sf jdk6 $(DESTDIR)$(prefix)/java/jdk/latest
+ @rm -f $(DESTDIR)$(prefix)/java/jdk/jdk6
+ @gln -sf $(DISTNAME) $(DESTDIR)$(prefix)/java/jdk/jdk6
+
+ @ginstall -d $(DESTDIR)$(prefix)/java/jre
+ @rm -f $(DESTDIR)$(prefix)/java/jre/jre$(SPKG_VERSION)
+ @gln -sf ../jdk/$(DISTNAME)/jre
$(DESTDIR)$(prefix)/java/jre/jre$(SPKG_VERSION)
+ @rm -f $(DESTDIR)$(prefix)/java/jre/latest
+ @gln -sf jre6 $(DESTDIR)$(prefix)/java/jre/latest
+ @rm -f $(DESTDIR)$(prefix)/java/jre/jre6
+ @gln -sf jre$(SPKG_VERSION) $(DESTDIR)$(prefix)/java/jre/jre6
+
+ @gln -sf ../man $(DESTDIR)$(prefix)/java/jdk/$(DISTNAME)/jre/man
@$(MAKECOOKIE)
Modified: csw/mgar/pkg/jdk6/trunk/checksums
===================================================================
--- csw/mgar/pkg/jdk6/trunk/checksums 2008-12-05 07:39:49 UTC (rev 2459)
+++ csw/mgar/pkg/jdk6/trunk/checksums 2008-12-05 08:06:08 UTC (rev 2460)
@@ -3,3 +3,9 @@
e31c6cf8ada23cde243656f7ef435ce3 download/jdk-6u10-solaris-i586.sh
c837fbdd49b772255a255802552c8da6 download/jdk-6u10-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
Added: csw/mgar/pkg/jdk6/trunk/files/CSWjdk.depend
===================================================================
--- csw/mgar/pkg/jdk6/trunk/files/CSWjdk.depend (rev 0)
+++ csw/mgar/pkg/jdk6/trunk/files/CSWjdk.depend 2008-12-05 08:06:08 UTC (rev
2460)
@@ -0,0 +1 @@
+P CSWjdk6 jdk6 - Java Development Kit 6
Copied: csw/mgar/pkg/jdk6/trunk/files/CSWjdk.gspec (from rev 2353,
csw/mgar/pkg/jdk6/trunk/files/CSWjdk6.gspec)
===================================================================
--- csw/mgar/pkg/jdk6/trunk/files/CSWjdk.gspec (rev 0)
+++ csw/mgar/pkg/jdk6/trunk/files/CSWjdk.gspec 2008-12-05 08:06:08 UTC (rev
2460)
@@ -0,0 +1,4 @@
+%var bitname jdk
+%var pkgname CSWjdk
+%include url file://%{PKGLIB}/csw_standard.gspec
+%copyright url file://%{WORKSRC}/LICENSE
Added: csw/mgar/pkg/jdk6/trunk/files/CSWjdk6.depend
===================================================================
--- csw/mgar/pkg/jdk6/trunk/files/CSWjdk6.depend
(rev 0)
+++ csw/mgar/pkg/jdk6/trunk/files/CSWjdk6.depend 2008-12-05 08:06:08 UTC
(rev 2460)
@@ -0,0 +1 @@
+P CSWjre6 jre6 - Java Runtime Environment 6
Added: csw/mgar/pkg/jdk6/trunk/files/CSWjre.depend
===================================================================
--- csw/mgar/pkg/jdk6/trunk/files/CSWjre.depend (rev 0)
+++ csw/mgar/pkg/jdk6/trunk/files/CSWjre.depend 2008-12-05 08:06:08 UTC (rev
2460)
@@ -0,0 +1 @@
+P CSWjre6 jre6 - Java Runtime Environment 6
Copied: csw/mgar/pkg/jdk6/trunk/files/CSWjre.gspec (from rev 2353,
csw/mgar/pkg/jdk6/trunk/files/CSWjdk6.gspec)
===================================================================
--- csw/mgar/pkg/jdk6/trunk/files/CSWjre.gspec (rev 0)
+++ csw/mgar/pkg/jdk6/trunk/files/CSWjre.gspec 2008-12-05 08:06:08 UTC (rev
2460)
@@ -0,0 +1,4 @@
+%var bitname jre
+%var pkgname CSWjre
+%include url file://%{PKGLIB}/csw_standard.gspec
+%copyright url file://%{WORKSRC}/LICENSE
Copied: csw/mgar/pkg/jdk6/trunk/files/CSWjre6.gspec (from rev 2353,
csw/mgar/pkg/jre6/trunk/files/CSWjre6.gspec)
===================================================================
--- csw/mgar/pkg/jdk6/trunk/files/CSWjre6.gspec (rev 0)
+++ csw/mgar/pkg/jdk6/trunk/files/CSWjre6.gspec 2008-12-05 08:06:08 UTC (rev
2460)
@@ -0,0 +1,4 @@
+%var bitname jre6
+%var pkgname CSWjre6
+%include url file://%{PKGLIB}/csw_standard.gspec
+%copyright url file://%{WORKSRC}/LICENSE
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
devel mailing list
[email protected]
https://lists.opencsw.org/mailman/listinfo/devel
