Changeset 16087


Ignore:
Timestamp:
2008-06-20T16:01:32+12:00 (16 years ago)
Author:
oranfry
Message:

did the bulk of the work on the windows release kit for greenstone2

Location:
release-kits/wirk2
Files:
6 added
9 edited
1 moved

Legend:

Unmodified
Added
Removed

  • release-kits/wirk2/ant-scripts/build.xml

    r15095 r16087  
    33<!--
    44        ..........................................................
    5         September 2007
    6         Greenstone3 'release maker' script
     5        June 2008
     6        Wirk2 (Windows Release Kit for Greenstone2)
    77        Oran Fry
    88        ..........................................................
    99-->
    1010
    11 <project name="wirk3-build" default="wirk3">
     11<project name="wirk2-build" default="wirk2">
    1212
    1313    <import file="init.xml"/>
    14    
    1514    <import file="compile.xml"/>
    1615    <import file="create-distribution.xml"/>
    1716    <import file="create-installer.xml"/>
    18     <import file="wrap.xml"/>
     17    <!--<import file="wrap.xml"/>-->
    1918
    20     <target name="wirk3" depends="init">
    21         <echo>Local Basedir: ${basedir.local}</echo>
    22        
     19    <target name="wirk2" depends="init">
    2320        <addressedcall target="compile"/>
    2421        <addressedcall target="create-distribution"/>
    2522        <addressedcall target="create-installer"/>
    26         <addressedcall target="wrap"/>
     23        <!--<addressedcall target="wrap"/>-->
    2724    </target>
    2825

  • release-kits/wirk2/ant-scripts/compile.xml

    r15053 r16087  
    11<?xml version="1.0" encoding="utf-8" ?>
    2 
    3 <!--
    4         ..........................................................
    5         September 2007
    6         Greenstone3 'release maker' script
    7         Oran Fry
    8         ..........................................................
    9 -->
    10 
    11 <project name="wirk3-compile" default="compile">
     2<project name="wirk2-compile" default="compile">
    123
    134
    145    <target name="compile">
    156
    16         <addressedcall target="checkout-greenstone3" />
    17         <addressedcall target="set-version-number-property" />
    18         <addressedcall target="dist-prepare-windows" />
    19         <addressedcall target="dist-build-windows" />
    20         <addressedcall target="prepare-documentation" />
    21 
     7        <addressedcall target="checkout-gsdl-indexers-gli" />
     8        <addressedcall target="set-version-numbers" />
     9        <addressedcall target="unzip-packages" />
     10        <addressedcall target="get-winbin" />
     11        <addressedcall target="insert-perl" />
     12        <addressedcall target="compile-c-code" />
     13        <addressedcall target="build-demo-collection" />
     14       
    2215    </target>
    2316
    24 
    25     <!--
    26 
    27         second level targets
    28 
    29     -->
    30 
    31     <target name="checkout-greenstone3">
     17    <target name="checkout-gsdl-indexers-gli">
    3218        <if><bool><istrue value="${execute}"/></bool>
    3319            <svn>
    34                 <checkout url="${svn.root}/greenstone3/${branch.path}" destPath="greenstone3" revision="${branch.revision}"/>
     20                <checkout url="${svn.root}/gsdl/${branch.path}" destPath="${basedir}/gsdl"/>
     21                <checkout url="${svn.root}/indexers/${branch.path}" destPath="${basedir}/gsdl/indexers"/>
     22                <checkout url="${svn.root}/gli/${branch.path}" destPath="${basedir}/gsdl/gli"/>
    3523            </svn>
    3624        </if>
    3725    </target>
    3826
    39     <target name="set-version-number-property">
     27    <target name="set-version-numbers">
    4028        <if><bool><istrue value="${execute}"/></bool>
    41             <rsr file="greenstone3/resources/java/global.properties.in" pattern="(.*)@gsdl3version@(.*)" replacement="$1${version}$2" />
     29            <rsr file="${basedir}/gsdl/src/lib/gsdlconf.h" pattern="(#define GSDL_VERSION ).*" replacement="$1&quot;${version}&quot;" />
     30            <rsr file="${basedir}/gsdl/Install.sh" pattern="(echo &quot;Version: ).*(&quot; .*)" replacement="$1${version}$2" />
     31            <rsr file="${basedir}/gsdl/etc/VERSION" pattern="(gsdl version: ).*" replacement="$1${version}" />
    4232        </if>
    4333    </target>
    4434
    45     <target name="dist-prepare-windows">
     35    <target name="unzip-packages">
    4636        <if><bool><istrue value="${execute}"/></bool>
    47             <ant dir="greenstone3" antfile="${wirk3.home}/ant-scripts/operations-on-gs3home.xml" target="prepare-windows" inheritAll="false">
    48                 <property name="app.version" value="${version}"/>
    49                 <property name="branch.path" value="${branch.path}"/>
    50                 <property name="branch.revision" value="${branch.revision}"/>
    51             </ant>
    52 
     37            <unzip src="${basedir}/gsdl/packages/windows/crypt/crypt.zip" dest="${basedir}/gsdl/packages/windows/crypt"/>
     38            <unzip src="${basedir}/gsdl/packages/windows/expat/expat.zip" dest="${basedir}/gsdl/packages/windows/expat"/>
     39            <unzip src="${basedir}/gsdl/packages/windows/gdbm/gdbm.zip" dest="${basedir}/gsdl/packages/windows/gdbm"/>
     40            <unzip src="${basedir}/gsdl/packages/windows/stlport/stlport.zip" dest="${basedir}/gsdl/packages/windows/stlport"/>
    5341        </if>   
    5442    </target>
    55     <target name="tweak-configure-scripts">
    56         <addressedcall target="mgpp-add-static" />
    57         <addressedcall target="mg-add-static" />
    58         <addressedcall target="gs2buildextra-add-static" />
    59     </target>
    6043
    61     <target name="dist-build-windows">
     44    <target name="get-winbin">
    6245        <if><bool><istrue value="${execute}"/></bool>
    63             <ant dir="greenstone3" antfile="${wirk3.home}/ant-scripts/operations-on-gs3home.xml" target="build-windows" inheritAll="false">
    64                 <property name="app.version" value="${version}"/>
    65                 <property name="branch.path" value="${branch.path}"/>
    66                 <property name="branch.revision" value="${branch.revision}"/>
    67             </ant>
    68         </if>
    69     </target>
    70    
    71     <target name="prepare-documentation">
    72         <if><bool><istrue value="${execute}"/></bool>
    73 
    74             <mkdir dir="greenstone3/gsdl-manuals"/>
    75             <svn>
    76                 <checkout url="${svn.root}/documentation/${branch.path}/manuals" destPath="greenstone3/gsdl-manuals/manuals" revision="${branch.revision}"/>
    77                 <checkout url="${svn.root}/documentation/${branch.path}/shared" destPath="greenstone3/gsdl-manuals/shared" revision="${branch.revision}"/>
    78             </svn>
    79             <javac srcdir="greenstone3/gsdl-manuals/shared" destdir="greenstone3/gsdl-manuals/shared" debug="on"><include name="*.java"/></javac>
    80             <unzip src="greenstone3/gsdl-manuals/shared/fop.zip" dest="greenstone3/gsdl-manuals/shared"/>
    81 
    82             <echo>Define Classpath</echo>
    83             <path id="documentation.compile.classpath">
    84                 <fileset dir="greenstone3/gsdl-manuals">
    85                     <include name="**/*.jar"/>
    86                 </fileset>
    87                 <pathelement path="greenstone3/gsdl-manuals/shared"/>
    88                 <pathelement path="greenstone3/gsdl-manuals/manuals"/>
    89                 <pathelement path="greenstone3/gli/classes"/>
    90             </path>
    91                        
    92             <echo>Apply XSLT</echo>
    93             <java classname="org.apache.xalan.xslt.Process" classpathref="documentation.compile.classpath" fork="true">
    94                 <jvmarg value="-DGSDLHOME=${basedir}/greenstone" />
    95                 <arg value="-IN"/><arg file="greenstone3/gli/help/en/help.xml" />
    96                 <arg value="-XSL"/><arg file="greenstone3/gsdl-manuals/manuals/processing/gen-gli-help-to-manual-chapter.xsl" />
    97                 <arg value="-OUT"/><arg file="greenstone3/gsdl-manuals/manuals/xml-source/en/help-en.xml" />
    98                
    99             </java>
    100                        
    101             <echo>Run generate-pdf.bat</echo>
    102             <exec dir="${basedir}\greenstone3/gsdl-manuals/manuals" executable="cmd">
    103                 <arg value="/C" />
    104                 <arg file="${basedir}/greenstone3/gsdl-manuals/manuals/generate-pdf.bat" />
    105                 <arg value="u" />
    106                 <arg value="en" />
    107             </exec>
     46           
     47            <if>
     48                <bool><not><available file="${basedir}/gsdl/bin/windows"/></not></bool>
     49                <svn><export srcUrl="${svn.root}/other-projects/trunk/winbin/bin" destPath="${basedir}/gsdl/bin/windows" revision="${branch.revision}"/></svn>
     50            </if>
    10851           
    10952        </if>
    11053    </target>
    11154
     55    <target name="insert-perl">
     56        <if><bool><istrue value="${execute}"/></bool>
     57            <mkdir dir="${basedir}/gsdl/bin/windows"/>
     58            <delete dir="${basedir}/gsdl/bin/windows/perl"/>
     59            <unzip src="${wirk2.home}/resources/perl.zip" dest="${basedir}/gsdl/bin/windows"/>
     60        </if>
     61    </target>
    11262   
     63    <target name="compile-c-code">
     64        <if><bool><istrue value="${execute}"/></bool>
     65            <copy file="${wirk2.home}/compile/compile.bat" todir="${basedir}/gsdl" overwrite="true"/>
     66            <exec dir="${basedir}/gsdl" executable="${basedir}/gsdl/compile.bat"/>
     67           
     68            <move file="${basedir}/gsdl/server.exe" todir="${basedir}/gsdl/bin/windows"/>
     69            <move todir="${basedir}/gsdl/bin/windows">
     70                <fileset dir="${basedir}/gsdl/cgi-bin" includes="library.exe,oaiserver.exe"/>
     71            </move>
    11372
     73        </if>
     74    </target>
     75   
     76    <target name="build-demo-collection">
     77        <if><bool><istrue value="${execute}"/></bool>
     78            <!-- the envs on these execs simulate the environment when you run setup.bat -->
     79            <exec dir="${basedir}/gsdl" executable="${basedir}/gsdl/bin/windows/perl/bin/perl.exe">
     80                <arg line="bin\script\import.pl --removeold demo"/>
     81                <env key="GSDLHOME" value="${basedir}/gsdl"/>
     82                <env key="GSDLCOLLECTDIR" value="${basedir}/gsdl/collect"/>
     83                <env key="GSDLOS" value="windows"/>
     84                <env key="PATH" value="${basedir}\gsdl\bin\windows\perl\bin;${basedir}\gsdl\bin\windows;${basedir}\gsdl\bin\script"/>
     85            </exec>
     86            <exec dir="${basedir}/gsdl" executable="${basedir}/gsdl/bin/windows/perl/bin/perl.exe">
     87                <arg line="bin\script\buildcol.pl --removeold demo"/>
     88                <env key="GSDLHOME" value="${basedir}/gsdl"/>
     89                <env key="GSDLCOLLECTDIR" value="${basedir}/gsdl/collect"/>
     90                <env key="GSDLOS" value="windows"/>
     91                <env key="PATH" value="${basedir}\gsdl\bin\windows\perl\bin;${basedir}\gsdl\bin\windows;${basedir}\gsdl\bin\script"/>
     92            </exec>
     93           
     94            <delete dir="${basedir}/gsdl/collect/demo/index"/>
     95            <move file="${basedir}/gsdl/collect/demo/building" tofile="${basedir}/gsdl/collect/demo/index"/>
     96        </if>
     97    </target>
     98   
    11499</project>

  • release-kits/wirk2/ant-scripts/create-distribution.xml

    r15812 r16087  
    11<?xml version="1.0" encoding="utf-8" ?>
    2 
    3 <!--
    4         ..........................................................
    5         September 2007
    6         Greenstone3 'release maker' script
    7         Oran Fry
    8         ..........................................................
    9 -->
    10 
    112<project name="wirk3-create-distribution" default="create-distribution">
    12 
    133
    144    <target name="create-distribution">
    155        <!-- create distribution -->
    16         <addressedcall target="export-greenstone3" />
    17         <addressedcall target="dist-set-version-number-property" />
    18         <addressedcall target="create-distributions-1" />
    19         <addressedcall target="create-distributions-2" />
    20         <addressedcall target="create-distributions-3" />
    21         <addressedcall target="copy-over-build-xml" />
    22         <addressedcall target="insert-user-manual"/>
    23         <addressedcall target="insert-compiled-binaries"/>
    24         <addressedcall target="rename-build-xml-for-transit"/>
     6        <addressedcall target="export-gsdl-gli-indexers" />
     7        <addressedcall target="dist-set-version" />
     8        <addressedcall target="drop-in-binaries" />
     9        <addressedcall target="drop-in-demo-collection" />
     10        <addressedcall target="compile-gli" />
     11        <!--<addressedcall target="create-gli-client-zip" />-->
     12        <addressedcall target="tweak-files" />
    2513    </target>
    2614
    27 
    28 
    29     <!--
    30 
    31         second level targets
    32 
    33     -->
    34    
    35     <target name="export-greenstone3">
     15    <target name="export-gsdl-gli-indexers">
    3616        <if><bool><istrue value="${execute}"/></bool>
    37             <mkdir dir="distribution"/>
    38             <delete dir="distribution/greenstone3"/>
     17           
     18            <mkdir dir="distributions"/>
     19            <delete dir="distributions/web"/>
    3920            <svn>
    40                 <export srcurl="${svn.root}/greenstone3/${branch.path}" destPath="distribution/greenstone3" revision="${branch.revision}"/>
     21                <export srcurl="${svn.root}/gsdl/${branch.path}"        destPath="distributions/web"/>
     22                <export srcurl="${svn.root}/gli/${branch.path}"         destPath="distributions/web/gli"/>
     23                <export srcurl="${svn.root}/indexers/${branch.path}"    destPath="distributions/web/indexers"/>
    4124            </svn>
     25           
    4226        </if>
    4327    </target>
    4428
    45     <target name="dist-set-version-number-property">
     29    <target name="dist-set-version">
    4630        <if><bool><istrue value="${execute}"/></bool>
    47             <rsr file="distribution/greenstone3/resources/java/global.properties.in" pattern="(.*)@gsdl3version@(.*)" replacement="$1${version}$2" />
     31           
     32            <echo level="info">Setting version in src/lib/gsdlconf.h</echo>
     33            <rsr file="${basedir}/distributions/web/src/lib/gsdlconf.h" pattern="(#define GSDL_VERSION) &quot;.*&quot;" replacement="$1 &quot;${version}&quot;" />
     34           
     35            <echo level="info">Setting version in etc/VERSION</echo>
     36            <rsr file="${basedir}/distributions/web/etc/VERSION" pattern="(gsdl version: ).*" replacement="$1${version}" />
     37           
     38        </if>
     39    </target>
     40   
     41    <target name="drop-in-binaries">
     42        <if><bool><istrue value="${execute}"/></bool>
     43            <echo level="info">Dropping compiled binaries into distribution</echo>
     44            <delete dir="${basedir}/distributions/web/bin/windows" />
     45            <copy todir="${basedir}/distributions/web/bin/windows">
     46                <fileset dir="${basedir}/gsdl/bin/windows" includes="**/*"/>
     47            </copy>
    4848        </if>
    4949    </target>
    5050
    51     <target name="create-distributions-1">
     51    <target name="drop-in-demo-collection">
    5252        <if><bool><istrue value="${execute}"/></bool>
    53             <ant antfile="${wirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" target="create-distribution-1" inheritAll="false">
    54                 <property name="app.version" value="${version}"/>
    55                 <property name="branch.path" value="${branch.path}"/>
    56             </ant>
     53            <echo level="info">Dropping rebuilt demo collection into distribution</echo>
     54            <delete dir="${basedir}/distributions/web/collect/demo" />
     55            <copy todir="${basedir}/distributions/web/collect/demo">
     56                <fileset dir="${basedir}/gsdl/collect/demo" includes="**/*"/>
     57            </copy>
     58        </if>
     59    </target>
     60   
     61    <target name="compile-gli">
     62        <if><bool><istrue value="${execute}"/></bool>
     63           
     64            <echo>Compiling gli...</echo>
     65            <exec dir="${basedir}/distributions/web/gli" executable="${basedir}/distributions/web/gli/makegli.bat"/>
     66           
     67            <echo>Creating jar...</echo>
     68            <exec dir="${basedir}/distributions/web/gli" executable="${basedir}/distributions/web/gli/makejar.bat"/>
     69           
     70            <echo>Cleaning up intermediate files...</echo>
     71            <delete dir="${basedir}/distributions/web/gli/jar"/>
     72            <delete dir="${basedir}/distributions/web/gli/classes/org"/>
     73           
     74            <echo>Putting gli server jar in a better place</echo>
     75            <move file="${basedir}/distributions/web/gli/GLIServer.jar" todir="${basedir}/distributions/web/bin/java" />
     76           
    5777        </if>
    5878    </target>
    5979
    60     <target name="create-distributions-2">
     80    <target name="tweak-files">
    6181        <if><bool><istrue value="${execute}"/></bool>
    62             <ant antfile="${wirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" target="create-distribution-2" inheritAll="false">
    63                 <property name="app.version" value="${version}"/>
    64                 <property name="branch.path" value="${branch.path}"/>
    65                 <property name="branch.revision" value="${branch.revision}"/>
    66             </ant>
    67         </if>
    68     </target>
    6982
    70     <target name="create-distributions-3">
    71         <if><bool><istrue value="${execute}"/></bool>
    72             <ant antfile="${wirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" target="create-distribution-3" inheritall="false">
    73                 <property name="app.version" value="${version}"/>
    74                 <property name="branch.path" value="${branch.path}"/>
    75             </ant>
    76         </if>
    77     </target>
     83            <echo level="info">Putting the COPYING file into distribution</echo>
     84            <copy file="${wirk2.home}/resources/COPYING" tofile="${basedir}/distributions/web/COPYING" />
    7885
    79     <target name="copy-over-build-xml">
    80         <if><bool><istrue value="${execute}"/></bool>
    81             <move file="distribution/greenstone3/modified-build.xml" tofile="distribution/greenstone3/build.xml"/>
    82         </if>
    83     </target>
     86            <echo level="info">Removing signed gatherer</echo>
     87            <delete file="${basedir}/distributions/web/bin/java/SignedGatherer.jar" />
    8488
    85     <target name="insert-user-manual">
    86         <if><bool><istrue value="${execute}"/></bool>
    87             <copy file="greenstone3/gsdl-manuals/manuals/build/en/pdf/User_en.pdf" tofile="distribution/greenstone3/docs/manual/gs2_user_en.pdf"/>
    88         </if>
    89     </target>
    90 
    91     <target name="insert-compiled-binaries">
    92         <if><bool><istrue value="${execute}"/></bool>
     89            <echo level="info">Removing some unneeded stuff</echo>
     90            <delete file="${basedir}/distributions/web/gli/.greenstonestore" />
     91            <delete file="${basedir}/distributions/web/gli/gli4gs3.sh" />
     92            <delete dir="${basedir}/distributions/web/bin/linux" />
     93            <delete><fileset dir="${basedir}/distributions/web" includes="*.bash,*.sh,*.csh,install-sh,configure,configure.in,config.sub,config.guess,config.h.in,configtest.pl,Makefile.in,aclocal.m4,acconfig.h,micotest.cpp,win32.mak,WIN32cfg.h,Install.txt"/></delete>
     94            <delete><fileset dir="${basedir}/distributions/web/gli" includes="*.sh,*4gs3.bat"/></delete>
    9395           
    94             <delete dir="distribution/greenstone3/lib/jni"/>
    95             <copy todir="distribution/greenstone3/lib/jni"><fileset dir="greenstone3/lib/jni"/></copy>
    96            
    97             <delete dir="distribution/greenstone3/gs2build/bin/windows"/>
    98             <copy todir="distribution/greenstone3/gs2build/bin/windows"><fileset dir="greenstone3/gs2build/bin/windows"/></copy>
    99            
    100             <delete dir="distribution/greenstone3/gs2build/bin/java"/>
    101             <copy todir="distribution/greenstone3/gs2build/bin/java"><fileset dir="greenstone3/gs2build/bin/java"/></copy>
    102        
    103         </if>
    104     </target>
    105 
    106     <target name="rename-build-xml-for-transit">
    107         <if><bool><istrue value="${execute}"/></bool>
    108             <move file="distribution/greenstone3/build.xml" tofile="distribution/greenstone3/greenstone3-build.xml"/>
    10996        </if>
    11097    </target>

  • release-kits/wirk2/ant-scripts/create-installer.xml

    r16079 r16087  
    11<?xml version="1.0" encoding="utf-8" ?>
    2 
    3 <!--
    4         ..........................................................
    5         September 2007
    6         Greenstone3 'release maker' script
    7         Oran Fry
    8         ..........................................................
    9 -->
    10 
    11 <project name="wirk3-create-installer" default="create-installer">
     2<project name="wirk2-create-installer" default="create-installer">
    123
    134    <target name="create-installer">
    … …  
    2011           
    2112            <mkdir dir="${basedir}/installer"/>
    22             <copy todir="${basedir}/installer" file="${wirk3.home}/installer/antinstall-config.xml"/>
    23             <copy todir="${basedir}/installer" file="${wirk3.home}/installer/build.xml"/>
     13            <copy todir="${basedir}/installer" file="${wirk2.home}/installer/antinstall-config.xml"/>
     14            <copy todir="${basedir}/installer" file="${wirk2.home}/installer/build.xml"/>
    2415            <copy todir="${basedir}/installer/resources">
    25                 <fileset dir="${wirk3.home}/installer/resources-windows"/>
    26                 <fileset dir="${wirk3.home}/installer/resources-greenstone3"/>
     16                <fileset dir="${wirk2.home}/installer/resources-windows"/>
     17                <fileset dir="${wirk2.home}/installer/resources-greenstone2"/>
    2718            </copy>
    2819           
    … …  
    5445           
    5546            <installer file="${basedir}/installer/greenstone-${version}-win32.jar"
    56                     compress="true"
    57                     extractType="NonExtractor"
    58                     installConfig="${basedir}/installer/antinstall-config.xml"
    59                     buildFile="${basedir}/installer/build.xml"
    60                     antInstallLib="${wirk3.home}/bin/ant-installer/lib"
    61                     antLib="${wirk3.home}/bin/ant-installer/antlib"
    62                     validateConfig="true"
    63                     icons="bluecurve">
    64 
     47                compress="true"
     48                extractType="NonExtractor"
     49                installConfig="${basedir}/installer/antinstall-config.xml"
     50                buildFile="${basedir}/installer/build.xml"
     51                antInstallLib="${wirk2.home}/bin/ant-installer/lib"
     52                antLib="${wirk2.home}/bin/apache-ant-1.6.5/lib"
     53                validateConfig="true"
     54                icons="bluecurve">
     55               
    6556                <zipfileset dir="${basedir}/installer/resources" prefix="resources"><include name="**/*"/></zipfileset>
    66                 <zipfileset dir="${wirk3.home}/ant-scripts/tasks/orans"><include name="RegexSearchReplace.class"/></zipfileset>
    67 
    68                 <zipfileset dir="${basedir}/distribution/greenstone3" includes="*"/>
    69                 <zipfileset dir="${basedir}/distribution/greenstone3/bin" prefix="bin"><include name="**/*"/></zipfileset>
    70                 <zipfileset dir="${basedir}/distribution/greenstone3/docs" prefix="docs"><include name="**/*"/></zipfileset>
    71                 <zipfileset dir="${basedir}/distribution/greenstone3/gli" prefix="gli"><include name="**/*"/></zipfileset>
    72                 <zipfileset dir="${basedir}/distribution/greenstone3/gs2build" prefix="gs2build"><include name="**/*"/></zipfileset>
    73                 <zipfileset dir="${basedir}/distribution/greenstone3/lib" prefix="lib"><include name="**/*"/></zipfileset>
    74                 <zipfileset dir="${basedir}/distribution/greenstone3/web" prefix="web"><include name="**/*"/></zipfileset>
    75                 <zipfileset dir="${basedir}/distribution/greenstone3/packages" prefix="packages"><include name="**/*"/></zipfileset>
    76                 <zipfileset dir="${basedir}/distribution/greenstone3/resources" prefix="resources"><include name="**/*"/></zipfileset>
    77                 <zipfileset dir="${basedir}/distribution/greenstone3/winutil" prefix="winutil"><include name="**/*"/></zipfileset>
    78                 <zipfileset dir="${basedir}/distribution/greenstone3/src" prefix="src"><include name="**/*"/></zipfileset>
    79 
     57                <zipfileset dir="${wirk2.home}/ant-scripts/tasks/orans"><include name="RegexSearchReplace.class"/></zipfileset>
     58                <zipfileset dir="${basedir}/distributions/web" includes="**/*"/>
     59               
    8060            </installer>
    81 
    8261           
    8362        </if>

  • release-kits/wirk2/ant-scripts/init.xml

    r15900 r16087  
    44        ..........................................................
    55        September 2007
    6         Greenstone3 'release maker' script
     6        Greenstone2 'release maker' script
    77        Oran Fry
    88        ..........................................................
    99-->
    1010
    11 <project name="wirk3-init">
     11<project name="wirk2-init">
    1212
    1313    <!-- classpath -->
    1414    <path id="project.classpath">
    15         <fileset dir="${wirk3.home}/ant-scripts/tasks">
     15        <fileset dir="${wirk2.home}/ant-scripts/tasks">
    1616            <include name="**/*.jar"/>
    1717        </fileset>
    18         <fileset dir="${wirk3.home}/lib">
     18        <fileset dir="${wirk2.home}/lib">
    1919            <include name="*.jar"/>
    2020        </fileset>
    21         <pathelement path="${wirk3.home}/ant-scripts/tasks/orans"/>
     21        <pathelement path="${wirk2.home}/ant-scripts/tasks/orans"/>
    2222        <!-- antinstaller -->
    23         <pathelement path="${wirk3.home}/bin/ant-installer/lib/ant-installer-ext.jar"/>
    24         <pathelement path="${wirk3.home}/bin/ant-installer/lib/ant-installer.jar"/>
     23        <pathelement path="${wirk2.home}/bin/ant-installer/lib/ant-installer-ext.jar"/>
     24        <pathelement path="${wirk2.home}/bin/ant-installer/lib/ant-installer.jar"/>
    2525    </path>
    2626   
    … …  
    5050    <property name="svn.root" value="http://svn.greenstone.org"/><!-- svn root -->
    5151    <property name="java.min.version" value="1.5.0_00"/><!-- the minimum java version we require end users to have -->
    52     <property name="java.installer" value="jre-6u3-windows-i586-p-s.exe"/><!-- relative to WIRK3_HOME/wrapper -->
     52    <property name="java.installer" value="jre-6u3-windows-i586-p-s.exe"/><!-- relative to WIRK2_HOME/wrapper -->
    5353
    5454    <!-- the version numbers of bundled things (entered manually to save us autodetecting; update as needed) -->
    … …  
    7070            </bool>
    7171
    72             <!-- version not set in build.properties, try get from repository -->
    73             <setloglevel level="error"/>
    74             <try>
    75                 <get src="${svn.root}/greenstone3/${branch.path}/version.properties" dest="${temp.file}"/>
    76                 <catch>
    77                     <echo level="error">Not set in build.properties or repository version.properties</echo>
    78                     <fail>Version number not set</fail>
    79                 </catch>
    80             </try>
    81             <setloglevel level="info"/>
     72            <echo level="error">Not set in build.properties</echo>
     73            <fail>Version number not set</fail>
    8274
    83             <property file="${temp.file}"/>
    84 
    85             <if>
    86                 <bool>
    87                     <not><isset property="version"/></not>
    88                 </bool>
    89                 <echo level="error">version.properties exists, but doesn't set version string</echo>
    90                 <fail>Version number not set</fail>
    9175            </if>
    92 
    93             <echo level="info">Taken from repository version.properties</echo>
    94 
    95             <else>
    96                 <echo level="info">Taken from build.properties</echo>
    97             </else>
    98 
    99         </if>
    10076
    10177        <echo level="info">Version number: ${version}</echo>

  • release-kits/wirk2/ant-scripts/wrap.xml

    r15900 r16087  
    11<?xml version="1.0" encoding="utf-8" ?>
    2 
    3 <!--
    4         ..........................................................
    5         September 2007
    6         Greenstone3 'release maker' script
    7         Oran Fry
    8         ..........................................................
    9 -->
    10 
    112<project name="wirk3-wrap" default="wrap">
    123
    … …  
    2516            <!--create a directory to build the wrapped installer in -->
    2617            <mkdir dir="${basedir}/wrapped-installer/build"/>
    27 
     18           
    2819            <!-- copy source files -->
    29             <copy todir="${basedir}/wrapped-installer/build" file="${wirk3.home}/wrapper/wrapper.cpp"/>
    30             <copy todir="${basedir}/wrapped-installer/build" file="${wirk3.home}/search4j/libsearch4j.cpp"/>
    31             <copy todir="${basedir}/wrapped-installer/build" file="${wirk3.home}/search4j/libsearch4j.h"/>
     20            <copy todir="${basedir}/wrapped-installer/build" file="${wirk2.home}/wrapper/wrapper.cpp"/>
     21            <copy todir="${basedir}/wrapped-installer/build" file="${wirk2.home}/search4j/libsearch4j.cpp"/>
     22            <copy todir="${basedir}/wrapped-installer/build" file="${wirk2.home}/search4j/libsearch4j.h"/>
    3223       
    3324        </if>

  • release-kits/wirk2/bin/make.bat

    r15092 r16087  
    1 cl -GX ..\src\wirk3.cpp -o wirk3.exe
    2 del wirk3.obj
     1cl -GX ..\src\wirk2.cpp -o wirk2.exe
     2del wirk2.obj

  • release-kits/wirk2/installer/antinstall-config.xml

    r16079 r16087  
    77            debug="false"
    88            lookAndFeel="org.tp23.jgoodies.plaf.plastic.PlasticXPLookAndFeel"
    9             name="Greenstone3 @version@ Installer"
     9            name="Greenstone@version@ Installer"
    1010            windowIcon="/resources/icon.png"
    1111            defaultImageResource="/resources/header.png"
    … …  
    1818
    1919    <!--  type="license" shows a license page to click through -->
    20     <page type="license" name="license" resource="/LICENSE.txt"  displayText="" />
     20    <page type="license" name="license" resource="/COPYING"  displayText="" />
    2121
    2222    <!--  install destination page -->
    … …  
    3535        <comment name="choose-components"/>
    3636
    37         <target target="install-core-components"        defaultValue="true" force="true" displayText="" />
    38         <target target="install-start-menu-shortcuts"   defaultValue="true" displayText="" />
    39         <target target="install-tomcat"                 defaultValue="true" displayText="" />
    40         <target target="install-ant"                    defaultValue="true" displayText="" />
    41         <target target="install-source-code"            defaultValue="false" displayText="" />
     37        <target target="install-core-components"    defaultValue="true" force="true" displayText="" />
     38        <target target="install-source-code"        defaultValue="false" displayText="" />
    4239
    4340    </page>
    4441
    45     <page type="input" name="tomcat-config" ifProperty="(${install-tomcat}==true)" displayText="">
    46 
    47         <text property="tomcat.server" defaultValue="localhost" displayText=""/>
    48         <text property="tomcat.port" defaultValue="8080" displayText=""/>
    49         <text property="tomcat.shutdown.port" defaultValue="8005" displayText=""/>
    50 
    51     </page>
    52 
    53     <page type="progress" name="progress" showTargets="false" target="cleanuptarget" displayText="">
    54     </page>
     42    <page type="progress" name="progress" showTargets="false" target="cleanuptarget" displayText=""></page>
    5543
    5644</installer>

  • release-kits/wirk2/installer/build.xml

    r15812 r16087  
    44-->
    55
    6 <project name="Installation" default="" basedir="${basedir}">
     6<project name="Installation">
    77
    88    <!-- this is required to pick up the properties generated during the install pages -->
    … …  
    1515    <!-- custom tasks -->
    1616    <typedef name="rsr" classname="RegexSearchReplace" classpathref="project.classpath"/>
    17     <taskdef name="shortcut" classname="com.orangevolt.tools.ant.Win32ShortcutTask" classpathref="project.classpath"/>
    18     <taskdef name="winprops" classname="com.orangevolt.tools.ant.Win32PropertiesTask" classpathref="project.classpath"/>
    1917
    20     <!-- create a local installDir String -->
    21     <path id="installDir.path">
    22         <pathelement location="${installDir}"/>
    23     </path>
    24     <property name="installDir.local" refid="installDir.path"/>
    25    
    26    
    27     <target name="install-core-components">
    28         <!-- load windows properties -->
    29         <winprops/>
     18    <condition property="bundled.java.exists">
     19        <available file="../@java.extracted@/bin/java"/>
     20    </condition>
     21
     22
     23    <target name="install-core-components" depends="">
     24
     25        <echo>basedir: ${basedir}</echo>
     26        <echo>installDir: ${installDir}</echo>
     27        <echo>antinstaller.jar: ${antinstaller.jar}</echo>
    3028
    3129        <!-- create the installation directory -->
    3230        <echo message="Creating Installation directory"/>
    33         <echo>basedir: ${basedir}</echo>
    34         <echo>installDir: ${installDir}</echo>
    35         <echo>antinstaller.jar: ${antinstaller.jar}</echo>
    3631        <mkdir dir="${installDir}"/>
    3732
    38         <!-- install binaries  -->
     33
     34        <!-- install files -->
     35        <echo message="Installing GLI (gli)"/>
     36        <unzip src="${antinstaller.jar}" dest="${installDir}"><patternset><include name="gli/**/*"/></patternset></unzip>
     37        <echo/>
     38
    3939        <echo message="Installing Executable Binaries (bin)"/>
    4040        <unzip src="${antinstaller.jar}" dest="${installDir}"><patternset><include name="bin/**/*"/></patternset></unzip>
    4141        <echo/>
    4242
    43         <echo message="Installing Documentation (docs)"/>
    44         <unzip src="${antinstaller.jar}" dest="${installDir}"><patternset><include name="docs/**/*"/></patternset></unzip>
     43        <echo message="Installing CGI Binaries (cgi-bin)"/>
     44        <unzip src="${antinstaller.jar}" dest="${installDir}"><patternset><include name="cgi-bin/**/*"/></patternset></unzip>
    4545        <echo/>
    4646
    47         <echo message="Installing GLI (gli)"/>
    48         <unzip src="${antinstaller.jar}" dest="${installDir}"><patternset><include name="gli/**/*"/></patternset></unzip>
     47        <echo message="Installing Config Folder (etc)"/>
     48        <unzip src="${antinstaller.jar}" dest="${installDir}"><patternset><include name="etc/**/*"/></patternset></unzip>
    4949        <echo/>
    5050
    51         <echo message="Installing gs2build (gs2build)"/>
    52         <unzip src="${antinstaller.jar}" dest="${installDir}"><patternset><include name="gs2build/**/*"/></patternset></unzip>
     51        <echo message="Installing mappings (mappings)"/>
     52        <unzip src="${antinstaller.jar}" dest="${installDir}"><patternset><include name="mappings/**/*"/></patternset></unzip>
    5353        <echo/>
    5454
    55         <echo message="Installing Libraries (lib)"/>
    56         <unzip src="${antinstaller.jar}" dest="${installDir}"><patternset><include name="lib/**/*"/></patternset></unzip>
     55        <echo message="Installing Packages (packages)"/>
     56        <unzip src="${antinstaller.jar}" dest="${installDir}"><patternset><include name="packages/**/*"/></patternset></unzip>
    5757        <echo/>
    5858
    59         <echo message="Installing Web Content (web)"/>
    60         <unzip src="${antinstaller.jar}" dest="${installDir}"><patternset><include name="web/**/*"/></patternset></unzip>
     59        <echo message="Installing Images (images)"/>
     60        <unzip src="${antinstaller.jar}" dest="${installDir}"><patternset><include name="images/**/*"/></patternset></unzip>
    6161        <echo/>
    6262
    63         <echo message="Installing Resources (resources)"/>
    64         <unzip src="${antinstaller.jar}" dest="${installDir}"><patternset><include name="resources/**/*"/></patternset></unzip>
     63        <echo message="Installing Perl Libraries (perllib)"/>
     64        <unzip src="${antinstaller.jar}" dest="${installDir}"><patternset><include name="perllib/**/*"/></patternset></unzip>
    6565        <echo/>
    6666
    67         <echo message="Installing Windows Utility Commands (winutil)"/>
    68         <unzip src="${antinstaller.jar}" dest="${installDir}"><patternset><include name="winutil/**/*"/></patternset></unzip>
     67        <echo message="Installing Indexers (indexers)"/>
     68        <unzip src="${antinstaller.jar}" dest="${installDir}"><patternset><include name="indexers/**/*"/></patternset></unzip>
    6969        <echo/>
    7070
     71        <echo message="Installing Macros (macros)"/>
     72        <unzip src="${antinstaller.jar}" dest="${installDir}"><patternset><include name="macros/**/*"/></patternset></unzip>
     73        <echo/>
     74
     75        <echo message="Installing Collect Folder (collect)"/>
     76        <unzip src="${antinstaller.jar}" dest="${installDir}"><patternset><include name="collect/**/*"/></patternset></unzip>
     77        <echo/>
    7178       
    7279        <echo message="Installing Top Level Files"/>
    7380        <unzip src="${antinstaller.jar}" dest="${installDir}">
    7481            <patternset>
    75                 <include name="greenstone3-build.xml"/>
    76                 <include name="build.properties"/>
    77                 <include name="gs3-server.bat"/>
    78                 <include name="gs3-setup.bat"/>
    79                 <include name="LICENSE.txt"/>
    80                 <include name="README.txt"/>
    81                 <include name="server.jar"/>
     82                <include name="COPYING"/>
     83                <include name="setup.bat"/>
     84                <include name="server.exe"/>
    8285            </patternset>
    8386        </unzip>
    8487        <echo/>
    85        
    86         <!-- rename greenstone3-build.xml back to build.xml -->
    87         <move file="${installDir}/greenstone3-build.xml" tofile="${installDir}/build.xml" overwrite="true"/>
    88        
    89         <!-- change the tomcat ports in build.properties -->
    90         <echo message="Changing tomcat ports in build.properties"/>
    91         <rsr file="${installDir}/build.properties" pattern="(tomcat.port[=:]).*" replacement="$1${tomcat.port}" />
    92         <rsr file="${installDir}/build.properties" pattern="(tomcat.shutdown.port[=:]).*" replacement="$1${tomcat.shutdown.port}" />
    93         <echo message="Changing tomcat ports in resources/tomcat/server.xml"/>
    94         <copy file="${installDir}/resources/tomcat/server.xml" tofile="${installDir.local}/packages/tomcat/conf/server.xml" overwrite="true"/>
    95        
    96         <!-- set gsdlhome in gs2build setup.bat -->
    97         <echo message="Setting %GSDLHOME% in gs2build\setup.bat"/>
    98         <rsr file="${installDir}/gs2build/setup.bat" pattern="@gsdlhome@" replacement="${installDir.local}\gs2build" />
    99 
    100        
    101         <!-- copy the greenstone3.xml file to tomcat -->
    102         <echo message="Copying greenstone3.xml to tomcat directory"/>
    103         <copy file="${installDir}/resources/tomcat/greenstone3.xml" tofile="${installDir}/packages/tomcat/conf/Catalina/localhost/greenstone3.xml" overwrite="true"/>
    104         <rsr file="${installDir}/packages/tomcat/conf/Catalina/localhost/greenstone3.xml" pattern="@gsdl3webhome@" replacement="${installDir.local}\web" />
    105 
    106         <!-- set up global properties -->
    107         <echo message="Setting up global properties"/>
    108         <copy file="${installDir}/resources/java/global.properties.in" tofile="${installDir}/web/WEB-INF/classes/global.properties" overwrite="true"/>
    109         <rsr file="${installDir}/web/WEB-INF/classes/global.properties" pattern="@gsdl3home@" replacement="${installDir.local}\web" />
    110         <rsr file="${installDir}/web/WEB-INF/classes/global.properties" pattern="@tomcat.server@" replacement="${tomcat.server}" />
    111         <rsr file="${installDir}/web/WEB-INF/classes/global.properties" pattern="@tomcat.port@" replacement="${tomcat.port}" />
    112 
    113         <!-- set up log4j properties-->
    114         <echo message="Setting up log4j properties"/>
    115         <copy file="${installDir}/resources/java/log4j.properties.in" tofile="${installDir}/web/WEB-INF/classes/log4j.properties" overwrite="true"/>
    116         <rsr file="${installDir}/web/WEB-INF/classes/log4j.properties" pattern="@gsdl3home@" replacement="${installDir.local}\web" />
    11788
    11889        <!-- delete unneeded files -->     
     90        <echo message="Deleting some extraneous files"/>
    11991        <delete dir="${installDir}/resources/icons"/>
    12092        <delete file="${installDir}/resources/*.png"/>
     93
     94        <echo message="Finished"/>
    12195
    12296    </target>
    12397
    12498    <!-- Source -->
    125     <target name="install-source-code">
     99    <target name="install-source-code" depends="">
    126100        <echo message="Installing Source Code (src)"/>
    127101        <mkdir dir="${installDir}/src"/>
    128         <unzip src="${antinstaller.jar}" dest="${installDir}">
    129             <patternset>
    130                 <include name="src/**/*"/>
    131             </patternset>
    132         </unzip>
     102        <unzip src="${antinstaller.jar}" dest="${installDir}"><patternset><include name="src/**/*"/></patternset></unzip>
    133103    </target>
    134104
    135     <target name="install-tomcat">
    136        
    137         <echo message="Installing Apache Tomcat"/>
    138         <unzip src="${antinstaller.jar}" dest="${installDir}"><patternset><include name="packages/tomcat/**/*"/></patternset></unzip>
    139 
    140         <!-- change the tomcat ports in tomcats server.xml -->
    141         <rsr file="${installDir}/packages/tomcat/conf/server.xml" pattern="@server@" replacement="${tomcat.server}" />
    142         <rsr file="${installDir}/packages/tomcat/conf/server.xml" pattern="@port@" replacement="${tomcat.port}" />
    143         <rsr file="${installDir}/packages/tomcat/conf/server.xml" pattern="@shutdown-port@" replacement="${tomcat.shutdown.port}" />
    144 
    145     </target>
    146     <target name="install-ant">
    147         <echo message="Installing Apache Ant"/>
    148         <unzip src="${antinstaller.jar}" dest="${installDir}"><patternset><include name="packages/ant/**/*"/></patternset></unzip>
    149     </target>
    150    
    151105    <target name="cleanuptarget">
    152106    </target>
    153107   
    154     <target name="install-start-menu-shortcuts">
    155108
    156         <mkdir dir="${win32.personal.programs_menu}\Greenstone-@version@\documentation"/>
    157        
    158        
    159         <shortcut
    160             file="${win32.personal.programs_menu}\Greenstone-@version@\Greenstone3 Server.lnk"
    161             execute="${installDir}\gs3-server.bat"
    162             workingDirectory="${installDir}"
    163             iconFile="${installDir}\resources\images\gs3.ico"
    164             iconIndex="0" />
    165 
    166         <shortcut
    167             file="${win32.personal.programs_menu}\Greenstone-@version@\Greenstone Librarian Interface (GLI).lnk"
    168             execute="${installDir}\gli\gli4gs3.bat"
    169             workingDirectory="${installDir}\gli"
    170             iconFile="${installDir}\resources\images\gs3.ico"
    171             iconIndex="0" />
    172            
    173         <shortcut
    174             file="${win32.personal.programs_menu}\Greenstone-@version@\Greenstone Editor for Metadata Sets (GEMS).lnk"
    175             execute="${installDir}\gli\gems4gs3.bat"
    176             workingDirectory="${installDir}\gli"
    177             iconFile="${installDir}\resources\images\gs3.ico"
    178             iconIndex="0" />
    179 
    180         <shortcut
    181             file="${win32.personal.programs_menu}\Greenstone-@version@\documentation\README.lnk"
    182             execute="${installDir}\README.txt" />
    183 
    184         <shortcut
    185             file="${win32.personal.programs_menu}\Greenstone-@version@\documentation\Greenstone3 Users' Guide.lnk"
    186             execute="${installDir}\documentation\manual\manual.pdf" />
    187 
    188         <shortcut
    189             file="${win32.personal.programs_menu}\Greenstone-@version@\documentation\Greenstone2 Users' Guide.lnk"
    190             execute="${installDir}\documentation\manual\gs2_user_en.pdf" />
    191 
    192            
    193     </target>
    194    
    195109</project>

  • release-kits/wirk2/src/wirk2.cpp

    r16079 r16087  
    3737   
    3838    //set the classpath
    39     //WIRK3_HOME + "\\ant-scripts\\tasks\\orangevolt\\roxes-win32forjava-1.1.1.jar;" + WIRK3_HOME + "\\ant-scripts\\tasks\\orangevolt\\orangevolt-ant-tasks-1.3.8.jar;" +
    40     classpath = pwd + "\\installer;" + JAVA_HOME + "\\lib\\tools.jar;" + WIRK3_HOME + "\\lib\\serializer.jar;" + WIRK3_HOME + "\\lib\\xalan.jar;" + WIRK3_HOME + "\\lib\\xercesImpl.jar;" + WIRK3_HOME + "\\lib\\xml-apis.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-antlr.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-apache-bcel.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-apache-bsf.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-apache-log4j.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-apache-oro.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-apache-regexp.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-apache-resolver.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-commons-logging.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-commons-net.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-icontract.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-jai.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-javamail.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-jdepend.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-jmf.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-jsch.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-junit.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-launcher.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-netrexx.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-nodeps.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-starteam.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-stylebook.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-swing.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-trax.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-vaj.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-weblogic.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-xalan1.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-xslp.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\xercesImpl.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\xml-apis.jar;" + WIRK3_HOME + "\\bin\\ant-installer\\lib\\ai-icons-amaranth.jar;" + WIRK3_HOME + "\\bin\\ant-installer\\lib\\ai-icons-bluecurve.jar;" + WIRK3_HOME + "\\bin\\ant-installer\\lib\\ai-icons-crystalsvg.jar;" + WIRK3_HOME + "\\bin\\ant-installer\\lib\\ai-icons-eclipse.jar;" + WIRK3_HOME + "\\bin\\ant-installer\\lib\\ai-icons-krystaline.jar;" + WIRK3_HOME + "\\bin\\ant-installer\\lib\\ant-installer-ext.jar;" + WIRK3_HOME + "\\bin\\ant-installer\\lib\\ant-installer.jar;" + WIRK3_HOME + "\\bin\\ant-installer\\lib\\jgoodies-edited-1_2_2.jar;" + WIRK3_HOME + "\\bin\\ant-installer\\lib\\xercesImpl.jar;" + WIRK3_HOME + "\\bin\\ant-installer\\lib\\xml-apis.jar;" + WIRK3_HOME + "\\bin\\ant-installer\\classes";
     39    classpath = pwd + "\\installer;" + 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 + "\\bin\\apache-ant-1.6.5\\lib\\ant-antlr.jar;" + WIRK2_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-apache-bcel.jar;" + WIRK2_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-apache-bsf.jar;" + WIRK2_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-apache-log4j.jar;" + WIRK2_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-apache-oro.jar;" + WIRK2_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-apache-regexp.jar;" + WIRK2_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-apache-resolver.jar;" + WIRK2_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-commons-logging.jar;" + WIRK2_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-commons-net.jar;" + WIRK2_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-icontract.jar;" + WIRK2_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-jai.jar;" + WIRK2_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant.jar;" + WIRK2_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-javamail.jar;" + WIRK2_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-jdepend.jar;" + WIRK2_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-jmf.jar;" + WIRK2_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-jsch.jar;" + WIRK2_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-junit.jar;" + WIRK2_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-launcher.jar;" + WIRK2_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-netrexx.jar;" + WIRK2_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-nodeps.jar;" + WIRK2_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-starteam.jar;" + WIRK2_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-stylebook.jar;" + WIRK2_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-swing.jar;" + WIRK2_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-trax.jar;" + WIRK2_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-vaj.jar;" + WIRK2_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-weblogic.jar;" + WIRK2_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-xalan1.jar;" + WIRK2_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-xslp.jar;" + WIRK2_HOME + "\\bin\\apache-ant-1.6.5\\lib\\xercesImpl.jar;" + WIRK2_HOME + "\\bin\\apache-ant-1.6.5\\lib\\xml-apis.jar;" + WIRK2_HOME + "\\bin\\ant-installer\\lib\\ai-icons-amaranth.jar;" + WIRK2_HOME + "\\bin\\ant-installer\\lib\\ai-icons-bluecurve.jar;" + WIRK2_HOME + "\\bin\\ant-installer\\lib\\ai-icons-crystalsvg.jar;" + WIRK2_HOME + "\\bin\\ant-installer\\lib\\ai-icons-eclipse.jar;" + WIRK2_HOME + "\\bin\\ant-installer\\lib\\ai-icons-krystaline.jar;" + WIRK2_HOME + "\\bin\\ant-installer\\lib\\ant-installer-ext.jar;" + WIRK2_HOME + "\\bin\\ant-installer\\lib\\ant-installer.jar;" + WIRK2_HOME + "\\bin\\ant-installer\\lib\\jgoodies-edited-1_2_2.jar;" + WIRK2_HOME + "\\bin\\ant-installer\\lib\\xercesImpl.jar;" + WIRK2_HOME + "\\bin\\ant-installer\\lib\\xml-apis.jar;" + WIRK2_HOME + "\\bin\\ant-installer\\classes";
    4140    putenv( ("CLASSPATH=" + classpath).c_str() );
    4241
    … …  
    4645   
    4746    //create the command
    48     command = WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\bin\\ant.bat -f " + WIRK3_HOME + "\\ant-scripts\\build.xml -Dwirk3.home=" + WIRK3_HOME;
     47    command = WIRK2_HOME + "\\bin\\apache-ant-1.6.5\\bin\\ant.bat -f " + WIRK2_HOME + "\\ant-scripts\\build.xml -Dwirk2.home=" + WIRK2_HOME;
    4948    //pass on the arguments
    5049    string a;
    … …  
    6867        } else if ( a.compare("-from") == 0 ) {
    6968            command = command + " -Dresume.from=" + argv[++i];
    70             //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'`
    71             //toexec=$toexec$from
    7269        } else if ( a.compare("-to") == 0 ) {
    7370            command = command + " -Dresume.to=" + argv[++i];
    74             //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'`
    75             //toexec=$toexec$to
    7671        } else {
    7772            command = command + " " + a;
    … …  
    9590        << "O-----------------------------------------O" << endl
    9691        << "|                                         |" << endl
    97         << "|   WiRK3                                 |" << endl
    98         << "|   Windows Release Kit for Greenstone3   |" << endl
     92        << "|   WiRK2                                 |" << endl
     93        << "|   Windows Release Kit for Greenstone2   |" << endl
    9994        << "|                                         |" << endl
    10095        << "O-----------------------------------------O" << endl
Note: See TracChangeset for help on using the changeset viewer.