Index: /release-kits/lirk2/ant-scripts/create-cdrom-components.xml
===================================================================
--- /release-kits/lirk2/ant-scripts/create-cdrom-components.xml (revision 19937)
+++ /release-kits/lirk2/ant-scripts/create-cdrom-components.xml (revision 19938)
@@ -52,5 +52,8 @@
-
+
+
+
+
-
-
-
-
-
-
-
-
Index: /release-kits/lirk3/ant-scripts/wrap.xml
===================================================================
--- /release-kits/lirk3/ant-scripts/wrap.xml (revision 19937)
+++ /release-kits/lirk3/ant-scripts/wrap.xml (revision 19938)
@@ -28,4 +28,5 @@
+
create an object file (extension .o) for each file to bundle
Index: /release-kits/mark2/ant-scripts/create-cdrom-components.xml
===================================================================
--- /release-kits/mark2/ant-scripts/create-cdrom-components.xml (revision 19937)
+++ /release-kits/mark2/ant-scripts/create-cdrom-components.xml (revision 19938)
@@ -38,5 +38,5 @@
-
+
Index: /release-kits/mark2/installer/antinstall-config.xml
===================================================================
--- /release-kits/mark2/installer/antinstall-config.xml (revision 19937)
+++ /release-kits/mark2/installer/antinstall-config.xml (revision 19938)
@@ -28,5 +28,5 @@
-
+
Index: /release-kits/shared/linux/wrapper.cpp
===================================================================
--- /release-kits/shared/linux/wrapper.cpp (revision 19937)
+++ /release-kits/shared/linux/wrapper.cpp (revision 19938)
@@ -12,5 +12,5 @@
bool extract_bundled_file( const char[], int, char*, bool );
#else
-string get_full_java( string wd );
+bool prep_java( string wd );
#endif
@@ -178,7 +178,7 @@
}
#else
- string java_executable = get_full_java( wd );
- if ( java_executable != "" ) {
- string cmd = java_executable + " -Dorig.dir=\"" + wd + "\" -jar " + wd + "/Java/Jars/linux.jar" + (text_mode?" text":"");
+ bool java_ready = prep_java( wd );
+ if ( java_ready ) {
+ string cmd = "./jre/bin/java -Dorig.dir=\"" + wd + "\" -jar " + wd + "/Java/Jars/linux.jar" + (text_mode?" text":"");
system( cmd.c_str() );
}
@@ -234,16 +234,16 @@
#else
-string get_full_java( string wd ) {
- string full_java = "";
-
- string cdrom_java = "/Java/Linux/jre/bin/java";
-
- full_java = wd + cdrom_java;
-
- string j1cmd = "\""+full_java+"\" -version >/dev/null 2>&1";
+bool prep_java( string wd ) {
+
+
+ string jTestCmd = "./jre/bin/java -version >/dev/null 2>&1";
+
+ //try to extract straight off cd
+ string j1cmd = wd + "/Java/Linux/jre_bin && tar -xf jre.tar && " + jTestCmd;
int j1status = system(j1cmd.c_str());
+ system("/bin/rm -f jre.tar");
if (WEXITSTATUS(j1status)!=0) {
- cerr << "Unable to run Java executable from CD-ROM." << endl;
+ cerr << "Unable to extract java straight off CD-ROM." << endl;
cerr << "This is probably because your CD-ROM was mounted with 'noexec'." << endl;
cerr << "It can be changed by a system administrator" << endl << endl;
@@ -251,7 +251,7 @@
string cdtar_home = wd + "/Java/Linux/";
- string tcmd = "(cd \"" + cdtar_home + "\" ; tar cf - jre )";
+ string tcmd = "(cd \"" + cdtar_home + "\" ; tar cf - jre_bin )";
tcmd += "| tar xvf - ";
- tcmd += "| awk 'BEGIN{C=0}{C++; printf(\".\"); if (C%70==0) printf(\"\\n\");}END{printf(\"\\n\")}'";
+ //tcmd += "| awk 'BEGIN{C=0}{C++; printf(\".\"); if (C%70==0) printf(\"\\n\");}END{printf(\"\\n\")}'";
int tstatus = system(tcmd.c_str());
@@ -262,14 +262,13 @@
}
else {
- full_java = "./jre/bin/java";
- string j2cmd = full_java +" -version >/dev/null 2>&1";
-
+
+ string j2cmd = "./jre_bin && tar -xf jre.tar && " + jTestCmd;
int j2status = system(j2cmd.c_str());
-
- if (WEXITSTATUS(j2status)!=0) {
- cerr << "Unable to run copied Java" << endl;
- system("/bin/rm -rf jre");
- return "";
- }
+ system("/bin/rm -f jre.tar jre_bin");
+
+ if (WEXITSTATUS(j2status)!=0) {
+ cerr << "Unable to run copied Java" << endl;
+ return false;
+ }
}
}
@@ -277,5 +276,5 @@
// to get to here, full_java must be set (and working)
- return full_java;
+ return true;
}