Index: /other-projects/expeditee-release-kits/kits/rke/ant-scripts/wrap.xml
===================================================================
--- /other-projects/expeditee-release-kits/kits/rke/ant-scripts/wrap.xml (revision 28725)
+++ /other-projects/expeditee-release-kits/kits/rke/ant-scripts/wrap.xml (revision 28726)
@@ -66,6 +66,6 @@
-
-
+
+
@@ -73,10 +73,10 @@
-
+
-
+
@@ -136,22 +136,24 @@
-
+
+
-
-
-
-
-
+
-
+
+
+
-
+
+
@@ -178,6 +180,5 @@
-
-
+
Index: /other-projects/expeditee-release-kits/shared/mac/wrapper.cpp
===================================================================
--- /other-projects/expeditee-release-kits/shared/mac/wrapper.cpp (revision 28726)
+++ /other-projects/expeditee-release-kits/shared/mac/wrapper.cpp (revision 28726)
@@ -0,0 +1,299 @@
+#include
+#include
+#include
+#include
+#include
+#include
+using namespace std;
+
+#ifndef CDROM
+#include "wrapper.h"
+#include "libsearch4j.h"
+bool extract_bundled_file( const char[], int, char*, bool );
+#else
+bool prep_java( string wd );
+#endif
+
+void usage( char* progname, int exitvalue = -1 ) {
+ cerr
+ << "Usage: " << progname << " [OPTIONS]" << endl
+ << "OPTIONS: " << endl
+ << " -h, -help Display this usage message" << endl
+ << " -textonly Do a non-graphical command line installation" << endl
+ << " -extract Extract the jar file, this can " << endl;
+ #ifdef CDROM
+ cerr << " -wd PATH Look for the CD-ROM at PATH" << endl;
+ #endif
+
+ exit( exitvalue );
+}
+
+int main(int argc, char** argv) {
+
+ char wdc[1024];
+ getcwd(wdc, sizeof(wdc));
+ string wd = "";
+ wd.append( wdc );
+
+ string scratch = (getenv("TMPDIR") == NULL) ? "/tmp" : getenv("TMPDIR");
+ string tempdir = scratch + "/@projectname@-installer.tmp"; //temporary directory where we will store extracted files
+ bool succeeded = false;
+ bool text_mode = false;
+
+ //parse arguments
+ string a;
+ for ( int i=1; i /dev/null" ) == 0);
+ // succeeded = succeeded && ( system( "tar -xf jre.tar" ) == 0 );
+ if ( !succeeded ) {
+ cout << "Failed to extract the bundled java archive to the temp directory" << endl;
+ // cout << "You need the tar program on your PATH" << endl;
+ cout << "Exiting" << endl;
+ return 1;
+ }
+ #endif
+
+ //check if an appropriate java is found
+ Jvm minimum; minimum.setVersionFromString( "@java.min.version@" );
+ string phint = "./@java.extracted@";
+ string hint = "";
+ Jvm foundJvm;
+ bool jvmFound = find( foundJvm, true, minimum, false, false, phint, hint, false );
+
+ //if the jvm was not found, report not found
+ if ( !jvmFound ) {
+
+ //did not find a good java
+ cout << "@projectname@ requires java @java.min.version@ or greater." << endl;
+
+ //tell them if java is absent or just too old
+ Jvm tmpJvm;
+ if ( find( tmpJvm, false, minimum, false, false, phint, hint, false ) ) {
+ cout << "You have java, but it is too old." << endl;
+ } else {
+ cout << "Could not find java on your system." << endl;
+ }
+
+ cout << "Install java (@java.min.version@ or greater) and set JAVA_HOME or JRE_HOME, and try again" << endl;
+ #ifndef java_is_bundled
+ cout << "Or, download a greentsone3 installer with bundled java and use that instead of this one" << endl;
+ #endif
+
+ //if we have found it, launch the installer
+ } else {
+
+ cout << "Launching Installer ..." << endl;
+ int launch_exit_code = 0;
+ launch_exit_code = system( (foundJvm.getExecutable() + " -Xmx200M -jar @projectname@.jar" + (text_mode?" text":"") ).c_str() );
+
+ //report how it went
+ if ( launch_exit_code == 0 ) {
+ cout << "Setup complete" << endl;
+ } else {
+ cout << "The installer exited with an error" << endl;
+ cout << "@projectname@ may not be correctly installed" << endl;
+ }
+
+ }
+ #else
+ 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() );
+ }
+ #endif
+
+ //change to the scratch dir for the following operation
+ chdir(scratch.c_str());
+
+ //delete the temp files
+ cout << "Deleting the temp directory" << endl;
+ system( ("rm -rf " + tempdir).c_str() );
+
+ return 0;
+
+}
+#ifndef CDROM
+bool extract_bundled_file( const char data[], int size, char* filename, bool make_executable) {
+
+ if ( size == 0 ) return false;
+
+ //delete the file if it exists
+ remove( filename );
+
+ //open the file
+ fstream binary_file( filename, ios::out|ios::binary );
+ if ( !binary_file.good() ) {
+ binary_file.close();
+ return false;
+ }
+
+ //write the file
+ binary_file.write( data, size );
+ if ( !binary_file.good() ) {
+ binary_file.close();
+ return false;
+ }
+
+ //close the file
+ binary_file.close();
+ if ( !binary_file.good() ) {
+ binary_file.close();
+ return false;
+ }
+
+ if ( make_executable ) {
+ string command = "chmod a+x " + string(filename);
+ system( command.c_str() );
+ }
+
+ return true;
+
+}
+#else
+
+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 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;
+ cerr << "Copying Java to local disk so it can be run" << endl;
+
+ string cdtar_home = wd + "/Java/Linux/";
+ 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\")}'";
+
+ int tstatus = system(tcmd.c_str());
+
+ if (WEXITSTATUS(tstatus)!=0) {
+ cerr << "Failed to copy Java to disk" << endl;
+ cerr << "Please make sure you have write permissions in the directory where you run the installer" << endl;
+ }
+ else {
+
+ string j2cmd = "./jre_bin && tar -xf jre.tar && " + jTestCmd;
+ int j2status = system(j2cmd.c_str());
+ system("/bin/rm -f jre.tar jre_bin");
+
+ if (WEXITSTATUS(j2status)!=0) {
+ cerr << "Unable to run copied Java" << endl;
+ return false;
+ }
+ }
+ }
+
+ // to get to here, full_java must be set (and working)
+
+ return true;
+}
+
+#endif