Magellan Linux

  • Back to homepage
    • /[smage]/branches/magellan-next/core/openjdk/openjdk-6.1.10.4-r1.smage2

    Diff of /branches/magellan-next/core/openjdk/openjdk-6.1.10.4-r1.smage2

    Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

    revision 9711 by niro, Thu Jan 5 17:10:51 2012 UTC revision 9720 by niro, Fri Jan 6 00:32:47 2012 UTC
    # Line 20  JRE_DEPEND=">= dev-java/java-environment Line 20  JRE_DEPEND=">= dev-java/java-environment
    20   >= x11-libs/libXrender-0.9   >= x11-libs/libXrender-0.9
    21   >= media-libs/libjpeg-8   >= media-libs/libjpeg-8
    22   >= media-libs/libpng-1.5   >= media-libs/libpng-1.5
    23   >= media-libs/giflib-4.1"   >= media-libs/giflib-4.1
    24     >= net-print/libcups-1.5"
    25    
    26  # eclipse-ecj-3.7.x has build issues with openjdk6  # eclipse-ecj-3.7.x has build issues with openjdk6
    27  SDEPEND="${JRE_DEPEND}  SDEPEND="${JRE_DEPEND}
    # Line 34  SDEPEND="${JRE_DEPEND} Line 35  SDEPEND="${JRE_DEPEND}
    35   >= dev-java/rhino-1.7   >= dev-java/rhino-1.7
    36   >= sys-dev/java-gcj-compat-1.0.80"   >= sys-dev/java-gcj-compat-1.0.80"
    37    
     ## icedtea-web  
     #WEB_DEPEND=">= x11-libs/gtk2+-2.24"  
     #JRE_DEPEND="${JRE_DEPEND}  
     # ${WEB_DEPEND}"  
     #SDEPEND="${SDEPEND}  
     # ${WEB_DEPEND}  
     # >= dev-java/junit-4.8.2  
     # >= net-www/npapi-sdk-0.27"  
       
    38  # provided java version  # provided java version
    39  JAVA_PVER="1.6.0-${PNAME}-${PVER}"  JAVA_PVER="1.6.0-${PNAME}-${PVER}"
    40    
    # Line 51  JAVA_PVER="1.6.0-${PNAME}-${PVER}" Line 43  JAVA_PVER="1.6.0-${PNAME}-${PVER}"
    43  ICEDTEA_PVER="${PVER/6.}"  ICEDTEA_PVER="${PVER/6.}"
    44  ICEDTEA_SRCFILE="icedtea6-${ICEDTEA_PVER}.tar.gz"  ICEDTEA_SRCFILE="icedtea6-${ICEDTEA_PVER}.tar.gz"
    45  ICEDTEA_SRCDIR="${BUILDDIR}/icedtea6-${ICEDTEA_PVER}"  ICEDTEA_SRCDIR="${BUILDDIR}/icedtea6-${ICEDTEA_PVER}"
     ## icedtea6-web (webstart and plugin)  
     #ICEDTEA_WEB_PVER="1.1.4"  
     #ICEDTEA_WEB_SRCFILE="icedtea-web-${ICEDTEA_WEB_PVER}.tar.gz"  
     #ICEDTEA_WEB_SRCDIR="${BUILDDIR}/icedtea-web-${ICEDTEA_WEB_PVER}"  
    46    
    47  # hardcoded openjdk-pver in icedtea!  # hardcoded openjdk-pver in icedtea!
    48  OPENJDK_PVER="b22-28_feb_2011"  OPENJDK_PVER="b22-28_feb_2011"
    # Line 66  JAXP_SRCFILE="jaxp${JAXP_PVER}.zip" Line 54  JAXP_SRCFILE="jaxp${JAXP_PVER}.zip"
    54    
    55  # hardcoded jaxp pver  # hardcoded jaxp pver
    56  JAXWS_PVER="b20"  JAXWS_PVER="b20"
    57  JAXWX_SRCFILE="jdk6-jaxws-${JAXWS_PVER}.zip"  JAXWS_SRCFILE="jdk6-jaxws-${JAXWS_PVER}.zip"
    58    
    59  # hardcoded jaf pver  # hardcoded jaf pver
    60  JAF_PVER="b20"  JAF_PVER="b20"
    # Line 77  sminclude mtools xdg Line 65  sminclude mtools xdg
    65  SRC_URI=(  SRC_URI=(
    66   http://download.java.net/openjdk/jdk6/promoted/${OPENJDK_PVER%-*}/${OPENJDK_SRCFILE}   http://download.java.net/openjdk/jdk6/promoted/${OPENJDK_PVER%-*}/${OPENJDK_SRCFILE}
    67   http://icedtea.classpath.org/download/source/${ICEDTEA_SRCFILE}   http://icedtea.classpath.org/download/source/${ICEDTEA_SRCFILE}
      #http://icedtea.classpath.org/download/source/${ICEDTEA_WEB_SRCFILE}  
    68   http://icedtea.classpath.org/download/drops/${JAXP_SRCFILE}   http://icedtea.classpath.org/download/drops/${JAXP_SRCFILE}
    69   http://icedtea.classpath.org/download/drops/${JAXWS_SRCFILE}   http://icedtea.classpath.org/download/drops/${JAXWS_SRCFILE}
    70   http://icedtea.classpath.org/download/drops/${JAF_SRCFILE}   http://icedtea.classpath.org/download/drops/${JAF_SRCFILE}
    71   mirror://${PNAME}/${OPENJDK_SRCFILE}   mirror://${PNAME}/${OPENJDK_SRCFILE}
    72   mirror://${PNAME}/${ICEDTEA_SRCFILE}   mirror://${PNAME}/${ICEDTEA_SRCFILE}
      #mirror://${PNAME}/${ICEDTEA_WEB_SRCFILE}  
    73   mirror://${PNAME}/${JAXP_SRCFILE}   mirror://${PNAME}/${JAXP_SRCFILE}
    74   mirror://${PNAME}/${JAXWS_SRCFILE}   mirror://${PNAME}/${JAXWS_SRCFILE}
    75   mirror://${PNAME}/${JAF_SRCFILE}   mirror://${PNAME}/${JAF_SRCFILE}
    76   mirror://${PNAME}/${PNAME}-${PVER}-xerces211.patch   mirror://${PNAME}/${PNAME}-${PVER}-xerces211.patch
    77   mirror://${PNAME}/${PNAME}-${PVER}-fix-cmds.patch   mirror://${PNAME}/${PNAME}-${PVER}-fix-cmds.patch
    78     mirror://${PNAME}/${PNAME}-${PVER}-hardcoded-test-cmds.patch
    79   #mirror://${PNAME}/${PNAME}-${PVER}-nonreparenting-wm.patch   #mirror://${PNAME}/${PNAME}-${PVER}-nonreparenting-wm.patch
    80   mirror://${PNAME}/${PNAME}-${PVER}-fontconfig.patch   mirror://${PNAME}/${PNAME}-${PVER}-fontconfig.patch
    81  )  )
    82    
    83  # upstream pver is something like 6b6  UP2DATE="updatecmd 'http://icedtea.classpath.org/download/source/?C=M;O=A' | grep icedtea6-[0-9] | lasttarball gz | sed 's:\(.*\):6.\1:'"
     UP2PVER="${PVER:2:1}b$(echo ${PVER:6} | sed 's/0\([0-9]\)/\1/')"  
     UP2DATE="updatecmd -listonly http://download.java.net/openjdk/jdk6/ | grep tar.gz | sed 's:.*/${PNAME}-\(.*\).tar.gz:\1:' | sed 's:\(.*\)-src-\(.*\)-.*:\1\2:'"  
    84    
    85  split_info_openjdk-jre()  split_info_openjdk-jre()
    86  {  {
    # Line 126  split_info_openjdk-demos() Line 111  split_info_openjdk-demos()
    111  src_prepare()  src_prepare()
    112  {  {
    113   munpack ${ICEDTEA_SRCFILE} || die   munpack ${ICEDTEA_SRCFILE} || die
      #munpack ${ICEDTEA_WEB_SRCFILE} || die  
    114   cd ${ICEDTEA_SRCDIR}   cd ${ICEDTEA_SRCDIR}
    115    
    116   # fix build against >=xerces-2.11 which has a xml-api.jar which must be included   # fix build against >=xerces-2.11 which has a xml-api.jar which must be included
    # Line 175  src_compile() Line 159  src_compile()
    159   # apply our patches here   # apply our patches here
    160   cd ${ICEDTEA_SRCDIR}/openjdk   cd ${ICEDTEA_SRCDIR}/openjdk
    161   mpatch ${PNAME}-${PVER}-fix-cmds.patch || die   mpatch ${PNAME}-${PVER}-fix-cmds.patch || die
    162     mpatch ${PNAME}-${PVER}-hardcoded-test-cmds.patch || die
    163   #mpatch ${PNAME}-${PVER}-nonreparenting-wm.patch || die   #mpatch ${PNAME}-${PVER}-nonreparenting-wm.patch || die
    164   mpatch ${PNAME}-${PVER}-fontconfig.patch || die   mpatch ${PNAME}-${PVER}-fontconfig.patch || die
    165   cd ${ICEDTEA_SRCDIR}   cd ${ICEDTEA_SRCDIR}
    166    
    167   mmake || die   mmake || die
       
     # # build iceteaweb  
     # cd ${ICEDTEA_WEB_SRCDIR}  
     # local JAVA_DIR="/usr/$(mlibdir)/jvm/java-${JAVA_PVER}"  
     # ./configure \  
     # --prefix=${JAVA_DIR}/jre \  
     # --datarootdir=/usr/share \  
     # --with-jdk-home=${ICEDTEA_SRCDIR}/openjdk.build/j2sdk-image \  
     # || die  
    168  }  }
    169    
    170  src_install_openjdk-jre()  src_install_openjdk-jre()
    # Line 209  src_install_openjdk-jre() Line 185  src_install_openjdk-jre()
    185   minstallfile openjdk.build/j2sdk-image/jre/lib/fontconfig.Ubuntu.properties.src \   minstallfile openjdk.build/j2sdk-image/jre/lib/fontconfig.Ubuntu.properties.src \
    186   ${JAVA_DIR}/jre/lib/fontconfig.properties.src || die   ${JAVA_DIR}/jre/lib/fontconfig.properties.src || die
    187    
      # install desktop-icons  
      minstall_desktop_icon \  
      --name "OpenJDK Monitoring & Management Console" \  
      --file "jconsole.desktop" \  
      --icon "java-openjdk" \  
      --exec "${JAVA_DIR}/bin/jconsole" \  
       
       
    188   # get the right platform, needed plugin and env.d script install   # get the right platform, needed plugin and env.d script install
    189   local PLATFORM="${ARCH}"   local PLATFORM="${ARCH}"
    190   [[ ${ARCH} = i*86 ]] && export PLATFORM="i386"   [[ ${ARCH} = i*86 ]] && export PLATFORM="i386"
    191   [[ ${ARCH} = x86_64 ]] && export PLATFORM="amd64"   [[ ${ARCH} = x86_64 ]] && export PLATFORM="amd64"
    192    
     # # mozilla-plugin and webstart  
     # # test it here: http://www.java.com/en/download/help/testvm.xml  
     # cd ${ICEDTEA_WEB_SRCDIR}  
     # mmake DESTDIR=${BINDIR} install || die  
     # minstalldir /usr/$(mlibdir)/nsbrowser/plugins || die  
     # mlink ${JAVA_DIR}/jre/lib/IcedTeaPlugin.so /usr/$(mlibdir)/nsbrowser/plugins || die  
       
    193   # install java environment into /etc/env.d   # install java environment into /etc/env.d
    194   minstalldir /etc/env.d/ || die   minstalldir /etc/env.d/ || die
    195   MCONFIG="/etc/env.d/21java"   MCONFIG="/etc/env.d/21java"
    196   mclearconfig || die   mclearconfig || die
    197   maddconfig "JAVA_HOME=\"${JAVA_DIR}\"" || die   maddconfig "JAVA_HOME=\"${JAVA_DIR}\"" || die
    198   maddconfig "JRE_HOME=\"${JAVA_DIR}\"" || die   maddconfig "JRE_HOME=\"${JAVA_DIR}\"" || die
    199     maddconfig "CLASSPATH=\"${JAVA_DIR}/jre/lib/resources.jar" || die
    200   maddconfig "CLASSPATH=\"${JAVA_DIR}/jre/lib/rt.jar\"" || die   maddconfig "CLASSPATH=\"${JAVA_DIR}/jre/lib/rt.jar\"" || die
    201  # maddconfig "CLASSPATH=\"${JAVA_DIR}/jre/lib/i18n.jar\"" || die  # maddconfig "CLASSPATH=\"${JAVA_DIR}/jre/lib/i18n.jar\"" || die
    202   maddconfig "CLASSPATH=\"${JAVA_DIR}/jre/lib/sunrsasign.jar\"" || die   maddconfig "CLASSPATH=\"${JAVA_DIR}/jre/lib/sunrsasign.jar\"" || die
    # Line 259  src_install_openjdk-jdk() Line 221  src_install_openjdk-jdk()
    221    
    222   local JAVA_DIR="/usr/$(mlibdir)/jvm/java-${JAVA_PVER}"   local JAVA_DIR="/usr/$(mlibdir)/jvm/java-${JAVA_PVER}"
    223    
    224   minstalldir /etc/$(mlibdir)/jvm || die   minstalldir /usr/$(mlibdir)/jvm || die
    225   mcopy -R openjdk.build/j2sdk-image ${JAVA_DIR} || die   mcopy -R openjdk.build/j2sdk-image ${JAVA_DIR} || die
    226   mchown -R root:root ${JAVA_DIR} || die   mchown -R root:root ${JAVA_DIR} || die
    227    
    # Line 273  src_install_openjdk-jdk() Line 235  src_install_openjdk-jdk()
    235   mlink ../jre/bin/${i} ${JAVA_DIR}/bin/${i} || die   mlink ../jre/bin/${i} ${JAVA_DIR}/bin/${i} || die
    236   fi   fi
    237   done   done
      # add missing webstart symlink too  
      #mlink ../jre/bin/javaws ${JAVA_DIR}/bin/javaws || die  
    238    
    239   # now remove the jre   # now remove the jre
    240   if [[ -d ${BINDIR}/${JAVA_DIR}/jre ]]   if [[ -d ${BINDIR}/${JAVA_DIR}/jre ]]
    # Line 288  src_install_openjdk-jdk() Line 248  src_install_openjdk-jdk()
    248   ${ICEDTEA_SRCDIR}/openjdk/jdk/src/solaris/classes/sun/awt/X11/java-icon48.png \   ${ICEDTEA_SRCDIR}/openjdk/jdk/src/solaris/classes/sun/awt/X11/java-icon48.png \
    249   java-openjdk.png || die   java-openjdk.png || die
    250   minstallxdg --exec "${JAVA_DIR}/bin/jconsole" --icon "java-openjdk" \   minstallxdg --exec "${JAVA_DIR}/bin/jconsole" --icon "java-openjdk" \
    251   --categories "System" ${ICEDTEA_SRCDIR}/jconsole.desktop || die   --categories "System" --file ${ICEDTEA_SRCDIR}/jconsole.desktop || die
    252   minstallxdg --exec "${JAVA_DIR}/bin/policytool" --icon "java-openjdk" \   minstallxdg --exec "${JAVA_DIR}/bin/policytool" --icon "java-openjdk" \
    253   ${ICEDTEA_SRCDIR}/policytool.desktop || die   --file ${ICEDTEA_SRCDIR}/policytool.desktop || die
    254    
    255   # remove the sources, they are way to big -> extra package   # remove the sources, they are way to big -> extra package
    256   rm -f ${BINDIR}/${JAVA_DIR}/src.zip || die   rm -f ${BINDIR}/${JAVA_DIR}/src.zip || die
    # Line 333  src_install_openjdk-demos() Line 293  src_install_openjdk-demos()
    293   minstalldir ${JAVA_DIR} || die   minstalldir ${JAVA_DIR} || die
    294   mcopy -R openjdk.build/j2sdk-image/demo ${JAVA_DIR}/ || die   mcopy -R openjdk.build/j2sdk-image/demo ${JAVA_DIR}/ || die
    295   mcopy -R openjdk.build/j2sdk-image/sample ${JAVA_DIR}/ || die   mcopy -R openjdk.build/j2sdk-image/sample ${JAVA_DIR}/ || die
    296     minstalldir ${JAVA_DIR}/sample/rmi || die
    297   minstallexec openjdk.build/j2sdk-image/bin/java-rmi.cgi ${JAVA_DIR}/sample/rmi || die   minstallexec openjdk.build/j2sdk-image/bin/java-rmi.cgi ${JAVA_DIR}/sample/rmi || die
    298   mchown -R root:root ${JAVA_DIR} || die   mchown -R root:root ${JAVA_DIR} || die
    299  }  }
    Legend:
    Removed from v.9711  
    changed lines
      Added in v.9720