greenstone.org greenstone wiki greenstone trac planet greenstone

Changeset 16203

Show
Ignore:
Timestamp:
2008-06-26 12:47:45 (4 months ago)
Author:
oranfry
Message:

made the wrapper general, so it can be used with greenstone2 or greenstone3 release kits

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • release-kits/shared/windows/wrapper/wrapper.cpp

    r16079 r16203  
    286286        char* tmp = getenv( "TMP" ); 
    287287        char id[6]; for( int i=0; i<5; i++ ) id[i] = (char)((rand()%26) + 97); id[5] = '\0'; //id for this instance 
    288         string tempdir = ""; tempdir.append( tmp ); tempdir.append( "\\Greenstone3-" ); tempdir.append( id ); 
     288        string tempdir = ""; tempdir.append( tmp ); tempdir.append( "\\Greenstone-" ); tempdir.append( id ); 
    289289        _mkdir( tempdir.c_str() ); 
    290290        SetCurrentDirectory( tempdir.c_str() ); 
    …… 
    306306 
    307307                //did not find a good java 
    308                 string message = "Greenstone requires java @java.min.version@ or greater, but "; 
     308                string message = "This version of Greenstone requires java @java.min.version@ or greater, but "; 
    309309                 
    310310                //tell them if java is absent or just too old 
    …… 
    336336                        set_splash_progress( 100 ); //we are done searching 
    337337                        message.append( "Please install java (@java.min.version@ or newer) and try again.\n" ); 
    338                         message.append( "Or, download a Greentsone3 installer with bundled java and use that instead of this one" ); 
     338                        message.append( "Or, download an installer with bundled java and use that instead of this one" ); 
    339339                        string title = "Installation Failed: Couldn't find java"; 
    340340                        MessageBox(NULL, message.c_str(), title.c_str(), MB_OK); 
    …… 
    347347                                 
    348348                //extract the jar 
    349                 string jarLocation = ""; jarLocation.append( tempdir ); jarLocation.append( "\\greenstone3.jar" ); 
     349                string jarLocation = ""; jarLocation.append( tempdir ); jarLocation.append( "\\greenstone.jar" ); 
    350350                //set_splash_status( hInstance, statusWnd, "STATUS_JAR", 0 ); 
    351351                 
    …… 
    358358                string cmd = "\""; 
    359359                cmd.append( foundJvm.getWinExecutable() ); 
    360                 cmd.append( "\" -jar greenstone3.jar" ); 
     360                cmd.append( "\" -jar greenstone.jar" ); 
    361361                 
    362362                //hide splash screen 
    …… 
    375375         
    376376        //clean up the temp directory 
    377         _unlink("greenstone3.jar"); 
     377        _unlink("greenstone.jar"); 
    378378        _unlink("ant.install.log"); 
    379379        _unlink("@java.installer@"); 

  • release-kits/shared/windows/wrapper/wrapper.rc

    r15898 r16203  
    1616STEP_XJAR BITMAP "step-xjar.bmp" 
    1717STEP_LAUNCHING BITMAP "step-launching.bmp" 
    18 MAINICON ICON "gs3.ico" 
     18MAINICON ICON "icon.ico" 
    1919 
    2020//resources are automatically appended here