Changeset 19510 for release-kits/shared

Timestamp:

2009-05-18T15:36:40+12:00 (15 years ago)

Author:

oranfry

Message:

main release kits now create their own cdrom installers and wrap them

Location:

release-kits/shared

Files:

• core/ant-scripts/init.xml (modified) (2 diffs)
• linux/wrapper.cpp (modified) (2 diffs)

release-kits/shared/core/ant-scripts/init.xml

@@ -154 +154 @@
         <copy file="${basedir}/installer/antinstall-config.xml" tofile="${basedir}/installer/antinstall-config-binary.xml"/>
         <dcff file="${basedir}/installer/antinstall-config-binary.xml" startTag=".*&lt;!-- start source release --&gt;.*" endTag=".*&lt;!-- end source release --&gt;.*" />
+
+        <copy file="${basedir}/installer/build.xml" tofile="${basedir}/installer/build-binary.xml"/>
+        <dcff file="${basedir}/installer/build-binary.xml" startTag=".*&lt;!-- start cdrom --&gt;.*" endTag=".*&lt;!-- end cdrom --&gt;.*" />
+
         <installer file="${basedir}/installer/Greenstone-${version}-${os.suffix}.jar"
             compress="true"
             extractType="NonExtractor"
             installConfig="${basedir}/installer/antinstall-config-binary.xml"
-            buildFile="${basedir}/installer/build.xml"
+            buildFile="${basedir}/installer/build-binary.xml"
             antInstallLib="${rk.home}/core/ant-installer/lib"
             antLib="${rk.home}/core/ant/lib"
@@ -167 +171 @@
             <zipfileset dir="${basedir}/components" includes="*.lzma" excludes="source-release.lzma" />
 
+        </installer>
+        
+    </target>
+
+    <target name="compile-cdrom-installer">
+
+        <copy file="${basedir}/installer/antinstall-config.xml" tofile="${basedir}/installer/antinstall-config-cdrom.xml"/>
+        <dcff file="${basedir}/installer/antinstall-config-cdrom.xml" startTag=".*&lt;!-- start source release --&gt;.*" endTag=".*&lt;!-- end source release --&gt;.*" />
+
+        <copy file="${basedir}/installer/build.xml" tofile="${basedir}/installer/build-cdrom.xml"/>
+        <dcff file="${basedir}/installer/build-cdrom.xml" startTag=".*&lt;!-- start web --&gt;.*" endTag=".*&lt;!-- end web --&gt;.*" />
+
+        <installer file="${basedir}/installer/cdrom.jar"
+            compress="true"
+            extractType="NonExtractor"
+            installConfig="${basedir}/installer/antinstall-config-cdrom.xml"
+            buildFile="${basedir}/installer/build-cdrom.xml"
+            antInstallLib="${rk.home}/core/ant-installer/lib"
+            antLib="${rk.home}/core/ant/lib"
+            validateConfig="true"
+            icons="bluecurve">
+            <zipfileset dir="${basedir}/installer/classes" includes="**/*" />
         </installer>
         

release-kits/shared/linux/wrapper.cpp

@@ -12 +12 @@
 
 int main(int argc, char** argv) {
+
+    char owd[1024];
+    getcwd(owd, sizeof(owd));
 
     string scratch = (getenv("TMPDIR") == NULL) ? "/tmp" : getenv("TMPDIR");
@@ -104 +107 @@
         cout << "Launching Installer ..." << endl;
         int launch_exit_code = 0;
-        launch_exit_code = system( (foundJvm.getExecutable() + " -Xmx85M -jar @[email protected]" + (textMode?" text":"") ).c_str() );
+        launch_exit_code = system( (foundJvm.getExecutable() + " -Xmx85M \"-Dorig.dir=" + owd + "\" -jar @[email protected]" + (textMode?" text":"") ).c_str() );
 
         //report how it went