Quellcode durchsuchen

Many corrections, inclusion of jre, updated to version 1.4, include SPARC 64-bit installation, and this is almost a complete J2SE package now.

Michael Schloh von Bennewitz vor 23 Jahren
Ursprung
Commit
66b7dbcac0
2 geänderte Dateien mit 92 neuen und 32 gelöschten Zeilen
  1. 0 11
      j2se/j2se.patch
  2. 92 21
      j2se/j2se.spec

+ 0 - 11
j2se/j2se.patch

@@ -1,11 +0,0 @@
---- bin/.java_wrapper	Thu Dec 20 16:46:33 2001
-+++ bin/.java_wrapper	Thu Dec 20 16:46:26 2001
-@@ -35,7 +35,7 @@
- while [ -L "$PRG" ]; do
-     ls=`ls -ld "$PRG"`
-     link=`expr "$ls" : '.*-> \(.*\)$'`
--    if expr "$link" : '/' > /dev/null; then
-+    if expr "$link" : '^/' > /dev/null; then
- 	PRG="$link"
-     else
- 	PRG="`dirname $PRG`/$link"

+ 92 - 21
j2se/j2se.spec

@@ -23,9 +23,9 @@
 ##
 
 #   package versions
-%define       V_sunjava 1_3_1_04
-%define       V_filesys 1.3.1_04
-%define       V_openpkg 1.3.1.04
+%define       V_sunjava 1_4_1
+%define       V_filesys 1.4.1
+%define       V_openpkg 1.4.1.00
 
 #   package information
 Name:         j2se
@@ -44,7 +44,6 @@ Source0:      j2sdk-%{V_sunjava}-linux-i586.bin
 Source1:      j2sdk-%{V_sunjava}-solaris-sparc.sh
 Source2:      j2sdk-%{V_sunjava}-solaris-sparcv9.sh
 Source3:      rc.j2se
-Source4:      j2se.patch
 
 #   build information
 Prefix:       %{l_prefix}
@@ -72,15 +71,17 @@ Provides:     JDK
 
     #   vendor source selection
     pkgfile=""
+    suppfile=""
     pkgdir=%{V_filesys}
     case "%{l_target}" in
         ix86-linux2.[2-5]* | ix86-freebsd4* )
             pkgfile="j2sdk-%{V_sunjava}-linux-i586.bin"
-            pkgdir="jdk%{V_filesys}"
+            pkgdir="j2sdk%{V_filesys}"
             ;;
         sparc64-solaris2.[6-9]*)
             pkgfile="j2sdk-%{V_sunjava}-solaris-sparc.sh"
-            pkgdir="j2sdk%{V_sunjava}"
+            suppfile="j2sdk-%{V_sunjava}-solaris-sparcv9.sh"
+            pkgdir="j2sdk%{V_filesys}"
             ;;
     esac
     if [ ".$pkgfile" = . ]; then
@@ -91,31 +92,98 @@ Provides:     JDK
     #   create installation tree
     %{l_shtool} mkdir -f -p -m 755 \
         $RPM_BUILD_ROOT%{l_prefix}/bin \
+        $RPM_BUILD_ROOT%{l_prefix}/lib \
+        $RPM_BUILD_ROOT%{l_prefix}/include \
         $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d \
         $RPM_BUILD_ROOT%{l_prefix}/libexec \
         $RPM_BUILD_ROOT%{l_prefix}/man/man1 \
