[Gmod-apollo-cmts] CVS: apollo/bin mac-set-jvm,1.8,1.9

[Nomi H. <no...@us...>]

Update of /cvsroot/gmod/apollo/bin
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv18137/bin

Modified Files:
	mac-set-jvm 
Log Message:
Updated references to JDK1.4 to say 1.5+.  NOTE: this script NOT YET TESTED.



Index: mac-set-jvm
===================================================================
RCS file: /cvsroot/gmod/apollo/bin/mac-set-jvm,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** mac-set-jvm	22 Mar 2004 22:44:06 -0000	1.8
--- mac-set-jvm	19 Dec 2007 23:15:54 -0000	1.9
***************
*** 1,4 ****
  #!/usr/bin/perl
! # If appropriate, change Info.plist to force Apollo to use JDK1.4 instead
  # of the default JVM of 1.3.1.
  
--- 1,4 ----
  #!/usr/bin/perl
! # If appropriate, change Info.plist to force Apollo to use JDK1.5+ instead
  # of the default JVM of 1.3.1.
  
***************
*** 28,39 ****
  #printf STDERR "OS version = $version_string\n";  # DEL
  if ($version_string < 2.5) {
!     printf STDERR "Mac OS X version $version_string doesn't support JDK1.4--not changing Info.plist.\n";
      exit(3);
  }
  
! # We're on Mac OS 10.2.3 or later.  Check that we have 1.4 installed.
! my $jdk1_4 = `ls -d /System/Library/Frameworks/JavaVM.framework/Versions/1.4*`;
! if (!$jdk1_4) {
!     printf STDERR "WARNING: you are running Mac OS X version $version_string, but you don't have JDK1.4 installed.\nRunning Apollo with this setup may crash your Mac.\nWe recommend installing JDK1.4.\n";
      exit(-1);
  }
--- 28,39 ----
  #printf STDERR "OS version = $version_string\n";  # DEL
  if ($version_string < 2.5) {
!     printf STDERR "Mac OS X version $version_string doesn't support JDK1.5--not changing Info.plist.\n";
      exit(3);
  }
  
! # We're on Mac OS 10.2.3 or later.  Check that we have 1.5+ installed.
! my $jdk1_5 = `ls -d /System/Library/Frameworks/JavaVM.framework/Versions/1.5*`;
! if (!$jdk1_5) {
!     printf STDERR "WARNING: you are running Mac OS X version $version_string, but you don't have JDK1.5 installed.\nRunning Apollo with this setup may crash your Mac.\nWe recommend installing JDK1.5.\n";
      exit(-1);
  }
***************
*** 42,46 ****
  my $properties = $APOLLO_ROOT . "Apollo.app/Contents/Info.plist";
  if (!open(IN, $properties)) {
!     printf STDERR "Can't find $properties.  You must not be running the installed version of Apollo.\n";
      exit(2);
  }
--- 42,46 ----
  my $properties = $APOLLO_ROOT . "Apollo.app/Contents/Info.plist";
  if (!open(IN, $properties)) {
!     printf STDERR "Can't find $properties.\nYou must not be running the installed version of Apollo.\n";
      exit(2);
  }
***************
*** 62,71 ****
  print OUT $line;
  # Now see if we already have a JVMVersion string--if so, we might need to change it
! # to 1.4 (because we know we have 1.4)
  $line = <IN>;
  if ($line =~ /JVMVersion/) {
      $line = <IN>;
      if ($line =~ /1.3/) {
! 	printf STDERR "$properties is specifying JVM1.3--we need 1.4";
  	$line = <IN>;  # Skip the version line; we'll rewrite it below
      }
--- 62,71 ----
  print OUT $line;
  # Now see if we already have a JVMVersion string--if so, we might need to change it
! # to 1.5 (because we know we have 1.5)
  $line = <IN>;
  if ($line =~ /JVMVersion/) {
      $line = <IN>;
      if ($line =~ /1.3/) {
! 	printf STDERR "$properties is specifying JVM1.3--we need 1.5";
  	$line = <IN>;  # Skip the version line; we'll rewrite it below
      }
***************
*** 79,83 ****
  # Add JVMVersion line BEFORE the line we checked to see if it was a JVMVersion line.
  print OUT "			<key>JVMVersion</key>\n";
! print OUT "			<string>1.4+</string>\n";
  print OUT $line;
  $changed = 1;
--- 79,84 ----
  # Add JVMVersion line BEFORE the line we checked to see if it was a JVMVersion line.
  print OUT "			<key>JVMVersion</key>\n";
! # print OUT "			<string>1.4+</string>\n";
! print OUT "			<string>1.5+</string>\n";
  print OUT $line;
  $changed = 1;