Changeset 19938

Timestamp:

2009-06-26T18:02:44+12:00 (15 years ago)

Author:

oranfry

Message:

it's all good stuff

Location:

release-kits

Files:

• lirk2/ant-scripts/create-cdrom-components.xml (modified) (1 diff)
• lirk2/installer/build.xml (modified) (1 diff)
• lirk3/ant-scripts/wrap.xml (modified) (1 diff)
• mark2/ant-scripts/create-cdrom-components.xml (modified) (1 diff)
• mark2/installer/antinstall-config.xml (modified) (1 diff)
• shared/linux/wrapper.cpp (modified) (6 diffs)

release-kits/lirk2/ant-scripts/create-cdrom-components.xml

@@ -52 +52 @@
         <!-- jre -->
         <mkdir dir="cdrom/dist/Java/Linux"/>
-        <copy file="${lirk2.home}/linux/jre_bin" todir="cdrom/dist/Java/Linux"/>
+        <exec executable="cp">
+            <arg value="${lirk2.home}/linux/jre_bin"/>
+            <arg value="cdrom/dist/Java/Linux"/>
+        </exec>
         <!--
         <exec dir="cdrom/dist/Java/Linux" executable="${lirk2.home}/linux/jre_bin"/>

release-kits/lirk2/installer/build.xml

@@ -19 +19 @@
 
     <condition property="bundled.java.exists">
-        <or>
-            <available file="../@linux-java.extracted@/bin/java"/>
-            <available file="${orig.dir}/Java/Linux/jre"/>
-        </or>
+        <available file="../@linux-java.extracted@/bin/java"/>
     </condition>
 
     <target name="Initialising" if="bundled.java.exists">
         <mkdir dir="${installDir}/packages"/>
-        <!-- start web -->
         <copy todir="${installDir}/packages/jre" failonerror="false">
             <fileset dir="../@linux-java.extracted@"/>
         </copy>
-        <!-- end web -->
-
-        <!-- start cdrom -->
-        <copy todir="${installDir}/packages/jre" failonerror="false">
-            <fileset dir="${orig.dir}/Java/Linux/jre"/>
-        </copy>
-        <!-- end cdrom -->
-
         <chmod dir="${installDir}/packages/jre/bin" includes="*" perm="775"/>       
     </target>

release-kits/lirk3/ant-scripts/wrap.xml

@@ -28 +28 @@
 
     <target name="compile-wrapper">
+        <mkdir dir="products"/>
         <echo level="info">create an object file (extension .o) for each file to bundle</echo>
         <exec executable="/usr/bin/objcopy" dir="${basedir}/wrapped-installer/build">

release-kits/mark2/ant-scripts/create-cdrom-components.xml

@@ -38 +38 @@
 
         <!-- delete the httpd manual to save space -->
-        <delete dir="cdrom/dist/Software/core/linux/apache-httpd/darwin/manual"/>
+        <delete dir="cdrom/dist/Software/core/mac/apache-httpd/darwin/manual"/>
 
         <!-- imagemagick -->

release-kits/mark2/installer/antinstall-config.xml

@@ -28 +28 @@
     <!-- start binary release -->
     <page type="input" name="intro" displayText="">
-        <comment name="welcome-message"/>
+        <comment name="welcome"/>
     </page>
     <!-- end binary release -->

release-kits/shared/linux/wrapper.cpp

@@ -12 +12 @@
 bool extract_bundled_file( const char[], int, char*, bool );
 #else
-string get_full_java( string wd );
+bool prep_java( string wd );
 #endif
 
@@ -178 +178 @@
     }
     #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 +234 @@
 #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 +251 @@
     
     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 +262 @@
     }
     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 +276 @@
   // to get to here, full_java must be set (and working)
 
-  return full_java;
+  return true;
 }