Index: NB.xml
===================================================================
RCS file: /cvs/installer/NB.xml,v
--- NB.xml 9 Jul 2002 09:04:57 -0000 1.11
+++ NB.xml 15 Jul 2002 15:53:26 -0000
@@ -27,13 +27,13 @@
bean11
-
- uninstaller.exe
+
+ uninstaller.bin
0
False
-
- uninstaller.bin
+
+ uninstaller.exe
0
False
@@ -42,12 +42,12 @@
0
False
-
+
uninstaller.bin
0
False
-
+
uninstaller.bin
0
False
@@ -71,6 +71,37 @@
True
False
bean12
+
+
+
+
+ $A(IS_HOME)/jvms/aix_power/ibm_aix_118.jvm
+ False
+ aix_power
+
+
+ $A(IS_HOME)/jvms/aix_power/ibm_aix_116.jvm
+ False
+ aix_power
+
+
+ $A(IS_HOME)/jvms/aix_power/ibm_aix_13.jvm
+ False
+ aix_power
+
+
+ $A(IS_HOME)/jvms/aix_power/ibm_aix_122.jvm
+ False
+ aix_power
+
+
+ 1
+ -qq -o
+
+
+ 120
+ True
+
@@ -97,28 +128,43 @@
120
True
-
+
-
+
- $A(IS_HOME)/jvms/aix_power/ibm_aix_118.jvm
+ $A(IS_HOME)/jvms/solaris/sun.jdk.1.1.8.solaris.jvm
False
- aix_power
+ solaris
- $A(IS_HOME)/jvms/aix_power/ibm_aix_116.jvm
+ $A(IS_HOME)/jvms/solaris/sun.jre.1.2.2.solaris.jvm
False
- aix_power
+ solaris
- $A(IS_HOME)/jvms/aix_power/ibm_aix_13.jvm
+ $A(IS_HOME)/jvms/solaris/sun.jre.1.1.x.solaris.jvm
False
- aix_power
+ solaris
- $A(IS_HOME)/jvms/aix_power/ibm_aix_122.jvm
+ $A(IS_HOME)/jvms/solaris/sun.jre.1.1.8.solaris.jvm
False
- aix_power
+ solaris
+
+
+ $A(IS_HOME)/jvms/solaris/sun.jre.1.3X.solaris.jvm
+ False
+ solaris
+
+
+ $A(IS_HOME)/jvms/solaris/sun.jre.1.3.0.solaris.jvm
+ False
+ solaris
+
+
+ $A(IS_HOME)/jvms/solaris/sun.jdk.1.2.2.solaris.jvm
+ False
+ solaris
1
@@ -184,53 +230,43 @@
120
True
-
+
-
-
- $A(IS_HOME)/jvms/solaris/sun.jdk.1.1.8.solaris.jvm
- False
- solaris
-
-
- $A(IS_HOME)/jvms/solaris/sun.jre.1.2.2.solaris.jvm
- False
- solaris
-
+
- $A(IS_HOME)/jvms/solaris/sun.jre.1.1.x.solaris.jvm
+ $A(IS_HOME)/jvms/hpux/hp_hpux11-0_118_005a_jre.jvm
False
- solaris
+ hpux
- $A(IS_HOME)/jvms/solaris/sun.jre.1.1.8.solaris.jvm
+ $A(IS_HOME)/jvms/hpux/hp_hpux_118_jdk.jvm
False
- solaris
+ hpux
- $A(IS_HOME)/jvms/solaris/sun.jre.1.3X.solaris.jvm
+ $A(IS_HOME)/jvms/hpux/hp_hpux10-2_118_jre.jvm
False
- solaris
+ hpux
- $A(IS_HOME)/jvms/solaris/sun.jre.1.3.0.solaris.jvm
+ $A(IS_HOME)/jvms/hpux/hp_hpux_130.jvm
False
- solaris
+ hpux
- $A(IS_HOME)/jvms/solaris/sun.jdk.1.2.2.solaris.jvm
+ $A(IS_HOME)/jvms/hpux/hp_hpux_122.jvm
False
- solaris
+ hpux
1
- -qq -o
+
120
True
-
+
@@ -312,42 +348,6 @@
120
True
-
-
-
-
- $A(IS_HOME)/jvms/hpux/hp_hpux11-0_118_005a_jre.jvm
- False
- hpux
-
-
- $A(IS_HOME)/jvms/hpux/hp_hpux_118_jdk.jvm
- False
- hpux
-
-
- $A(IS_HOME)/jvms/hpux/hp_hpux10-2_118_jre.jvm
- False
- hpux
-
-
- $A(IS_HOME)/jvms/hpux/hp_hpux_130.jvm
- False
- hpux
-
-
- $A(IS_HOME)/jvms/hpux/hp_hpux_122.jvm
- False
- hpux
-
-
- 1
-
-
-
- 120
- True
-
@@ -516,12 +516,12 @@
0
3
-
-
-
CLIENT_SHARED
+
+
+
True
@@ -1157,128 +1157,13 @@
-
-
- True
- setupaix.bin
-
-
- $A(IS_HOME)/jvms/aix_power/ibm_aix_13.jvm
- False
- aix_power
-
-
- $A(IS_HOME)/jvms/aix_power/ibm_aix_122.jvm
- False
- aix_power
-
-
- $A(IS_HOME)/jvms/aix_power/ibm_aix_118.jvm
- False
- aix_power
-
-
- $A(IS_HOME)/jvms/aix_power/ibm_aix_116.jvm
- False
- aix_power
-
-
-
-
-
- False
- 0
- %IF_EXISTS%("INIT_JAVA_HEAP", "@INIT_JAVA_HEAP@20m") %IF_EXISTS%("MAX_JAVA_HEAP", "@MAX_JAVA_HEAP@60m")
-
-
- False
-
-
- True
- setuphp1020.bin
-
-
- $A(IS_HOME)/jvms/hpux/hp_hpux11-0_118_005a_jre.jvm
- False
- hpux
-
-
- $A(IS_HOME)/jvms/hpux/hp_hpux_118_jdk.jvm
- False
- hpux
-
-
- $A(IS_HOME)/jvms/hpux/hp_hpux10-2_118_jre.jvm
- False
- hpux
-
-
- $A(IS_HOME)/jvms/hpux/hp_hpux_130.jvm
- False
- hpux
-
-
- $A(IS_HOME)/jvms/hpux/hp_hpux_122.jvm
- False
- hpux
-
-
-
-
-
- False
- 0
- %IF_EXISTS%("INIT_JAVA_HEAP", "@INIT_JAVA_HEAP@20m") %IF_EXISTS%("MAX_JAVA_HEAP", "@MAX_JAVA_HEAP@60m")
-
-
- False
-
-
- True
- setuphp11x.bin
-
-
- $A(IS_HOME)/jvms/hpux/hp_hpux11-0_118_005a_jre.jvm
- False
- hpux
-
-
- $A(IS_HOME)/jvms/hpux/hp_hpux_118_jdk.jvm
- False
- hpux
-
-
- $A(IS_HOME)/jvms/hpux/hp_hpux10-2_118_jre.jvm
- False
- hpux
-
-
- $A(IS_HOME)/jvms/hpux/hp_hpux_130.jvm
- False
- hpux
-
-
- $A(IS_HOME)/jvms/hpux/hp_hpux_122.jvm
- False
- hpux
-
-
-
-
-
- False
- 0
- %IF_EXISTS%("INIT_JAVA_HEAP", "@INIT_JAVA_HEAP@20m") %IF_EXISTS%("MAX_JAVA_HEAP", "@MAX_JAVA_HEAP@60m")
-
-
- False
-
+
True
setuplinux.bin
-
+
- $A(IS_HOME)/jvms/linux/sunjre14.jvm
+ $A(IS_HOME)/jvms/linux/sunjdk141.jvm
False
@@ -1286,96 +1171,38 @@
False
- $A(IS_HOME)/jvms/linux/blackdownjre14.jvm
- False
-
-
$A(IS_HOME)/jvms/linux/ibmjdk14.jvm
False
- $A(IS_HOME)/jvms/linux/ibmjre14.jvm
- False
-
-
- $A(IS_HOME)/jvms/linux/sunjre13.jvm
- False
- linux
-
-
- $A(IS_HOME)/jvms/linux/sunjre131.jvm
- False
- linux
-
-
$A(IS_HOME)/jvms/linux/sunjdk131.jvm
False
linux
- $A(IS_HOME)/jvms/linux/sunjdk13.jvm
- False
- linux
-
-
- $A(IS_HOME)/jvms/linux/ibmjdk13.jvm
- False
- linux
-
-
- $A(IS_HOME)/jvms/linux/ibmjre13.jvm
- False
- linux
-
-
- $A(IS_HOME)/jvms/linux/blackdownjre131.jvm
- False
- linux
-
-
$A(IS_HOME)/jvms/linux/blackdownjdk131.jvm
False
linux
- $A(IS_HOME)/jvms/linux/blackdownjdk13.jvm
+ $A(IS_HOME)/jvms/linux/sunjre141.jvm
False
- linux
- $A(IS_HOME)/jvms/linux/blackdownjre13.jvm
+ $A(IS_HOME)/jvms/linux/ibmjre141.jvm
False
- linux
-
-
-
-
- False
- 0
- %IF_EXISTS%("INIT_JAVA_HEAP", "@INIT_JAVA_HEAP@20m") %IF_EXISTS%("MAX_JAVA_HEAP", "@MAX_JAVA_HEAP@60m")
-
-
- False
-
-
- True
- setupos2.exe
-
- $A(IS_HOME)/jvms/os2/ibm_os2_130.jvm
+ $A(IS_HOME)/jvms/linux/sunjre14.jvm
False
- os2
- $A(IS_HOME)/jvms/os2/ibm_os2_118.jvm
+ $A(IS_HOME)/jvms/linux/ibmjre14.jvm
False
- os2
- $A(IS_HOME)/jvms/os2/ibm_os2_117A.jvm
+ $A(IS_HOME)/jvms/linux/sunjre131.jvm
False
- os2
@@ -1393,18 +1220,16 @@
setupsolarisSparc.bin
- $A(IS_HOME)/jvms/solaris/sun.jre.1.4.0.solaris.jvm
+ $A(IS_HOME)/jvms/solaris/sun.jdk.1.4.1.solaris.jvm
False
- $A(IS_HOME)/jvms/solaris/sun.jre.1.3X.solaris.jvm
- True
- solaris
+ $A(IS_HOME)/jvms/solaris/sun.jdk.1.4.solaris.jvm
+ False
- $A(IS_HOME)/jvms/solaris/sun.jre.1.3.0.solaris.jvm
+ $A(IS_HOME)/jvms/solaris/sun.jdk.1.3.1.solaris.jvm
False
- solaris
@@ -1422,18 +1247,16 @@
setupsolarisX86.bin
- $A(IS_HOME)/jvms/solaris/sun.jre.1.4.0.solaris.jvm
+ $A(IS_HOME)/jvms/solaris/sun.jdk.1.4.1.solaris.jvm
False
- $A(IS_HOME)/jvms/solaris/sun.jre.1.3X.solaris.jvm
+ $A(IS_HOME)/jvms/solaris/sun.jdk.1.4.solaris.jvm
False
- solaris
- $A(IS_HOME)/jvms/solaris/sun.jre.1.3.0.solaris.jvm
+ $A(IS_HOME)/jvms/solaris/sun.jdk.1.3.1.solaris.jvm
False
- solaris
@@ -1460,9 +1283,8 @@
win32
- $A(IS_HOME)/jvms/win32/sun_win32_13.jvm
+ $A(IS_HOME)/jvms/win32/sun_win32_141.jvm
False
- win32
Index: jvms/linux/blackdownjre14.jvm
===================================================================
RCS file: /cvs/installer/jvms/linux/blackdownjre14.jvm,v
--- jvms/linux/blackdownjre14.jvm 3 Jul 2002 13:38:49 -0000 1.2
+++ jvms/linux/blackdownjre14.jvm 15 Jul 2002 15:53:26 -0000
@@ -17,7 +17,9 @@
"/opt/j2re1.4"
/:
PLATFORM_HINT:
- JAVA_HOME
- JDKHOME
+ JDK_HOME
+ JDKHOME
+ JAVA_HOME
+ JAVA_PATH
/:
Index: jvms/linux/ibmjdk14.jvm
===================================================================
RCS file: /cvs/installer/jvms/linux/ibmjdk14.jvm,v
--- jvms/linux/ibmjdk14.jvm 3 Jul 2002 13:38:49 -0000 1.2
+++ jvms/linux/ibmjdk14.jvm 15 Jul 2002 15:53:26 -0000
@@ -19,7 +19,9 @@
"/usr/local/jdk14"
/:
PLATFORM_HINT:
+ JDK_HOME
+ JDKHOME
+ JAVA_PATH
JAVA_HOME
- JDKHOME
/:
Index: jvms/linux/sunjdk14.jvm
===================================================================
RCS file: /cvs/installer/jvms/linux/sunjdk14.jvm,v
--- jvms/linux/sunjdk14.jvm 3 Jul 2002 13:38:49 -0000 1.2
+++ jvms/linux/sunjdk14.jvm 15 Jul 2002 15:53:26 -0000
@@ -19,11 +19,12 @@
"/usr/j2sdk1.4.0"
"/usr/local/j2sdk1.4.0"
"/usr/java/jdk1.4"
-
+
/:
PLATFORM_HINT:
- JAVA_HOME
- JDKHOME
+ JDK_HOME
+ JDKHOME
+ JAVA_PATH
+ JAVA_HOME
/:
-
Index: jvms/solaris/sun.jre.1.4.0.solaris.jvm
===================================================================
RCS file: /cvs/installer/jvms/solaris/sun.jre.1.4.0.solaris.jvm,v
--- jvms/solaris/sun.jre.1.4.0.solaris.jvm 9 May 2002 06:37:37 -0000 1.2
+++ jvms/solaris/sun.jre.1.4.0.solaris.jvm 15 Jul 2002 15:53:26 -0000
@@ -1,21 +1,16 @@
DESC: Sun Java Runtime Kit (JRE) 1.4.0 for Solaris
-JVM_EXE: bin/java
+JVM_EXE: jre/bin/java
PATH_HINT:
- /usr/jre1.4
- /usr/jre1.4.0
/usr/java1.4
/usr/java
/usr/java1.4.0
/usr/local/java
/usr/local/java1.4.0
- /usr/local/jre
- /usr/local/jre1.4
- /usr/local/jre1.4.0
/usr/jdk
/usr/jdk1.4
/usr/jdk1.4.0
- /opt/jre1.4
- /opt/jre1.4.0
+ /usr/j2se
+ /usr/j2sdk
/opt/java
/opt/java1.4
/opt/java1.4.0
@@ -44,6 +39,16 @@
BOOT_CLASSPATH: -Xbootclasspath:
NO_CLASS_GC: -Xnoclassgc
INIT_JAVA_HEAP: -Xms
+
+/:
+PLATFORM_HINT:
+ JAVA_PATH
+ JDK_HOME
+ JAVA_HOME
+ JDKHOME
+
+/:
+
MAX_JAVA_HEAP: -Xmx
REDUCE_OS_SIGNALS: -Xrs
CHECK_JNI: -Xcheck:jni
Index: jvms/win32/sun_win32_14.jvm
===================================================================
RCS file: /cvs/installer/jvms/win32/sun_win32_14.jvm,v
--- jvms/win32/sun_win32_14.jvm 24 Apr 2002 13:42:17 -0000 1.1
+++ jvms/win32/sun_win32_14.jvm 15 Jul 2002 15:53:26 -0000
@@ -9,16 +9,18 @@
"java.version=1.4.0"
/:
PLATFORM_HINT:
- \HKEY_LOCAL_MACHINE\SOFTWARE\JavaSoft\Java Runtime Environment\1.4\JavaHome
\HKEY_LOCAL_MACHINE\SOFTWARE\JavaSoft\Java Development Kit\1.4\JavaHome
/:
PATH_HINT:
- \Program Files\JavaSoft\JRE\1.4.0
- \JavaSoft\JRE\1.4.0
- \Java\JRE\1.4.0
-
-
-
+ \Program Files\JavaSoft\1.4.0
+ \Program Files\JavaSoft\j2sdk1.4.0
+ \JavaSoft\1.4.0
+ \JavaSoft\j2sdk1.4.0
+ \Java\1.4.0
+ \Java\j2sdk1.4.0
+ \j2sdk1.4.0
+ \j2sdk1.4
+
/:
VERBOSE: -verbose
VERBOSE_GC: -verbose:gc
Index: src/org/netbeans/installer/actions/WriteAction.java
===================================================================
RCS file: /cvs/installer/src/org/netbeans/installer/actions/WriteAction.java,v
--- src/org/netbeans/installer/actions/WriteAction.java 2 Jul 2002 10:21:23 -0000 1.5
+++ src/org/netbeans/installer/actions/WriteAction.java 15 Jul 2002 15:53:27 -0000
@@ -54,6 +54,8 @@
private String fastDir = binDir+"fastjavac"+separator; //NOI18N
//files with x permissions
private String[] execFiles = {binDir+"optide.sh",binDir+"rmid_wrapper.sh",binDir+"runide.sh",binDir+".runide_defaults.sh",fastDir+"fastjavac.linux",fastDir+"fastjavac.sun",fastDir+"fastjavac.sun.intel"}; //NOI18N
+ private String jdkHome = null;
+ private String javaHome = null;
/**
* Sets the properties file
@@ -153,29 +155,52 @@
copyPreSettings();
}catch (Exception e) {
debug(e.getMessage());
- }
+ }
+ javaHome = System.getProperty("java.home");
+ if(javaHome != null){
+ //write info about jvm into ide.cfg
+ writeJDKHome();
+ }
setExecPermissions(productInstallLocation+separator); //NOI18N
}
+ private void writeJDKHome(){
+ try {
+ String file = productInstallLocation + File.separator + "bin" + File.separator + "ide.cfg"; //NOI18N
+ PrintWriter ps = new PrintWriter(new BufferedWriter(new FileWriter(file)));
+ int jreIndex = javaHome.indexOf("jre");
+ if(jreIndex != -1){
+ jdkHome = javaHome.substring(0,javaHome.length()-4);
+ }
+ //check if it is really jdk - not only jre
+ File compiler = new File(jdkHome + separator+"bin"+separator+"javac"); //NOI18N
+ if(compiler.exists()){
+ ps.println("-jdkhome " + jdkHome + " -J-Xmx96m -J-Xms24m -J-Xverify:none" ); //NOI18N
+ ps.close();
+ }
+ } catch (java.io.IOException e) {
+ logEvent(this, Log.ERROR, e);
+ }
+ }
private void setExecPermissions(String execDir){
debug("execDir: "+execDir); //NOI18N
String os = System.getProperty("os.name"); //NOI18N
if(os != null){
- if (os.indexOf("Windows") == -1) { //NOI18N
- Runtime rt = Runtime.getRuntime();
- for(int i=0; i < execFiles.length; i++){
+ if (os.indexOf("Windows") == -1) { //NOI18N
+ Runtime rt = Runtime.getRuntime();
+ for(int i=0; i < execFiles.length; i++){
String filePath = execDir+execFiles[i];
File dir = new File(filePath);
if(dir.exists())
- debug("dir is OK: "+dir.getAbsolutePath()); //NOI18N
+ debug("dir is OK: "+dir.getAbsolutePath()); //NOI18N
String[] comm = {"chmod","755",filePath}; //NOI18N
try{
- debug("command: "+comm); //NOI18N
+ debug("command: "+comm); //NOI18N
Process process = rt.exec(comm);
process.waitFor();
if(process.exitValue() != 0 ){
- debug("exec unsuccessful"); //NOI18N
+ debug("exec unsuccessful"); //NOI18N
}
}catch(Exception ep){
throw new Error(ep.getMessage());