diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-07-05 20:12:45 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-07-05 20:12:45 +0000 |
| commit | 354d08977cedf144194c43ccca3f5b966d06d3d8 (patch) | |
| tree | 714d8291849548f78993c8c4333e6edb19dae95b /config_office | |
| parent | 367512012ef21ab39b6aa47b90333bd70107ffc6 (diff) | |
INTEGRATION: CWS targetedaot (1.100.2); FILE MERGED
2006/06/12 10:15:59 cmc 1.100.2.3: #i54692# fix quotes
2006/04/25 16:16:18 cmc 1.100.2.2: #i54692# separate gcj AOT support from bytecode creation
2006/04/25 16:03:03 cmc 1.100.2.1: #i54692# separate gcj AOT support from bytecode creation
Diffstat (limited to 'config_office')
| -rw-r--r-- | config_office/set_soenv.in | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/config_office/set_soenv.in b/config_office/set_soenv.in index 401ea32b8620..e56d8d082c8e 100644 --- a/config_office/set_soenv.in +++ b/config_office/set_soenv.in @@ -1,8 +1,8 @@ #!@PERL@ -w # # Program: set_soenv.in -# Version: $Revision: 1.105 $ -# Date: $Date: 2006-06-02 12:34:16 $ +# Version: $Revision: 1.106 $ +# Date: $Date: 2006-07-05 21:12:45 $ # Author: Willem van Dorp, Ross Nicholson, Oisin Boydell - Sun Microsystems, Ireland. # #--------------------------------------------------------------------------- @@ -78,7 +78,7 @@ my ( $oldPATH, $SRC_ROOT, $SO_HOME, $JAVA_HOME, $JDK, $SHELL, $UPD, $SOLARUPD, $WORK_STAMP, $TF_UCB, $SOLARROOT, $SOLARSRC, $DEVROOT, $SOLARVER, $SOLARVERSION, $SOLARENV, $STAR_INIROOT, $STAR_INIROOTOLD, $STAR_STANDLST, $STAR_SSCOMMON, $STAR_SSOLARINI, - $STAR_REGISTRY, $STAR_RESOURCEPATH, $DMAKEROOT, $CLASSPATH, $XCLASSPATH, $COMPATH, $GCJ_DATABASE, + $STAR_REGISTRY, $STAR_RESOURCEPATH, $DMAKEROOT, $CLASSPATH, $XCLASSPATH, $COMPATH, $MSPDB_PATH, $MIDL_PATH, $CSC_PATH, $NMAKE_PATH, $LD_LIBRARY_PATH, $PATH, $SOLARDEF, $SOLAREXTRAINC, $SOLAREXTRALIB, $SOLARLIB, $SOLARINC, $LOCALINI, $PATHEXTRA, $FRAMEWORKSHOME, $COMEX, $MULTITHREAD_OBJ, $PERL, @@ -880,8 +880,6 @@ $CLASSPATH = '$JAVA_HOME'.$ds.'jre'.$LIB.$ds."rt.jar".$ps.'.'; # Location of the JDK supported standard classes.zip file. # see above for why the change $XCLASSPATH = '$JAVA_HOME'.$ds.'jre'.$LIB.$ds."rt.jar".$ps.'.'; -# Location of gcj cache -$GCJ_DATABASE = '$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.$ds."openoffice.org.gcjdb"; # Paths to run time shared libraries. if ($platform =~ m/solaris/) @@ -1628,8 +1626,7 @@ if ( $JDK ne "gcj" ) { ToFile( "XCLASSPATH", $XCLASSPATH, "e" ); } else { - ToFile( "GCJ_DATABASE", $GCJ_DATABASE, "e" ); - ToFile( "JAVACACHE", '@JAVACACHE@', "e" ); + ToFile( "JAVACISGCJ", '@JAVACISGCJ@', "e" ); ToFile( "AWTLIB", '@AWTLIB@', "e" ); } if ( '@JDK@' ne '' ) @@ -1637,6 +1634,7 @@ if ( '@JDK@' ne '' ) ToFile( "JDK", "@JDK@", "e" ); ToFile( "JAVAINTERPRETER", "@JAVAINTERPRETER@","e" ); ToFile( "JAVACOMPILER", "@JAVACOMPILER@", "e" ); + ToFile( "JAVAAOTCOMPILER", "@JAVAAOTCOMPILER@","e" ); ToFile( "JAVADOC", "@JAVADOC@", "e" ); } if ( $platform =~ m/darwin/ ) |