-        $RPM_BUILD_ROOT%{l_prefix}/share/j2se/doc
+        $RPM_BUILD_ROOT%{l_prefix}/share/j2se/doc \
+        $RPM_BUILD_ROOT%{l_prefix}/jre/bin \
+        $RPM_BUILD_ROOT%{l_prefix}/jre/lib/applet \
+        $RPM_BUILD_ROOT%{l_prefix}/jre/lib/ext \
+        $RPM_BUILD_ROOT%{l_prefix}/jre/lib/security \
+        $RPM_BUILD_ROOT%{l_prefix}/jre/lib/fonts \
+        $RPM_BUILD_ROOT%{l_prefix}/jre/lib/images/cursors \
+        $RPM_BUILD_ROOT%{l_prefix}/jre/lib/audio \
+        $RPM_BUILD_ROOT%{l_prefix}/jre/lib/zi/Africa \
+        $RPM_BUILD_ROOT%{l_prefix}/jre/lib/zi/America/Indiana \
+        $RPM_BUILD_ROOT%{l_prefix}/jre/lib/zi/America/North_Dakota \
+        $RPM_BUILD_ROOT%{l_prefix}/jre/lib/zi/America/Kentucky \
+        $RPM_BUILD_ROOT%{l_prefix}/jre/lib/zi/Antarctica \
+        $RPM_BUILD_ROOT%{l_prefix}/jre/lib/zi/Asia \
+        $RPM_BUILD_ROOT%{l_prefix}/jre/lib/zi/Atlantic \
+        $RPM_BUILD_ROOT%{l_prefix}/jre/lib/zi/Australia \
+        $RPM_BUILD_ROOT%{l_prefix}/jre/lib/zi/Etc \
+        $RPM_BUILD_ROOT%{l_prefix}/jre/lib/zi/Europe \
+        $RPM_BUILD_ROOT%{l_prefix}/jre/lib/zi/Indian \
+        $RPM_BUILD_ROOT%{l_prefix}/jre/lib/zi/Pacific \
+        $RPM_BUILD_ROOT%{l_prefix}/jre/lib/cmm \
+        $RPM_BUILD_ROOT%{l_prefix}/jre/lib/im \
+        $RPM_BUILD_ROOT%{l_prefix}/jre/lib/locale/de/LC_MESSAGES \
+        $RPM_BUILD_ROOT%{l_prefix}/jre/lib/locale/es/LC_MESSAGES \
+        $RPM_BUILD_ROOT%{l_prefix}/jre/lib/locale/fr/LC_MESSAGES \
+        $RPM_BUILD_ROOT%{l_prefix}/jre/lib/locale/it/LC_MESSAGES \
+        $RPM_BUILD_ROOT%{l_prefix}/jre/lib/locale/ja/LC_MESSAGES \
+        $RPM_BUILD_ROOT%{l_prefix}/jre/lib/locale/ko/LC_MESSAGES \
+        $RPM_BUILD_ROOT%{l_prefix}/jre/lib/locale/ko.UTF-8/LC_MESSAGES \
+        $RPM_BUILD_ROOT%{l_prefix}/jre/lib/locale/sv/LC_MESSAGES \
+        $RPM_BUILD_ROOT%{l_prefix}/jre/lib/locale/zh/LC_MESSAGES \
+        $RPM_BUILD_ROOT%{l_prefix}/jre/lib/locale/zh.GBK/LC_MESSAGES \
+        $RPM_BUILD_ROOT%{l_prefix}/jre/lib/locale/zh_TW/LC_MESSAGES \
+        $RPM_BUILD_ROOT%{l_prefix}/jre/lib/locale/zh_TW.BIG5/LC_MESSAGES
+
+    case "%{l_target}" in
+        ix86-linux2.[2-5]* | ix86-freebsd4* )
+            %{l_shtool} mkdir -f -p -m 755 \
+                $RPM_BUILD_ROOT%{l_prefix}/include/linux \
+                $RPM_BUILD_ROOT%{l_prefix}/jre/lib/i386/native_threads \
+                $RPM_BUILD_ROOT%{l_prefix}/jre/lib/i386/server \
+                $RPM_BUILD_ROOT%{l_prefix}/jre/lib/i386/client
+            ;;
+        sparc64-solaris2.[6-9]*)
+            %{l_shtool} mkdir -f -p -m 755 \
+                $RPM_BUILD_ROOT%{l_prefix}/bin/sparcv9 \
+                $RPM_BUILD_ROOT%{l_prefix}/include/solaris \
+                $RPM_BUILD_ROOT%{l_prefix}/jre/bin/sparcv9 \
+                $RPM_BUILD_ROOT%{l_prefix}/jre/lib/sparc/native_threads \
+                $RPM_BUILD_ROOT%{l_prefix}/jre/lib/sparc/server \
+                $RPM_BUILD_ROOT%{l_prefix}/jre/lib/sparc/client \
+                $RPM_BUILD_ROOT%{l_prefix}/jre/lib/sparc/motif21 \
+                $RPM_BUILD_ROOT%{l_prefix}/jre/lib/sparc/headless \
+                $RPM_BUILD_ROOT%{l_prefix}/jre/lib/sparcv9/native_threads \
+                $RPM_BUILD_ROOT%{l_prefix}/jre/lib/sparcv9/server \
+                $RPM_BUILD_ROOT%{l_prefix}/jre/lib/sparcv9/motif21 \
+                $RPM_BUILD_ROOT%{l_prefix}/jre/lib/sparcv9/headless
+            ;;
+    esac
 
     #   unpack vendor distribution
     (   umask 022
         cd $RPM_BUILD_ROOT%{l_prefix}/libexec
         echo "yes" | sh $RPM_SOURCE_DIR/$pkgfile \
-            >$RPM_BUILD_ROOT%{l_prefix}/share/j2se/doc/COPYING
-        mv $pkgdir j2se
-    )
-
-    #   patch vendor distribution
-    (   cd $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se
+            >$RPM_BUILD_ROOT%{l_prefix}/share/j2se/doc/COPYING.32
         case "%{l_target}" in
-            ix86-freebsd4* )
-                %{l_patch} -p0 <%{SOURCE j2se.patch}
-            ;;
+            sparc64-solaris2.[6-9]*)
+                echo "yes" | sh $RPM_SOURCE_DIR/$suppfile \
+                    >$RPM_BUILD_ROOT%{l_prefix}/share/j2se/doc/COPYING.64
+                ;;
         esac
