Changeset 16631

Show
Ignore:
Timestamp:
01.08.2008 15:41:30 (11 years ago)
Author:
oranfry
Message:

changes afer splitting gsdl into common, build and runtime

Location:
release-kits/wirk3
Files:
3 modified

Legend:

Unmodified
Added
Removed
  • release-kits/wirk3/ant-scripts/operations-on-gs3home.xml

    r16523 r16631  
    3535        <antcall target="update-winbin"/> 
    3636        <antcall target="get-windows-binaries"/> 
    37         <antcall target="rename-gs2build-files-windows"/> 
    3837        <antcall target="compile-gs2build"/> 
    3938        <antcall target="compile-packages"/> 
     
    4948        <delete file="${gli.home}/gems.bat"/> 
    5049        <delete file="${gli.home}/gems.sh"/> 
    51         <antcall target="rename-gs2build-files-dist"/>     
    52         <delete dir="${gs2build-extra.home}"/> 
    53  
     50         
    5451        <!-- <antcall target="unzip-windows-packages"/> do we need this? --> 
    5552        <antcall target="prepare-tomcat"/> 
     
    8481        <!-- compile the java stuff --> 
    8582        <antcall target="compile-web"/> 
    86          
    87         <!-- we can get this from the main greenstone3 directory 
    88         <antcall target="compile-packages-and-indexers"/>--> 
    8983        <antcall target="compile-packages-and-indexers-javaonly"/> 
    90          
     84        <antcall target="distclean-packages"/> 
    9185        <antcall target="compile-core"/> 
    9286        <antcall target="compile-gli"/> 
     
    10296        <move file="${gs2build.home}/win32.mak" tofile="${gs2build.home}/source/win32.mak"/> 
    10397        <!--<move file="${gs2build.home}/setup.bat" tofile="${gs2build.home}/source/setup.bat"/>--> 
    104         <move file="${gs2build.home}/WIN32cfg.h" tofile="${gs2build.home}/source/WIN32cfg.h"/> 
     98        <!--<move file="${gs2build.home}/win32cfg.h" tofile="${gs2build.home}/source/win32cfg.h"/>--> 
    10599 
    106100        <!-- clean up --> 
     
    147141        <xslt in="${basedir}/build.xml" out="${basedir}/modified-build.xml" style="${wirk3.home}/greenstone3/xsl/convert-build-xml.xsl"/> 
    148142    </target> 
    149    
    150     <target name="rename-gs2build-files-dist" depends="init"> 
    151         <mkdir dir="${gs2build.home}/gs2build-extra/lib"/> 
    152         <copy file="${gs2build.home}/gs2build-extra/lib.win32.mak" tofile="${gs2build.home}/lib/win32.mak"/> 
    153         <copy file="${gs2build.home}/gs2build-extra/win32.mak" tofile="${gs2build.home}/win32.mak"/> 
    154         <copy file="${gs2build.home}/gs2build-extra/setup.bat" tofile="${gs2build.home}/setup.bat"/> 
    155     </target>    
    156143 
    157144    <target name="compile-packages-and-indexers-javaonly" depends="init"> 
    158145        <echo>Getting Indexer Jars</echo> 
    159146        <!-- install the jar files --> 
    160         <copy file="${basedir}/../../greenstone3/gs2build/indexers/mg/mg.jar" todir="${lib.jni}"/> 
    161         <copy file="${basedir}/../../greenstone3/gs2build/indexers/mgpp/mgpp.jar" todir="${lib.jni}"/> 
    162         <copy file="${basedir}/../../greenstone3/gs2build/indexers/lucene-gs/LuceneWrapper.jar" todir="${web.lib}"/> 
     147        <copy file="${basedir}/../../greenstone3/gs2build/common-src/indexers/mg/mg.jar" todir="${lib.jni}"/> 
     148        <copy file="${basedir}/../../greenstone3/gs2build/common-src/indexers/mgpp/mgpp.jar" todir="${lib.jni}"/> 
     149        <copy file="${basedir}/../../greenstone3/gs2build/common-src/indexers/lucene-gs/LuceneWrapper.jar" todir="${web.lib}"/> 
    163150        <!-- javagdbm --> 
    164151        <!-- install the jar file --> 
    165         <copy file="${basedir}/../../greenstone3/src/packages/javagdbm/javagdbm.jar" todir="${lib.jni}"/> 
     152        <copy file="${basedir}/../../greenstone3/src/packages/javagdbm/javagdbm.jar" todir="${lib.jni}" /> 
    166153    </target> 
    167154 
  • release-kits/wirk3/installer/build.xml

    r16284 r16631  
    2323    </path> 
    2424    <property name="installDir.local" refid="installDir.path"/> 
     25 
     26    <!-- load windows properties --> 
     27    <winprops/> 
    2528     
    2629     
    2730    <target name="install-core-components"> 
    28         <!-- load windows properties --> 
    29         <winprops/> 
    3031 
    3132        <!-- create the installation directory --> 
     
    154155    <target name="install-start-menu-shortcuts"> 
    155156 
    156         <mkdir dir="${win32.personal.programs_menu}\Greenstone-@version@\documentation"/> 
    157          
     157        <mkdir dir="${win32.personal.programs_menu}\Greenstone-@version@\Documentation"/> 
    158158         
    159159        <shortcut 
     
    179179 
    180180        <shortcut 
    181             file="${win32.personal.programs_menu}\Greenstone-@version@\documentation\README.lnk" 
     181            file="${win32.personal.programs_menu}\Greenstone-@version@\Documentation\README.lnk" 
    182182            execute="${installDir}\README.txt" /> 
    183183 
    184184        <shortcut 
    185             file="${win32.personal.programs_menu}\Greenstone-@version@\documentation\Greenstone3 Users' Guide.lnk" 
     185            file="${win32.personal.programs_menu}\Greenstone-@version@\Documentation\Greenstone3 Users' Guide.lnk" 
    186186            execute="${installDir}\documentation\manual\manual.pdf" /> 
    187187 
    188188        <shortcut 
    189             file="${win32.personal.programs_menu}\Greenstone-@version@\documentation\Greenstone2 Users' Guide.lnk" 
     189            file="${win32.personal.programs_menu}\Greenstone-@version@\Documentation\Greenstone2 Users' Guide.lnk" 
    190190            execute="${installDir}\documentation\manual\gs2_user_en.pdf" /> 
    191191 
  • release-kits/wirk3/src/wirk3.cpp

    r16198 r16631  
    5959 
    6060        } else if ( a.compare("-descend") == 0 ) { 
    61             command += " -Dresume.mode=descend"; 
    62              
     61            command = command + " -Dresume.descend=" + argv[++i]; 
    6362        } else if ( a.compare("-from") == 0 ) { 
    6463            command = command + " -Dresume.from=" + argv[++i]; 
    65             //from=`echo $2 | sed 's/compile/1/g' | sed 's/create-distributions/2/g' | sed 's/create-installer/3/g' | sed 's/wrap/4/g'` 
    66             //toexec=$toexec$from 
    6764        } else if ( a.compare("-to") == 0 ) { 
    6865            command = command + " -Dresume.to=" + argv[++i]; 
    69             //to=`echo $2 | sed 's/compile/1/g' | sed 's/create-distributions/2/g' | sed 's/create-installer/3/g' | sed 's/wrap/4/g'` 
    70             //toexec=$toexec$to 
    7166        } else { 
    7267            command = command + " " + a;