Show
Ignore:
Timestamp:
16.04.2009 13:37:26 (11 years ago)
Author:
oranfry
Message:

changed the release kits to use the new shared code structure

Location:
release-kits/wirk2
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • release-kits/wirk2

    • Property svn:externals
      •  

        old new  
         1core http://svn.greenstone.org/release-kits/shared/core 
        12greenstone2 http://svn.greenstone.org/release-kits/shared/greenstone2 
        23windows http://svn.greenstone.org/release-kits/shared/windows 
        3 lib http://svn.greenstone.org/release-kits/shared/lib 
        4 uninstaller http://svn.greenstone.org/release-kits/shared/uninstaller 
        5 language-strings http://svn.greenstone.org/release-kits/shared/language-strings 
        6  
  • release-kits/wirk2/src/wirk2.cpp

    r17632 r19006  
    7777         
    7878    //set the classpath 
    79     classpath = pwd + "\\installer\\classes;" + JAVA_HOME + "\\lib\\tools.jar;" + WIRK2_HOME + "\\lib\\serializer.jar;" + WIRK2_HOME + "\\lib\\xalan.jar;" + WIRK2_HOME + "\\lib\\xercesImpl.jar;" + WIRK2_HOME + "\\lib\\xml-apis.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-antlr.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-apache-bcel.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-apache-bsf.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-apache-log4j.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-apache-oro.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-apache-regexp.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-apache-resolver.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-commons-logging.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-commons-net.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-icontract.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-jai.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-javamail.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-jdepend.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-jmf.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-jsch.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-junit.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-launcher.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-netrexx.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-nodeps.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-starteam.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-stylebook.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-swing.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-trax.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-vaj.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-weblogic.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-xalan1.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-xslp.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\xercesImpl.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\xml-apis.jar;" + WIRK2_HOME + "\\packages\\ant-installer\\lib\\ai-icons-amaranth.jar;" + WIRK2_HOME + "\\packages\\ant-installer\\lib\\ai-icons-bluecurve.jar;" + WIRK2_HOME + "\\packages\\ant-installer\\lib\\ai-icons-crystalsvg.jar;" + WIRK2_HOME + "\\packages\\ant-installer\\lib\\ai-icons-eclipse.jar;" + WIRK2_HOME + "\\packages\\ant-installer\\lib\\ai-icons-krystaline.jar;" + WIRK2_HOME + "\\packages\\ant-installer\\lib\\ant-installer-ext.jar;" + WIRK2_HOME + "\\packages\\ant-installer\\lib\\ant-installer.jar;" + WIRK2_HOME + "\\packages\\ant-installer\\lib\\jgoodies-edited-1_2_2.jar;" + WIRK2_HOME + "\\packages\\ant-installer\\lib\\xercesImpl.jar;" + WIRK2_HOME + "\\packages\\ant-installer\\lib\\xml-apis.jar;" + WIRK2_HOME + "\\packages\\ant-installer\\classes"; 
    80     putenv( ("CLASSPATH=" + classpath).c_str() ); 
     79    //classpath = pwd + "\\installer\\classes;" + JAVA_HOME + "\\core\\lib\\tools.jar;" + WIRK2_HOME + "\\core\\lib\\serializer.jar;" + WIRK2_HOME + "\\core\\lib\\xalan.jar;" + WIRK2_HOME + "\\core\\lib\\xercesImpl.jar;" + WIRK2_HOME + "\\core\\lib\\xml-apis.jar;" + WIRK2_HOME + "\\core\\ant\\lib\\ant-antlr.jar;" + WIRK2_HOME + "\\core\\ant\\lib\\ant-apache-bcel.jar;" + WIRK2_HOME + "\\core\\ant\\lib\\ant-apache-bsf.jar;" + WIRK2_HOME + "\\core\\ant\\lib\\ant-apache-log4j.jar;" + WIRK2_HOME + "\\core\\ant\\lib\\ant-apache-oro.jar;" + WIRK2_HOME + "\\core\\ant\\lib\\ant-apache-regexp.jar;" + WIRK2_HOME + "\\core\\ant\\lib\\ant-apache-resolver.jar;" + WIRK2_HOME + "\\core\\ant\\lib\\ant-commons-logging.jar;" + WIRK2_HOME + "\\core\\ant\\lib\\ant-commons-net.jar;" + WIRK2_HOME + "\\core\\ant\\lib\\ant-icontract.jar;" + WIRK2_HOME + "\\core\\ant\\lib\\ant-jai.jar;" + WIRK2_HOME + "\\core\\ant\\lib\\ant.jar;" + WIRK2_HOME + "\\core\\ant\\lib\\ant-javamail.jar;" + WIRK2_HOME + "\\core\\ant\\lib\\ant-jdepend.jar;" + WIRK2_HOME + "\\core\\ant\\lib\\ant-jmf.jar;" + WIRK2_HOME + "\\core\\ant\\lib\\ant-jsch.jar;" + WIRK2_HOME + "\\core\\ant\\lib\\ant-junit.jar;" + WIRK2_HOME + "\\core\\ant\\lib\\ant-launcher.jar;" + WIRK2_HOME + "\\core\\ant\\lib\\ant-netrexx.jar;" + WIRK2_HOME + "\\core\\ant\\lib\\ant-nodeps.jar;" + WIRK2_HOME + "\\core\\ant\\lib\\ant-starteam.jar;" + WIRK2_HOME + "\\core\\ant\\lib\\ant-stylebook.jar;" + WIRK2_HOME + "\\core\\ant\\lib\\ant-swing.jar;" + WIRK2_HOME + "\\core\\ant\\lib\\ant-trax.jar;" + WIRK2_HOME + "\\core\\ant\\lib\\ant-vaj.jar;" + WIRK2_HOME + "\\core\\ant\\lib\\ant-weblogic.jar;" + WIRK2_HOME + "\\core\\ant\\lib\\ant-xalan1.jar;" + WIRK2_HOME + "\\core\\ant\\lib\\ant-xslp.jar;" + WIRK2_HOME + "\\core\\ant\\lib\\xercesImpl.jar;" + WIRK2_HOME + "\\core\\ant\\lib\\xml-apis.jar;" + WIRK2_HOME + "\\core\\ant-installer\\lib\\ai-icons-amaranth.jar;" + WIRK2_HOME + "\\core\\ant-installer\\lib\\ai-icons-bluecurve.jar;" + WIRK2_HOME + "\\core\\ant-installer\\lib\\ai-icons-crystalsvg.jar;" + WIRK2_HOME + "\\core\\ant-installer\\lib\\ai-icons-eclipse.jar;" + WIRK2_HOME + "\\core\\ant-installer\\lib\\ai-icons-krystaline.jar;" + WIRK2_HOME + "\\core\\ant-installer\\lib\\ant-installer-ext.jar;" + WIRK2_HOME + "\\core\\ant-installer\\lib\\ant-installer.jar;" + WIRK2_HOME + "\\core\\ant-installer\\lib\\jgoodies-edited-1_2_2.jar;" + WIRK2_HOME + "\\core\\ant-installer\\lib\\xercesImpl.jar;" + WIRK2_HOME + "\\core\\ant-installer\\lib\\xml-apis.jar;" + WIRK2_HOME + "\\core\\ant-installer\\classes"; 
     80    //putenv( ("CLASSPATH=" + classpath).c_str() ); 
    8181 
    8282    //check that it worked 
     
    8585     
    8686    //create the command 
    87     command = WIRK2_HOME + "\\packages\\ant\\bin\\ant.bat -f " + WIRK2_HOME + "\\ant-scripts\\build.xml -addressing -Dwirk2.home=" + WIRK2_HOME; 
     87    command = WIRK2_HOME + "\\core\\ant\\bin\\ant.bat -f " + WIRK2_HOME + "\\ant-scripts\\build.xml -addressing -Dwirk2.home=" + WIRK2_HOME; 
    8888    //pass on the arguments 
    8989    string a;