+        mv $pkgdir j2se
     )
 
     #   cleanup vendor distribution
     (   cd $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se/bin
         find . -type f -print | xargs chmod u+w
+        cd $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se/jre/bin
+        find . -type f -print | xargs chmod u+w
+        case "%{l_target}" in
+            sparc64-solaris2.[6-9]*)
+                cd $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se/bin/sparcv9
+                find . -type f -print | xargs chmod u+w
+                cd $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se/jre/bin/sparcv9
+                find . -type f -print | xargs chmod u+w
+                ;;
+        esac
     )
 
     #   optionally brand ELF binaries (FreeBSD only)
@@ -124,6 +192,9 @@ Provides:     JDK
             brandelf -t Linux \
                 `find $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se/bin/ -type f -print` \
                 >/dev/null 2>&1 || true
+            brandelf -t Linux \
+                `find $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se/jre/bin/ -type f -print` \
+                >/dev/null 2>&1 || true
             ;;
     esac
 
@@ -131,16 +202,16 @@ Provides:     JDK
     rm -rf $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se/demo 2>/dev/null || true
 
     #   reduce man pages to essential ones and move to final location
-    cp $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se/man/man1/* \
+    cp $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se/man/*man1/* \
        $RPM_BUILD_ROOT%{l_prefix}/man/man1
     rm -rf $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se/man 2>/dev/null || true
 
     #   activate binaries
     ( cd $RPM_BUILD_ROOT%{l_prefix}/bin
-      for bin in appletviewer awt_robot extcheck idlj jar jarsigner java \
-          javac javadoc javah javap jdb keytool native2ascii \
-          oldjava oldjavac oldjdb policytool rmic rmid rmiregistry \
-          serialver tnameserv; do
+      for bin in appletviewer extcheck idlj jar jarsigner java \
+          java-rmi.cgi javac javadoc javah javap jdb keytool native2ascii \
+          orbd policytool rmic rmid rmiregistry serialver servertool \
+          tnameserv; do
           ln -s ../libexec/j2se/bin/$bin .
       done
       ( echo "#!/bin/sh"