Changeset 2626

Show
Ignore:
Timestamp:
08/20/08 09:43:58 (3 months ago)
Author:
kris
Message:

Updated javajre16 as well to grab the right diablo-jre1.6.0 directory

Location:
pbibuild/modules/javajre16
Files:
4 modified

Legend:

Unmodified
Added
Removed

  • pbibuild/modules/javajre16/copy-files

    r1090 r2626  
    22/usr/local/bin/classpath bin/ 
    33/usr/local/etc/java* etc/ 
    4 /usr/local/diablo-jre1.5.0 ./ 
     4/usr/local/diablo-jre1.6.0 ./ 

  • pbibuild/modules/javajre16/overlay-dir/PBI.RemoveScript.sh

    r1090 r2626  
    1010 
    1111# Cleanup our main symlinks 
    12 rm /usr/local/diablo-jre1.5.0 
     12rm /usr/local/diablo-jre1.6.0 
    1313rm /usr/local/bin/javavm 
    1414rm /usr/local/bin/classpath 

  • pbibuild/modules/javajre16/overlay-dir/PBI.SetupScript.sh

    r1090 r2626  
    1515cd /Programs/${PROGDIR} 
    1616 
    17 ln -s /Programs/${PROGDIR}/diablo-jre1.5.0 /usr/local/diablo-jre1.5.0 
     17ln -s /Programs/${PROGDIR}/diablo-jre1.6.0 /usr/local/diablo-jre1.6.0 
    1818ln -s /Programs/${PROGDIR}/bin/javavm /usr/local/bin/javavm 
    1919ln -s /Programs/${PROGDIR}/bin/classpath /usr/local/bin/classpath 
    … …  
    3737  if [ -e "${i}/.mozilla/plugins" ] 
    3838  then 
    39     ln -s /Programs/${PROGDIR}/diablo-jre1.5.0/plugin/i386/ns7/libjavaplugin_oji.so /home/${i}/.mozilla/plugins/libjavaplugin_oji.so 
     39    ln -s /Programs/${PROGDIR}/diablo-jre1.6.0/plugin/i386/ns7/libjavaplugin_oji.so /home/${i}/.mozilla/plugins/libjavaplugin_oji.so 
    4040  fi 
    4141done 

  • pbibuild/modules/javajre16/pbi.conf

    r2603 r2626  
    3333# Build Key - Change this to anything else to trigger a rebuild  
    3434#           - The rebuild will take place even if port is still the same ver 
    35 BUILDKEY="21" 
     35BUILDKEY="31" 
    3636 
    3737# If this port has a non-standard port version variable in Makefile, then